更新版本

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

@@ -295,9 +295,10 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                          "EXEC	@return_value = [dbo].[p_wms_output]\n" +
                          "		@billnum = N'{0}',\n" +
                          "		@type = 4\n" +
+                         "      @date = N'{1}',\n" +
                          "SELECT	'Return Value' = @return_value";
                     await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum));
+                       string.Format(sql, input.BillNum,input.AccountDate));
 
                 }
             }

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

@@ -137,23 +137,20 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// <returns></returns>
         [HttpPost]
         [Route("WmsSharePartDetailList")]
+        [UnitOfWork(false)]
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQHSharePartOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
         {
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
-
             var totalCount = await GetCountAsync(input);
             var stockList = _wmsDapper.GetSalesStock();
-
-
-
            var query= from itm in entities
             join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
 into temp1
             from tm1 in temp1.DefaultIfEmpty()
             select new WmsHQHSharePartOutPutDetial(
-                itm.Id,
+            itm.Id,
             itm.WmsBillNum,
             itm.OrderBillNum,
             itm.MaterialCode,
@@ -170,7 +167,7 @@ into temp1
             itm.TaskId,
             itm.Remark,
             itm.Qty,
-            tm1.Qty
+            tm1==null?0:tm1.Qty
             );
 
 
@@ -315,9 +312,10 @@ into temp1
                          "EXEC	@return_value = [dbo].[p_wms_output]\n" +
                          "		@billnum = N'{0}',\n" +
                          "		@type = 4\n" +
+                         "      @date = N'{1}',\n"+
                          "SELECT	'Return Value' = @return_value";
                     await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum));
+                       string.Format(sql, input.BillNum,input.AccountDate));
 
                 }
             }

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

@@ -179,7 +179,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             }
             await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
+            if (_count == 0 && _wmslst.Count()>0)
             {
                 var _version = new WmsJitOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
                 await _wmsVersionRepository.InsertAsync(_version, true);

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

@@ -391,6 +391,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                          "EXEC	@return_value = [dbo].[p_wms_output]\n" +
                          "		@billnum = N'{0}',\n" +
                          "		@type = 1\n" +
+                         "      @date = N'{1}'\n" +
                          "SELECT	'Return Value' = @return_value";
                     await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                        string.Format(sql, input.BillNum));

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

@@ -315,6 +315,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                          "EXEC	@return_value = [dbo].[p_wms_output]\n" +
                          "		@billnum = N'{0}',\n" +
                          "		@type = 2\n" +
+                         "      @date = N'{1}'\n" +
                          "SELECT	'Return Value' = @return_value";
                     await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                        string.Format(sql, input.BillNum));

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

@@ -298,9 +298,10 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                          "EXEC	@return_value = [dbo].[p_wms_output]\n" +
                          "		@billnum = N'{0}',\n" +
                          "		@type = 4\n" +
+                         "      @date = N'{1}',\n" +
                          "SELECT	'Return Value' = @return_value";
                     await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum));
+                       string.Format(sql, input.BillNum,input.AccountDate));
 
                 }
             }