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

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettleAccounts/SettleAccountDto.cs

@@ -9,6 +9,13 @@ using Win.Sfs.Shared.DtoBase;
 
 namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 {
+ 
+
+
+   
+
+
+
     public  class SettleAccountDto:  AuditedEntityDtoBase<Guid>, IBranch<Guid>
     {
 

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs

@@ -23,6 +23,9 @@ namespace Win.Sfs.SettleAccount.Entities.Wms
 
         public string Creator { set; get; }
 
+        public string SumContent { set; get; }
+
+      
 
 
     }
@@ -137,6 +140,7 @@ namespace Win.Sfs.SettleAccount.Entities.Wms
 
         public string Creator { set; get; }
 
+        public string SumContent { set; get; }
 
 
     }

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

@@ -322,7 +322,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                     int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
                     if (_count == 0)
                     {
-                        var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,"");
+                        var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,"",string.Empty);
                         _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
                         await _wmsVersionRepository.InsertAsync(_version, true);
                     }
@@ -605,7 +605,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
             if (_count == 0)
             {
-                var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,customerCode);
+                var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,customerCode,string.Empty);
              
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }

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

@@ -312,7 +312,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                     int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
                     if (_count == 0)
                     {
-                        var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+                        var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
                         _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
                         await _wmsVersionRepository.InsertAsync(_version, true);
                     }
@@ -522,7 +522,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
             if (_count == 0)
             {
-                var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+                var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
             return ApplicationConsts.SuccessStr;

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

@@ -310,7 +310,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                     int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
                     if (_count == 0)
                     {
-                        var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+                        var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
                         _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
                         await _wmsVersionRepository.InsertAsync(_version, true);
                     }
@@ -563,7 +563,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
             if (_count == 0)
             {
-                var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+                var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
              
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }

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

@@ -54,7 +54,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
     /// <summary>
     /// wms出库
     /// </summary>
-
     //[Authorize(SettleAccountPermissions.WMSJIT.Default)]
     [Route("api/settleaccount/wmsjitoutput")]
 
@@ -193,7 +192,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
             if (_count == 0 && _wmslst.Count()>0)
             {
-                var _version = new WmsJitOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+                var _version = new WmsJitOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
             return ApplicationConsts.SuccessStr;
@@ -232,16 +231,16 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                  input.SkipCount, true);
 
             var totalCount = await GetCountAsync(input);
-            var _ls = _repository.GetDic("WmsJitOutPut");
+            //var _ls = _repository.GetDic("WmsJitOutPut");
-            foreach (var itm in entities)
+            //foreach (var itm in entities)
-            {
+            //{
-                var _first = _ls.FirstOrDefault(p => p.BillNum == itm.BillNum);
+            //    var _first = _ls.FirstOrDefault(p => p.BillNum == itm.BillNum);
-                if (_first != null)
+            //    if (_first != null)
-                {
+            //    {
-                   itm.Extend = _first.OutputInfo;
+            //       itm.Extend = _first.OutputInfo;
                 
-                }
+            //    }
-            }
+            //}
                 
 
             return new PagedResultDto<WmsJitOutPut>(totalCount, entities);
@@ -462,7 +461,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                     int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
                     if (_count == 0 && _wmslst.Count()>0)
                     {
-                        var _version = new WmsJitOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+                        var _version = new WmsJitOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
                         _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
                         //var _ls = new List<WmsJitOutPut>();
                         //_ls.Add(_version);

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

@@ -351,7 +351,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                     int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
                     if (_count == 0  && _wmslst.Count()>0)
                     {
-                        var _version = new WmsKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+                        var _version = new WmsKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
                         _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark)  ? _joblist.FirstOrDefault().Remark : string.Empty;
                         await _wmsVersionRepository.InsertAsync(_version, true);
                     }
@@ -866,7 +866,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
             if (_count == 0)
             {
-                var _version = new WmsKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+                var _version = new WmsKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
             //return _billNum;

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

@@ -384,7 +384,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
             if (_count == 0 && _wmslst.Count()>0)
             {
-                var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+                var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
             return ApplicationConsts.SuccessStr;
@@ -472,7 +472,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
             if (_count == 0)
             {
-                var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+                var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
                
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }

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

@@ -332,7 +332,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                     int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
                     if (_wmslst.Count() > 0 && _count == 0)
                     {
-                        var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+                        var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
                         await _wmsVersionRepository.InsertAsync(_version, true);
                     }
                     foreach (var job in _joblist)
@@ -595,7 +595,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
             if (_count == 0 && _wmslst.Count() > 0)
             {
-                var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+                var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
             return ApplicationConsts.SuccessStr;

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

@@ -383,7 +383,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                         int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNoNum);
                         if (_wmslst.Count() > 0 && _count == 0)
                         {
-                            var _version = new WmsSharePartOutPut(GuidGenerator.Create(), input.Version, _billNoNum, CurrentUser.Email);
+                            var _version = new WmsSharePartOutPut(GuidGenerator.Create(), input.Version, _billNoNum, CurrentUser.Email,string.Empty);
                             _version.Remark= !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
 
 
@@ -468,7 +468,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                         int _count = _wmsVersionRepository90.Count(p => p.Version == input.Version && p.BillNum == _billNum);
                         if (_wmslstBill.Count() > 0 && _count == 0)
                         {
-                            var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+                            var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
 
                             _version.Remark=  !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
 
@@ -792,7 +792,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNoNum);
                 if (_count == 0 && _wmslst.Count() > 0)
                 {
-                    var _version = new WmsSharePartOutPut(GuidGenerator.Create(), version, _billNoNum, CurrentUser.Email);
+                    var _version = new WmsSharePartOutPut(GuidGenerator.Create(), version, _billNoNum, CurrentUser.Email,string.Empty);
                     await _wmsVersionRepository.InsertAsync(_version, true);
                 }
             }
@@ -890,7 +890,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 int _count = _wmsVersionRepository90.Count(p => p.Version == version && p.BillNum == _billNum);
                 if (_count == 0 && _wmslst.Count() > 0)
                 {
-                    var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+                    var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
                     await _wmsVersionRepository90.InsertAsync(_version, true);
                 }
             }

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

@@ -353,7 +353,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
             if (_count == 0)
             {
-                var _version = new WmsHQWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+                var _version = new WmsHQWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
             return ApplicationConsts.SuccessStr; ;

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

@@ -288,7 +288,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
             if (_count == 0)
             {
-                var _version = new WmsOneTimeSaleOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+                var _version = new WmsOneTimeSaleOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
             return ApplicationConsts.SuccessStr; 

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

@@ -65,19 +65,22 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsCustomerKanbanOutPut(Guid id, string version, string billNum, string creator,string customercode) : base(id)
+        public WmsCustomerKanbanOutPut(Guid id, string version, string billNum, string creator,string customercode,string content) : base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
             CustomerCode = customercode;
+            SumContent = content;
         }
 
         public string Version { set; get; }
         public string BillNum { set; get; }
         public string Creator { set; get; }
-        public string CustomerCode { set; get; } 
+        public string CustomerCode { set; get; }
+
+        public string SumContent { set; get; }
     }
 
 
@@ -322,12 +325,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsJitOutPut(Guid id,string version, string billNum, string creator):base(id)
+        public WmsJitOutPut(Guid id,string version, string billNum, string creator,string content):base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
+            SumContent = content;
         }
 
         public string Version { set; get; }
@@ -337,7 +341,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public string Creator { set; get; }
 
 
-    
+        public string SumContent { set; get; }
+
 
 
 
@@ -528,12 +533,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id)
+        public WmsKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
+            SumContent = content;
         }
 
         public string Version { set; get; }
@@ -541,7 +547,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public string BillNum { set; get; }
 
         public string Creator { set; get; }
-
+        public string SumContent { set; get; }
 
 
     }
@@ -672,12 +678,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsWithOutKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id)
+        public WmsWithOutKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
+            SumContent = content;
         }
 
         public string Version { set; get; }
@@ -686,7 +693,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         public string Creator { set; get; }
 
-
+        public string SumContent { set; get; }
 
     }
 
@@ -814,12 +821,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsHQWithOutKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id)
+        public WmsHQWithOutKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
+            SumContent = content;
         }
 
         public string Version { set; get; }
@@ -828,7 +836,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         public string Creator { set; get; }
 
-
+        public string SumContent { set; get; }
 
     }
 
@@ -923,12 +931,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsOneTimeSaleOutPut(Guid id, string version, string billNum, string creator) : base(id)
+        public WmsOneTimeSaleOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
+            SumContent = content;
         }
 
         public string Version { set; get; }
@@ -937,7 +946,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         public string Creator { set; get; }
 
-
+        public string SumContent { set; get; }
 
     }
 
@@ -1468,17 +1477,19 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsHQFKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id)
+        public WmsHQFKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
+            SumContent = content;
         }
 
         public string Version { set; get; }
         public string BillNum { set; get; }
         public string Creator { set; get; }
+        public string SumContent { set; get; }
     }
 
 
@@ -1746,13 +1757,16 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsHQHKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id)
+        public WmsHQHKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
+            SumContent = content;
+
         }
+        public string SumContent { set; get; }
 
         public string Version { set; get; }
         public string BillNum { set; get; }
@@ -2132,12 +2146,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id)
+        public WmsSharePartOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
+            SumContent = content;
         }
 
         public string Version { set; get; }
@@ -2146,7 +2161,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         public string Creator { set; get; }
 
-
+        public string SumContent { set; get; }
 
     }
 
@@ -2300,12 +2315,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
         }
 
-        public WmsSharePart90OutPut(Guid id, string version, string billNum, string creator) : base(id)
+        public WmsSharePart90OutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
         {
             Id = id;
             Version = version;
             BillNum = billNum;
             Creator = creator;
+            SumContent = content;
         }
 
         public string Version { set; get; }
@@ -2314,7 +2330,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         public string Creator { set; get; }
 
-
+        public string SumContent { set; get; }
 
     }