更新版本

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs

@@ -437,8 +437,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 string.Empty,
                 string.Empty,
                 0,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
                 itm.ParentMaterialCode,
                 itm.BillNum,

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs

@@ -448,8 +448,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 string.Empty,
                 string.Empty,
                 0,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
                 itm.ParentMaterialCode,
                 itm.BillNum,

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs

@@ -438,8 +438,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 string.Empty,
                 string.Empty,
                 0,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend1)?itm.Extend1: string.Empty,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
                 itm.ParentMaterialCode,
                 itm.BillNum,

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs

@@ -474,8 +474,8 @@ into temp1
                 string.Empty,
                 string.Empty,
                 0,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
                 itm.MaterialCode,
                 itm.BillNum,

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs

@@ -120,8 +120,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 string.Empty,
                 string.Empty,
                 0,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
                 itm.ParentMaterialCode,
                 itm.BillNum,

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs

@@ -495,8 +495,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 string.Empty,
                 string.Empty,
                 0,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
                 itm.ParentMaterialCode,
                 itm.BillNum,

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs

@@ -199,7 +199,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                                string.Empty,
                                string.Empty,
                                0,
-                               string.Empty,
+                               !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty,
+             
                                string.Empty,
                                string.Empty,
                                p.MaterialCode,

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs

@@ -295,7 +295,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                     var sql = "DECLARE	@return_value int\n" +
                          "EXEC	@return_value = [dbo].[p_wms_output]\n" +
                          "		@billnum = N'{0}',\n" +
-                         "		@type = 9\n" +
+                         "		@type = 9,\n" +
                          "		@date = '{1}'\n" +
                          "SELECT	'Return Value' = @return_value";
                     await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
@@ -358,7 +358,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                           "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
                           "     @Guids ={0}, \n" +
                           "		@billnum = N'{1}',\n" +
-                          "		@type = 4,\n" +
+                          "		@type = 9,\n" +
                           "     @accountdate = N'{2}'\n" +
                           "SELECT	'Return Value' = @return_value";
 
@@ -394,8 +394,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 string.Empty,
                 string.Empty,
                 0,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
                 itm.ParentMaterialCode,
                 itm.BillNum,

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs

@@ -356,8 +356,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 string.Empty,
                 string.Empty,
                 0,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
                 itm.ParentMaterialCode,
                 itm.BillNum,

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs

@@ -451,8 +451,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 string.Empty,
                 string.Empty,
                 0,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                string.Empty,
+               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
                 itm.MaterialCode,
                 itm.BillNum,