From 2675c79ff47868fecf8d552ec663a72410e882c8 Mon Sep 17 00:00:00 2001 From: lilili Date: Wed, 26 Jul 2023 09:34:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ICSManufactureService.cs | 21 +++++++++++-------- .../ICSOutsourcingService.cs | 7 ++++--- .../ICSSoft.DataProject/ICSPurchaseService.cs | 14 +++++++------ .../ICSSoft.DataProject/ICSSubmitService.cs | 12 +++++------ 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs index cab9b6e..0dcc5c4 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs @@ -249,19 +249,20 @@ namespace ICSSoft.DataProject /// /// /// - public static void MOApplyHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language) + public static void MOApplyHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language, string quantity) { try { + decimal iquantity = Convert.ToDecimal(quantity); string sql = @"IF EXISTS (SELECT ID FROM ICSMOApply WHERE IssueQuantity=Quantity AND ApplyCode='{0}' and WorkPoint='{1}' ) BEGIN RAISERROR('" + language.GetNameByCode("WMSAPIInfo472") + @"',16,1); RETURN END; - UPDATE ICSMOApply set IssueQuantity=Quantity + UPDATE ICSMOApply set IssueQuantity=IssueQuantity+{2} WHERE ApplyCode='{0}' and WorkPoint='{1}'"; - sql = string.Format(sql, TransCode, WorkPoint); + sql = string.Format(sql, TransCode, WorkPoint, iquantity); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { @@ -643,19 +644,20 @@ namespace ICSSoft.DataProject /// /// /// - public static void MOIssueDocNegativeHG(string TransCode, string TransLine, string WorkPoint, SqlCommand cmd, Dictionary language) + public static void MOIssueDocNegativeHG(string TransCode, string TransLine, string WorkPoint, SqlCommand cmd, Dictionary language, string quantity) { try { string sql = ""; + decimal iquantity = Convert.ToDecimal(quantity); sql = @" IF EXISTS (SELECT ID FROM ICSMOApplyNegDetail WHERE IssueNegQuantity=Quantity AND ApplyNegCode='{0}' and Sequence='{1}' and WorkPoint='{2}' ) BEGIN RAISERROR('" + language.GetNameByCode("WMSAPIInfo472") + @"',16,1); RETURN END; - Update ICSMOApplyNegDetail set IssueNegQuantity=Quantity + Update ICSMOApplyNegDetail set IssueNegQuantity=IssueNegQuantity+{3} where ApplyNegCode='{0}' and Sequence='{1}' and WorkPoint='{2}'"; - sql = string.Format(sql, TransCode, TransLine, WorkPoint); + sql = string.Format(sql, TransCode, TransLine, WorkPoint, iquantity); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { throw new Exception(language.GetNameByCode("WMSAPIInfo134"));//"生产退料单更新失败！"); @@ -1139,18 +1141,19 @@ namespace ICSSoft.DataProject /// /// /// - public static void ManufactureReceiveForHG(string TransCode, string TransLine, string WorkPoint, SqlCommand cmd, Dictionary language) + public static void ManufactureReceiveForHG(string TransCode, string TransLine, string WorkPoint, SqlCommand cmd, Dictionary language,string quantity) { try { + decimal iquantity = Convert.ToDecimal(quantity); string sql = @"IF EXISTS (SELECT ID FROM ICSManufactureReceive WHERE RCVQuantity=Quantity AND RCVCode='{0}' and Sequence='{1}' and WorkPoint='{2}' ) BEGIN RAISERROR('" + language.GetNameByCode("WMSAPIInfo471") + @"',16,1); RETURN END; - UPDATE ICSManufactureReceive set RCVQuantity=Quantity + UPDATE ICSManufactureReceive set RCVQuantity=RCVQuantity+{3} Where RCVCode='{0}' and Sequence='{1}' and WorkPoint='{2}'"; - sql = string.Format(sql, TransCode, TransLine, WorkPoint); + sql = string.Format(sql, TransCode, TransLine, WorkPoint, iquantity); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { throw new Exception(language.GetNameByCode("WMSAPIInfo138"));//"生产入库单更新失败！"); diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs index 13b3d70..2edd5aa 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs @@ -213,19 +213,20 @@ namespace ICSSoft.DataProject /// /// /// - public static void OOApplyHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language) + public static void OOApplyHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language, string quantity) { try { + decimal iquantity = Convert.ToDecimal(quantity); string sql = @"IF EXISTS (SELECT ID FROM ICSOApply WHERE IssueQuantity=Quantity AND ApplyCode='{0}' and WorkPoint='{1}') BEGIN RAISERROR('" + language.GetNameByCode("WMSAPIInfo472") + @"',16,1); RETURN END; - UPDATE ICSOApply set IssueQuantity=Quantity + UPDATE ICSOApply set IssueQuantity=IssueQuantity+{2} WHERE ApplyCode='{0}' and WorkPoint='{1}'"; - sql = string.Format(sql, TransCode, WorkPoint); + sql = string.Format(sql, TransCode, WorkPoint, iquantity); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs index a52946c..df98125 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs @@ -290,18 +290,19 @@ namespace ICSSoft.DataProject /// /// /// - public static void DeliveryNoticeInForHG(string DocNO, string TransLine, string WorkPoint, SqlCommand cmd, Dictionary language) + public static void DeliveryNoticeInForHG(string DocNO, string TransLine, string WorkPoint, SqlCommand cmd, Dictionary language,string quantity) { try { + decimal iquantity = Convert.ToDecimal(quantity); string sql = @" IF EXISTS (SELECT ID FROM ICSDeliveryNotice WHERE RCVQuantity=Quantity AND DNCode='{0}' AND Sequence='{1}' and WorkPoint='{2}' ) BEGIN RAISERROR('" + language.GetNameByCode("WMSAPIInfo471") + @"',16,1); RETURN END; - UPDATE ICSDeliveryNotice set RCVQuantity=Quantity + UPDATE ICSDeliveryNotice set RCVQuantity=RCVQuantity+{3} Where DNCode='{0}' AND Sequence='{1}' and WorkPoint='{2}'"; - sql = string.Format(sql, DocNO, TransLine, WorkPoint); + sql = string.Format(sql, DocNO, TransLine, WorkPoint, iquantity); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { throw new Exception(language.GetNameByCode("WMSAPIInfo079"));//"到货单更新失败！"); @@ -902,19 +903,20 @@ namespace ICSSoft.DataProject /// /// /// - public static void PurchaseReceiveDoctNegativeHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language) + public static void PurchaseReceiveDoctNegativeHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language, string quantity) { try { + decimal iquantity = Convert.ToDecimal(quantity); string sql = @" IF EXISTS (SELECT ID FROM ICSDeliveryNotice WHERE RCVQuantity=Quantity AND DNCode='{0}' AND WorkPoint='{1}' ) BEGIN RAISERROR('" + language.GetNameByCode("WMSAPIInfo471") + @"',16,1); RETURN END; - UPDATE ICSDeliveryNotice SET RCVQuantity=Quantity + UPDATE ICSDeliveryNotice SET RCVQuantity=RCVQuantity={2} WHERE DNCode='{0}' AND WorkPoint='{1}'"; - sql = string.Format(sql, TransCode, WorkPoint); + sql = string.Format(sql, TransCode, WorkPoint, iquantity); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs index 4318412..1ea4da6 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs @@ -3430,7 +3430,7 @@ namespace ICSSoft.DataProject foreach (var itemInfo in JsonData.DATA.EXP_ORDINI_RIGHE_STO) { //更新源头单据数量 - ICSPurchaseService.DeliveryNoticeInForHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, itemInfo.STO_HOSTINF, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language); + ICSPurchaseService.DeliveryNoticeInForHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, itemInfo.STO_HOSTINF, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language,itemInfo.STO_QTAR); BusinessCode = TransTypeEnum.DeliveryNotice.GetDescription(); //生成条码的同时入库 ICSWareHouseLotInfoService.WareHouseLotInfoUpForHG(Identification, JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, itemInfo.STO_HOSTINF @@ -3445,7 +3445,7 @@ namespace ICSSoft.DataProject foreach (var itemInfo in JsonData.DATA.EXP_ORDINI_RIGHE_STO) { //更新源头单据数量 - ICSManufactureService.ManufactureReceiveForHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, itemInfo.STO_HOSTINF, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language); + ICSManufactureService.ManufactureReceiveForHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, itemInfo.STO_HOSTINF, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language, itemInfo.STO_QTAR); BusinessCode = TransTypeEnum.ManufactureReceive.GetDescription(); //入库 ICSWareHouseLotInfoService.WareHouseLotInfoUpForHG(Identification, JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, itemInfo.STO_HOSTINF @@ -3460,7 +3460,7 @@ namespace ICSSoft.DataProject foreach (var itemInfo in JsonData.DATA.EXP_ORDINI_RIGHE_STO) { //更新源头单据数量 - ICSManufactureService.MOIssueDocNegativeHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, itemInfo.STO_HOSTINF, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language); + ICSManufactureService.MOIssueDocNegativeHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, itemInfo.STO_HOSTINF, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language, itemInfo.STO_QTAR); BusinessCode = TransTypeEnum.MOIssueDocNegative.GetDescription(); //入库 ICSWareHouseLotInfoService.WareHouseLotInfoUpForHG(Identification, JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, itemInfo.STO_HOSTINF @@ -3474,7 +3474,7 @@ namespace ICSSoft.DataProject { BusinessCode = TransTypeEnum.PurchaseReceiveDoctNegative.GetDescription(); //更新源头单据数量 - ICSPurchaseService.PurchaseReceiveDoctNegativeHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language); + ICSPurchaseService.PurchaseReceiveDoctNegativeHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language, itemInfo.STO_QTAR); //出库 printTable = ICSWareHouseLotInfoService.WareHouseLotInfoDownHG(Identification, JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI_RIGHE_STO[0].STO_EXE_OPERATORE , JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, "3", TransTypeEnum.PurchaseReceiveDoctNegative.GetDescription(), cmd, language); @@ -3485,7 +3485,7 @@ namespace ICSSoft.DataProject { BusinessCode = TransTypeEnum.MOApply.GetDescription(); //更新源头单据数量 - ICSManufactureService.MOApplyHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language); + ICSManufactureService.MOApplyHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language, itemInfo.STO_QTAR); //出库 printTable = ICSWareHouseLotInfoService.WareHouseLotInfoDownHG(Identification, JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI_RIGHE_STO[0].STO_EXE_OPERATORE , JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, "3", TransTypeEnum.MOApply.GetDescription(), cmd, language, MergeID); @@ -3496,7 +3496,7 @@ namespace ICSSoft.DataProject { BusinessCode = TransTypeEnum.OOApply.GetDescription(); //更新源头单据数量 - ICSOutsourcingService.OOApplyHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language); + ICSOutsourcingService.OOApplyHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language, itemInfo.STO_QTAR); //出库 printTable = ICSWareHouseLotInfoService.WareHouseLotInfoDownHG(Identification, JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI_RIGHE_STO[0].STO_EXE_OPERATORE , JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, "3", TransTypeEnum.OOApply.GetDescription(), cmd, language, MergeID);