diff --git a/GZ_LTHPilot_ORDER.csproj b/GZ_LTHPilot_ORDER.csproj index be633c5..45826fd 100644 --- a/GZ_LTHPilot_ORDER.csproj +++ b/GZ_LTHPilot_ORDER.csproj @@ -238,8 +238,11 @@ +<<<<<<< HEAD +======= +>>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 diff --git a/SAL_DELIVERYNOTICE/PushCeLue.cs b/SAL_DELIVERYNOTICE/PushCeLue.cs index 9666d89..274745f 100644 --- a/SAL_DELIVERYNOTICE/PushCeLue.cs +++ b/SAL_DELIVERYNOTICE/PushCeLue.cs @@ -16,8 +16,13 @@ namespace GZ_LTHPilot_ORDER.SAL_DELIVERYNOTICE public override void OnParseFilter(ParseFilterEventArgs e) { base.OnParseFilter(e); +<<<<<<< HEAD e.FilterPolicySQL += $"AND (SELECT CASE WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID <> C.F_SaleOrgId AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND NOT(E.FNUMBER LIKE 'H.10%' OR E.FNUMBER LIKE 'H.20%' OR E.FNUMBER LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID WHERE C.FSaleOrgId <> 100302 AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND (E.FNUMBER LIKE 'H.10%' OR E.FNUMBER LIKE 'H.20%' OR E.FNUMBER LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID AND D.F_Allocatedquantity <> 0) > 0 THEN 1 ELSE (SELECT COUNT(*) FROM T_PRD_MO A INNER JOIN T_PRD_MOENTRY B ON A.FID = B.FID INNER JOIN T_PRD_MOENTRY_LK C ON B.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY' WHERE A.FDocumentStatus = 'C' AND C.FSBILLID IN (SELECT C.FID FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND (E.FNUMBER LIKE 'H.10%' OR E.FNUMBER LIKE 'H.20%' OR E.FNUMBER LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID)) END AS Result) > 0"; e.PlugFilterDesc = "当销售订单的销售组织为珠海派诺且销售组织=备货组织时，销售订单需下推生产订单或包装工单处于审核状态后，才可由发货通知单下推销售出库"; +======= + e.FilterPolicySQL += $"AND (SELECT CASE WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID <> C.F_SaleOrgId AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID WHERE C.FSaleOrgId <> 100302 AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_PRD_MO A INNER JOIN T_PRD_MOENTRY B ON A.FID = B.FID INNER JOIN T_PRD_MOENTRY_LK C ON B.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY' WHERE A.FDocumentStatus = 'C' AND C.FSBILLID IN (SELECT C.FID FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND (E.FNUMBER NOT LIKE 'H.10%' OR E.FNUMBER NOT LIKE 'H.20%' OR E.FNUMBER NOT LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID)) > 0 THEN 1 ELSE (SELECT COUNT(*) FROM T_PRD_MO A INNER JOIN T_PRD_MOENTRY B ON A.FID = B.FID INNER JOIN T_PRD_MOENTRY_LK C ON B.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY' WHERE A.FDocumentStatus = 'C' AND C.FSBILLID IN (SELECT C.FID FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND (E.FNUMBER LIKE 'H.10%' OR E.FNUMBER LIKE 'H.20%' OR E.FNUMBER LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID)) END AS Result) > 0"; + e.PlugFilterDesc = "当销售订单的销售组织为珠海派诺且销售组织=备货组织时，销售订单需下推生产订单且生产订单处于审核状态后，才可由发货通知单下推销售出库"; +>>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 } } } diff --git a/SAL_ORDER/SaveWL.cs b/SAL_ORDER/SaveWL.cs index f74316c..f5552c9 100644 --- a/SAL_ORDER/SaveWL.cs +++ b/SAL_ORDER/SaveWL.cs @@ -30,7 +30,11 @@ namespace GZ_LTHPilot_ORDER.SAL_ORDER { e.Cancel = true; throw new Exception( +<<<<<<< HEAD string.Format(@"物料编码J.06.00开头,且订单日期大于2025/05/10，则明细物联网卡使用年份字段必填") +======= + string.Format(@"物料编码J开头，则明细物联网卡使用年份字段必填") +>>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 ); } } diff --git a/SQL/SqlManage.cs b/SQL/SqlManage.cs index cbe0924..c063408 100644 --- a/SQL/SqlManage.cs +++ b/SQL/SqlManage.cs @@ -338,11 +338,19 @@ namespace GZ_LTHPilot_ORDER.SqlManage return DBServiceHelper.ExecuteDynamicObject(ctx, getSql.ToString(), null, null, CommandType.Text, null); } //根据获取的销售订单FID和FentryId，更新开票数量和开票金额 +<<<<<<< HEAD public static void UpSal_OrderKPJEAndKPSL(Context ctx, string FID, string FENTRYID, string KPZZ,string F_INVOICEQTY, string F_F_INVOICEAMOUNT) { string sql = string.Format(@"/*dialect*/ EXEC TrueUpdateSal_OrderF_INVOICEQTYAndF_F_INVOICEAMOUNTAndF_invoiceAmount_TH '{0}','{1}','{2}','{3}','{4}' ", FID, FENTRYID, KPZZ, F_INVOICEQTY, F_F_INVOICEAMOUNT); +======= + public static void UpSal_OrderKPJEAndKPSL(Context ctx, string FID, string FENTRYID, string F_INVOICEQTY, string F_F_INVOICEAMOUNT) + { + string sql = string.Format(@"/*dialect*/ + EXEC TrueUpdateSal_OrderF_INVOICEQTYAndF_F_INVOICEAMOUNTAndF_invoiceAmount_TH '{0}','{1}','{2}','{3}' + ", FID, FENTRYID, F_INVOICEQTY, F_F_INVOICEAMOUNT); +>>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null); } //根据获取的销售订单FID和FentryId，更新开票数量和开票金额(当销售订单的累计核销金额>价税合计本位币后) @@ -402,6 +410,7 @@ namespace GZ_LTHPilot_ORDER.SqlManage return DBServiceHelper.ExecuteDynamicObject(ctx, getSql.ToString(), null, null, CommandType.Text, null); } +<<<<<<< HEAD //根据项目预算利润表FID，更新财务信息字段 public static void GZTH_XMYSBSave(Context ctx,string FID) { @@ -411,5 +420,7 @@ namespace GZ_LTHPilot_ORDER.SqlManage DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null); } +======= +>>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 } } diff --git a/T_IV_SALESIC/UnAuditS_Order.cs b/T_IV_SALESIC/UnAuditS_Order.cs index 7b3abb9..0c02254 100644 --- a/T_IV_SALESIC/UnAuditS_Order.cs +++ b/T_IV_SALESIC/UnAuditS_Order.cs @@ -54,6 +54,7 @@ namespace GZ_LTHPilot_ORDER.T_IV_SALESIC Convert.ToString(LZOrder["销售订单FENTRYID"]), Convert.ToString(LZOrder["开票组织"]), Convert.ToString(LZOrder["开票数量"]), Convert.ToString(LZOrder["开票金额"])); } + break; } } }