更新版本

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

@@ -169,7 +169,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                         itm.TaskId,
                         itm.Remark,
                         itm.Qty,
-                        tm1 == null ? 0 : tm1.Qty
+                        tm1 == null ? 0 : tm1.Qty,
+                        itm.OutPutQty
                         );
             return new PagedResultDto<WmsHQFSharePartOutPutDetial>(totalCount, entities);
         }
@@ -235,7 +236,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                                   GuidGenerator.Create(),
                                   string.Empty,
                                   p.Qty,
-                                  p.StockQty
+                                  p.StockQty,
+                                  p.Qty
                            ));
                         _lst.AddRange(_lsAry.ToArray());
                     }
@@ -369,6 +371,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 , string.Empty
                 , itm.Qty
                 ,0
+                ,itm.Qty
                 );
                 _lsCopy.Add(_detail);
             }

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

@@ -169,7 +169,8 @@ into temp1
             itm.TaskId,
             itm.Remark,
             itm.Qty,
-            tm1==null?0:tm1.Qty
+            tm1==null?0:tm1.Qty,
+            itm.OutPutQty
             );
 
 
@@ -239,7 +240,8 @@ into temp1
                                   GuidGenerator.Create(),
                                   string.Empty,
                                   p.Qty,
-                                  p.StockQty
+                                  p.StockQty,
+                                  p.Qty
                            ));
                         _lst.AddRange(_lsAry.ToArray());
                     }
@@ -392,6 +394,7 @@ into temp1
                 , string.Empty
                 , itm.Qty
                 ,0
+                ,itm.Qty
                 );
                 _lsCopy.Add(_detail);
             }

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

@@ -150,6 +150,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                         itm.Remark,
                         itm.Qty,
                         tm1 == null ? 0 : tm1.Qty
+                        ,itm.OutPutQty
                         );
 
 
@@ -219,7 +220,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                                   GuidGenerator.Create(),
                                   string.Empty,
                                   p.Qty,
-                                  p.StockQty
+                                  p.StockQty,
+                                  p.Qty
+                                  
                            ));
                         _lst.AddRange(_lsAry.ToArray());
                     }
@@ -372,6 +375,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 , string.Empty
                 , itm.Qty
                 , 0
+                ,itm.Qty
                 );
                 _lsCopy.Add(_detail);
             }

src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs

@@ -33,8 +33,8 @@ using Win.Sfs.SettleAccount.Reports.ReportRequestDto;
 namespace Win.Sfs.SettleAccount.Reports.ReportServices
 {
     [Authorize(SettleAccountPermissions.Reports.Default)]
-    //[AllowAnonymous]
+    [AllowAnonymous]
-    [Route("api/settleaccount/ReportMakeService")]
+    //[Route("api/settleaccount/ReportMakeService")]
     public class ReportService : ApplicationService
     {
 

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs

@@ -470,7 +470,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public WmsHQMSharePartOutPutDetial()
         {
         }
-        public WmsHQMSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty)
+        public WmsHQMSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty,decimal outputQty)
         {
             Id = id;
             WmsBillNum = wmsBillNum;
@@ -490,6 +490,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             Remark = remark;
             Qty = qty;
             StockQty = stockQty;
+            OutPutQty = outputQty;
         }
         public void SetId(Guid id)
         {
@@ -545,6 +546,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public string BillNum { set; get; }
         [ImporterHeader(Name = "任务ID", IsIgnore = true)]
         public Guid TaskId { set; get; }
+        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
+        public decimal OutPutQty { set; get; }
     }
 
     #endregion
@@ -824,7 +827,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public WmsHQFSharePartOutPutDetial()
         {
         }
-        public WmsHQFSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty)
+        public WmsHQFSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty,decimal outPutQty)
         {
             Id = id;
             WmsBillNum = wmsBillNum;
@@ -844,6 +847,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             Remark = remark;
             Qty = qty;
             StockQty = stockQty;
+            OutPutQty = outPutQty;
+            
         }
         public void SetId(Guid id)
         {
@@ -899,6 +904,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public string BillNum { set; get; }
         [ImporterHeader(Name = "任务ID", IsIgnore = true)]
         public Guid TaskId { set; get; }
+
+        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
+        public decimal OutPutQty { set; get; }
     }
 
 
@@ -1054,7 +1062,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public WmsHQHSharePartOutPutDetial()
         {
         }
-        public WmsHQHSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty,decimal stockQty)
+        public WmsHQHSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty,decimal stockQty,decimal outputQty)
         {
             Id = id;
             WmsBillNum = wmsBillNum;
@@ -1074,6 +1082,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             Remark = remark;
             Qty = qty;
             StockQty = stockQty;
+            OutPutQty = outputQty;
         }
         public void SetId(Guid id)
         {
@@ -1129,6 +1138,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public string BillNum { set; get; }
         [ImporterHeader(Name = "任务ID", IsIgnore = true)]
         public Guid TaskId { set; get; }
+        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
+        public decimal OutPutQty { set; get; }
     }
 
 

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs

@@ -70,13 +70,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         public override decimal Price { set; get; }
         [ExporterHeader(DisplayName = "金额") ]
         public override decimal Amt { set; get; }
-
-
         //发运数量
         [ExporterHeader(DisplayName = "M100数量")]
         public decimal Qty { set; get; }
-
-
         //结算数量
         [ExporterHeader(DisplayName = "结算数量")]
         public decimal SettledQty { set; get; }