From c4467821282c6b1dab01ed37a6e216ba31ba53a6 Mon Sep 17 00:00:00 2001 From: lilili Date: Fri, 14 Jul 2023 15:50:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BD=A2=E6=80=81?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ICSSoft.DataProject/ICSSubmitService.cs | 42 +++++++++++++++---- .../ICSSoft.Entity/ICSMTDocModel.cs | 20 --------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs index 0469a20..a270842 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs @@ -7400,7 +7400,8 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer LEFT JOIN ICSWarehouse wh ON a.WHCode=wh.WarehouseCode AND a.WorkPoint=wh.WorkPoint LEFT JOIN ICSInventoryBatchEnable invBat ON a.INVCode=invBat.InvCode AND a.WHCode=invBat.WHCode AND a.WorkPoint=invBat.WorkPoint WHERE a.MTDOCCode= '{JsonData.TransCode}' - AND a.WorkPoint= '{JsonData.WorkPoint}' "; + AND a.WorkPoint= '{JsonData.WorkPoint}' + AND a.MTDOCType='1' "; #endregion DataTable table = DBHelper.SQlReturnData(sql, cmd); @@ -7683,6 +7684,29 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer StringBuilder sql = new StringBuilder(); foreach (var item in JsonData) { + string doc = $@"SELECT ExtensionID,INVCode,MTDOCType FROM ICSMTDOC a WHERE a.MTDOCCode= '{item.TransCode}' AND a.Sequence= '{item.TransSequence}' AND a.WorkPoint= '{item.WorkPoint}'"; + DataTable dataTable = DBHelper.SQlReturnData(doc, cmd); + string afterInvCode = String.Empty; + string afterExtensionID = String.Empty; + string beforInvCode = String.Empty; + string beforExtensionID = String.Empty; + if (dataTable != null && dataTable.Rows.Count > 0) + { + if (dataTable.Rows[0]["MTDOCType"].ToString() == "1") + { + beforInvCode = dataTable.Rows[0]["INVCode"].ToString(); + beforExtensionID = dataTable.Rows[0]["ExtensionID"].ToString(); + afterInvCode = dataTable.Rows[1]["INVCode"].ToString(); + afterExtensionID = dataTable.Rows[1]["ExtensionID"].ToString(); + } + else + { + beforInvCode = dataTable.Rows[1]["INVCode"].ToString(); + beforExtensionID = dataTable.Rows[1]["ExtensionID"].ToString(); + afterInvCode = dataTable.Rows[0]["INVCode"].ToString(); + afterExtensionID = dataTable.Rows[0]["ExtensionID"].ToString(); + } + } foreach (var data in item.DetailModels) { //修改源头单据 @@ -7692,23 +7716,23 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer if (TransType == "13") { //形态转换 - sql.Append($@"UPDATE ICSWareHouseLotInfo SET InvCode='{item.AfterInvCode}' WHERE LotNo='{data.LotNo}' AND WorkPoint='{item.WorkPoint}' AND InvCode='{item.BeforInvCode}' AND WarehouseCode='{item.WHCode}'; - UPDATE ICSWareHouseLotInfoLog SET InvCode='' WHERE LotNo='{data.LotNo}' AND WorkPoint='{item.WorkPoint}' AND InvCode='{item.BeforInvCode}' ; - UPDATE ICSInventoryLot SET InvCode='{item.AfterInvCode}' WHERE LotNo='{data.LotNo}' AND InvCode='{item.BeforInvCode}' AND WorkPoint='{item.WorkPoint}' AND ExtensionID='{item.BeforExtensionID}';"); + sql.Append($@"UPDATE ICSWareHouseLotInfo SET InvCode='{afterInvCode}' WHERE LotNo='{data.LotNo}' AND WorkPoint='{item.WorkPoint}' AND InvCode='{beforInvCode}' AND WarehouseCode='{item.WHCode}'; + UPDATE ICSWareHouseLotInfoLog SET InvCode='' WHERE LotNo='{data.LotNo}' AND WorkPoint='{item.WorkPoint}' AND InvCode='{beforInvCode}' ; + UPDATE ICSInventoryLot SET InvCode='{afterInvCode}' WHERE LotNo='{data.LotNo}' AND InvCode='{beforInvCode}' AND WorkPoint='{item.WorkPoint}' AND ExtensionID='{beforExtensionID}';"); sql.Append($@"INSERT INTO [dbo].[ICSWareHouseLotInfoLog] ([ID], [Identification], [TransCode], [TransSequence], [LotNo], [InvCode], [FromWarehouseCode], [FromLocationCode], [ToWarehouseCode], [ToLocationCode], [Quantity], [Memo], [Lock], [TransType], [BusinessCode], [ERPUpload], [ERPID], [ERPDetailID], [ERPCode], [ERPSequence], [LogID], [MergeID], [MUSER], [MUSERName], [MTIME], [WorkPoint], [EATTRIBUTE1], [EATTRIBUTE2], [EATTRIBUTE3]) - SELECT NEWID(), NEWID(), '{item.TransCode}', '{item.TransSequence}', '{data.LotNo}', '{item.BeforInvCode}', {item.WHCode}, NULL, NULL, NULL, {data.Quantity}, NULL, '0', N'10', N'35', '0', NULL, NULL, NULL, NULL, NULL, NULL,f.F_Account ,f.F_RealName , SYSDATETIME(), '{item.WorkPoint}', NULL, NULL, '{item.BeforExtensionID}' FROM Sys_SRM_User f WHERE f.F_Account='{item.User}' ;"); + SELECT NEWID(), NEWID(), '{item.TransCode}', '{item.TransSequence}', '{data.LotNo}', '{beforInvCode}', {item.WHCode}, NULL, NULL, NULL, {data.Quantity}, NULL, '0', N'10', N'35', '0', NULL, NULL, NULL, NULL, NULL, NULL,f.F_Account ,f.F_RealName , SYSDATETIME(), '{item.WorkPoint}', NULL, NULL, '{beforExtensionID}' FROM Sys_SRM_User f WHERE f.F_Account='{item.User}' ;"); sql.Append($@"INSERT INTO [dbo].[ICSWareHouseLotInfoLog] ([ID], [Identification], [TransCode], [TransSequence], [LotNo], [InvCode], [FromWarehouseCode], [FromLocationCode], [ToWarehouseCode], [ToLocationCode], [Quantity], [Memo], [Lock], [TransType], [BusinessCode], [ERPUpload], [ERPID], [ERPDetailID], [ERPCode], [ERPSequence], [LogID], [MergeID], [MUSER], [MUSERName], [MTIME], [WorkPoint], [EATTRIBUTE1], [EATTRIBUTE2], [EATTRIBUTE3]) - SELECT NEWID(), NEWID(), '{item.TransCode}', '{item.TransSequence}', '{data.LotNo}', '{item.AfterInvCode}', {item.WHCode}, NULL, NULL, NULL, {data.Quantity}, NULL, '0', N'10', N'36', '0', NULL, NULL, NULL, NULL, NULL, NULL,f.F_Account ,f.F_RealName , SYSDATETIME(), '{item.WorkPoint}', NULL, NULL, '{item.BeforExtensionID}' FROM Sys_SRM_User f WHERE f.F_Account='{item.User}' ;"); + SELECT NEWID(), NEWID(), '{item.TransCode}', '{item.TransSequence}', '{data.LotNo}', '{afterInvCode}', {item.WHCode}, NULL, NULL, NULL, {data.Quantity}, NULL, '0', N'10', N'36', '0', NULL, NULL, NULL, NULL, NULL, NULL,f.F_Account ,f.F_RealName , SYSDATETIME(), '{item.WorkPoint}', NULL, NULL, '{beforExtensionID}' FROM Sys_SRM_User f WHERE f.F_Account='{item.User}' ;"); } else if (TransType == "12") { - sql.Append($@"UPDATE ICSInventoryLot SET ExtensionID='{item.AfterExtensionID}' WHERE LotNo='{data.LotNo}' AND InvCode='{item.BeforInvCode}' AND WorkPoint='{item.WorkPoint}' AND ExtensionID='{item.BeforExtensionID}';"); + sql.Append($@"UPDATE ICSInventoryLot SET ExtensionID='{afterExtensionID}' WHERE LotNo='{data.LotNo}' AND InvCode='{beforInvCode}' AND WorkPoint='{item.WorkPoint}' AND ExtensionID='{beforExtensionID}';"); sql.Append($@"INSERT INTO [dbo].[ICSWareHouseLotInfoLog] ([ID], [Identification], [TransCode], [TransSequence], [LotNo], [InvCode], [FromWarehouseCode], [FromLocationCode], [ToWarehouseCode], [ToLocationCode], [Quantity], [Memo], [Lock], [TransType], [BusinessCode], [ERPUpload], [ERPID], [ERPDetailID], [ERPCode], [ERPSequence], [LogID], [MergeID], [MUSER], [MUSERName], [MTIME], [WorkPoint], [EATTRIBUTE1], [EATTRIBUTE2], [EATTRIBUTE3]) - SELECT NEWID(), NEWID(), '{item.TransCode}', '{item.TransSequence}', '{data.LotNo}', '{item.BeforInvCode}', {item.WHCode}, NULL, NULL, NULL, {data.Quantity}, NULL, '0', N'10', N'35', '0', NULL, NULL, NULL, NULL, NULL, NULL,f.F_Account ,f.F_RealName , SYSDATETIME(), '{item.WorkPoint}', NULL, NULL, '{item.BeforExtensionID}' FROM Sys_SRM_User f WHERE f.F_Account='{item.User}' ;"); + SELECT NEWID(), NEWID(), '{item.TransCode}', '{item.TransSequence}', '{data.LotNo}', '{beforInvCode}', {item.WHCode}, NULL, NULL, NULL, {data.Quantity}, NULL, '0', N'10', N'35', '0', NULL, NULL, NULL, NULL, NULL, NULL,f.F_Account ,f.F_RealName , SYSDATETIME(), '{item.WorkPoint}', NULL, NULL, '{beforExtensionID}' FROM Sys_SRM_User f WHERE f.F_Account='{item.User}' ;"); sql.Append($@"INSERT INTO [dbo].[ICSWareHouseLotInfoLog] ([ID], [Identification], [TransCode], [TransSequence], [LotNo], [InvCode], [FromWarehouseCode], [FromLocationCode], [ToWarehouseCode], [ToLocationCode], [Quantity], [Memo], [Lock], [TransType], [BusinessCode], [ERPUpload], [ERPID], [ERPDetailID], [ERPCode], [ERPSequence], [LogID], [MergeID], [MUSER], [MUSERName], [MTIME], [WorkPoint], [EATTRIBUTE1], [EATTRIBUTE2], [EATTRIBUTE3]) - SELECT NEWID(), NEWID(), '{item.TransCode}', '{item.TransSequence}', '{data.LotNo}', '{item.BeforInvCode}', {item.WHCode}, NULL, NULL, NULL, {data.Quantity}, NULL, '0', N'10', N'36', '0', NULL, NULL, NULL, NULL, NULL, NULL,f.F_Account ,f.F_RealName , SYSDATETIME(), '{item.WorkPoint}', NULL, NULL, '{item.AfterExtensionID}' FROM Sys_SRM_User f WHERE f.F_Account='{item.User}' ;"); + SELECT NEWID(), NEWID(), '{item.TransCode}', '{item.TransSequence}', '{data.LotNo}', '{beforInvCode}', {item.WHCode}, NULL, NULL, NULL, {data.Quantity}, NULL, '0', N'10', N'36', '0', NULL, NULL, NULL, NULL, NULL, NULL,f.F_Account ,f.F_RealName , SYSDATETIME(), '{item.WorkPoint}', NULL, NULL, '{afterExtensionID}' FROM Sys_SRM_User f WHERE f.F_Account='{item.User}' ;"); } else diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSMTDocModel.cs b/ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSMTDocModel.cs index 5897780..ed613fe 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSMTDocModel.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSMTDocModel.cs @@ -40,26 +40,6 @@ namespace ICSSoft.Entity /// 操作人 /// public string User { get; set; } - - /// - /// 转换前物料编码 - /// - public string BeforInvCode { get; set; } - - /// - /// 转换后物料编码 - /// - public string AfterInvCode { get; set; } - - /// - /// 转换前自由项ID - /// - public string BeforExtensionID { get; set; } - - /// - ///转换后自由项ID - /// - public string AfterExtensionID { get; set; } /// /// 条码详情信息 /// From 0021e08d063abd0f108b32d743109454bdc43cc2 Mon Sep 17 00:00:00 2001 From: lilili Date: Fri, 14 Jul 2023 17:11:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/WMS/Views/DeleteReceipts/ICSDeleteReceipts.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/DeleteReceipts/ICSDeleteReceipts.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/DeleteReceipts/ICSDeleteReceipts.cshtml index 622f9eb..91564ed 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/DeleteReceipts/ICSDeleteReceipts.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/DeleteReceipts/ICSDeleteReceipts.cshtml @@ -1569,13 +1569,13 @@ - + From 74b6fa64527bd01d2b272ebe5aed7e5d4b7d93ed Mon Sep 17 00:00:00 2001 From: lilili Date: Fri, 14 Jul 2023 17:42:14 +0800 Subject: [PATCH 3/3] =?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 --- ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs index 1c0c194..b7dd791 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs @@ -7362,6 +7362,7 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer END ; SELECT a.ID, a.MTDOCCode AS TransCode, + a.MTDOCQuantity, a.EATTRIBUTE1 AS Type, a.MTDOCType, a.Sequence AS TransSequence,