Merge branch 'master' of https://e.coding.net/ccwin-in/PG/Win.Sfs.SmartSettlementSystem.PG

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

@@ -28,7 +28,7 @@ using WY.NewJit.Extends.PaiGe.WMS;
 namespace Win.Sfs.SettleAccount.Entities.WMS
 {
     [Route("api/settleaccount/wmsSharePart90output")]
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
+    //[Authorize(SettleAccountPermissions.WMSJIT.Default)]
     public class WMSSharePart90AppService :
         SettleAccountApplicationBase<WmsSharePart90OutPutDetial>
     {
@@ -109,6 +109,30 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             return new PagedResultDto<WmsSharePart90OutPut>(totalCount, entities);
         }
 
+        /// <summary>
+        ///  修改出库数量
+        /// </summary>
+        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsSharePartOutPutModify")]
+        [DisableRequestSizeLimit]
+
+        public async Task<bool> WmsSharePartUpdate(WmsSharePart90OutPutDetial detial)
+        {
+            var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList();
+            if (_entityList.Count() > 0)
+            {
+                foreach (var itm in _entityList)
+                {
+                    itm.OutPutQty = detial.OutPutQty;
+                    await _wmsRepository.UpdateAsync(itm);
+                }
+            }
+            return true;
+
+        }
+
         /// <summary>
         /// 准时化出库明细
         /// </summary>
@@ -116,6 +140,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <returns></returns>
         [HttpPost]
         [Route("WmsSharePartDetailList")]
+        [UnitOfWork(false)]
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsSharePart90OutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
         {
@@ -150,7 +175,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                         itm.Remark,
                         itm.Qty,
                         tm1 == null ? 0 : tm1.Qty,
-                        itm.OutPutQty
+                        itm.Qty
                         );
 
 

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

@@ -1549,6 +1549,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             TaskId = taskId;
             Remark = remark;
             Qty = qty;
+            StockQty = stockQty;
+            OutPutQty = outputQty;
         }
 
 

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

@@ -281,7 +281,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
         [ExporterHeader(DisplayName = "期间 ")]
         public string 期间 { set; get; }
-        [ExporterHeader(DisplayName = "交货单号 ")]
+        [ExporterHeader(DisplayName = "交货单号")]
         public string 交货单号 { set; get; }
         [ExporterHeader(DisplayName = "发货日期")]
         public string 发货日期 { set; get; }

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

@@ -225,7 +225,7 @@ public class SparePartSumQtyDiff
 
         [ExporterHeader(DisplayName = "期间 ")]
         public string 期间         {set;get;}
-        [ExporterHeader(DisplayName = "交货单号 ")]
+        [ExporterHeader(DisplayName = "交货单号")]
         public string 交货单号     {set;get;}
         [ExporterHeader(DisplayName = "发货日期")]
         public string 发货日期     {set;get;}