diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs index 0dcc5c4..2d9beb7 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs @@ -249,20 +249,20 @@ namespace ICSSoft.DataProject /// /// /// - public static void MOApplyHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language, string quantity) + public static void MOApplyHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language) { 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=IssueQuantity+{2} + UPDATE ICSMOApply set IssueQuantity=Quantity WHERE ApplyCode='{0}' and WorkPoint='{1}'"; - sql = string.Format(sql, TransCode, WorkPoint, iquantity); + sql = string.Format(sql, TransCode, WorkPoint); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs index 2edd5aa..a28b781 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs @@ -213,20 +213,20 @@ namespace ICSSoft.DataProject /// /// /// - public static void OOApplyHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language, string quantity) + public static void OOApplyHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language) { 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=IssueQuantity+{2} + UPDATE ICSOApply set IssueQuantity=Quantity WHERE ApplyCode='{0}' and WorkPoint='{1}'"; - sql = string.Format(sql, TransCode, WorkPoint, iquantity); + sql = string.Format(sql, TransCode, WorkPoint); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs index df98125..9931c1d 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs @@ -903,20 +903,19 @@ namespace ICSSoft.DataProject /// /// /// - public static void PurchaseReceiveDoctNegativeHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language, string quantity) + public static void PurchaseReceiveDoctNegativeHG(string TransCode, string WorkPoint, SqlCommand cmd, Dictionary language) { 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=RCVQuantity={2} + UPDATE ICSDeliveryNotice SET RCVQuantity=Quantity WHERE DNCode='{0}' AND WorkPoint='{1}'"; - sql = string.Format(sql, TransCode, WorkPoint, iquantity); + sql = string.Format(sql, TransCode, WorkPoint); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs index 1ea4da6..32645bd 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs @@ -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, itemInfo.STO_QTAR); + ICSPurchaseService.PurchaseReceiveDoctNegativeHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language); //出库 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, itemInfo.STO_QTAR); + ICSManufactureService.MOApplyHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language); //出库 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, itemInfo.STO_QTAR); + ICSOutsourcingService.OOApplyHG(JsonData.DATA.EXP_ORDINI[0].ORD_ORDINE, JsonData.DATA.EXP_ORDINI[0].ORD_CLIENTE, cmd, language); //出库 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);