Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

# Conflicts:
#	src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220102.txt

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

@@ -406,6 +406,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// <returns></returns>
         [HttpPost]
         [Route("WmsJitOutPut-Pass")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsJitOutPutPass(WmsJitRequestDto input)
         {
             if (input.Guids != null)

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

@@ -292,15 +292,20 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                     var _list = _excelHelper.ExcelToList<WmsKanbanOutPutDetial>();
                     foreach (var itm in _list)
                     {
-                        itm.SetId(GuidGenerator.Create(),string.Empty);
+
+
+
+
+
+                        itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create());
                     }
                     _lst.AddRange(_list.ToArray());
                 }
-                var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
+              //  var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
                 var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
 
                 var error = from itm1 in outPutDetail
-                            join itm2 in _ls1 on
+                            join itm2 in _lst on
                             new { itm1.MaterialCode, itm1.Kanban}
                             equals
                             new { itm2.MaterialCode, itm2.Kanban }
@@ -309,7 +314,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 if (errList.Count() == 0)
                 {
 
-                    var query = from itm1 in _ls1
+                    var query = from itm1 in _lst
                                 join itm2 in outPutDetail on
                                 new { itm1.MaterialCode, itm1.Kanban }
                                 equals
@@ -367,6 +372,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// <returns></returns>
         [HttpPost]
         [Route("WmsKanbanOutPut-Pass")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsKanbanOutPutPass(WmsJitRequestDto input)
         {
             if (input.Guids != null)
@@ -476,7 +482,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 itm.BillNum,
                 GuidGenerator.Create()
                 , string.Empty
-                , itm.Qty.Value
+                , itm.Qty
                 );
                 _lsCopy.Add(_detail);
             }

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

@@ -274,6 +274,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// <returns></returns>
         [HttpPost]
         [Route("WmsSharePartOutPut-Pass")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
         {
             if (input.Guids != null)

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

@@ -257,10 +257,16 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             Remark = remark;
             Qty = qty;
         }
-        public void SetId(Guid id,string remark)
+        public void SetData(Guid id,string remark,string wmsbillnum,string version,Guid taskId)
         {
             Id = id;
             Remark = remark;
+            WmsBillNum = wmsbillnum;
+            Version = version;
+            TaskId = taskId;
+            
+       
+
         }
 
 
@@ -269,7 +275,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         //交货单号
 
-        [ImporterHeader(Name = "组件组物料")]
+        [ImporterHeader(Name = "组件组物料",IsIgnore =true)]
         public string ParentMaterialCode { set; get; }
         [ImporterHeader(Name = "交货单号")]
         public string WmsBillNum { set; get; }
@@ -292,7 +298,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         [ImporterHeader(Name = "入库库位", IsIgnore = true)]
         //入库库位
         public string InPut { set; get; }
-        [ImporterHeader(Name = "状态")]
+        [ImporterHeader(Name = "状态",IsIgnore =true)]
         public int State { get; set; }
         [ImporterHeader(Name = "客户物料")]
         /// <summary>
@@ -309,13 +315,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// </summary>
         [ImporterHeader(Name = "版本号", IsIgnore = true)]
         public string Version { set; get; }
-        [ImporterHeader(Name = "结算数量",IsIgnore =true)]
-        public decimal? Qty { set; get; }
+        [ImporterHeader(Name = "结算数量")]
+        public decimal Qty { set; get; }
 
         [ImporterHeader(Name = "单据", IsIgnore = true)]
         public string BillNum { set; get; }
 
-
+        [ImporterHeader(Name = "任务", IsIgnore = true)]
         public Guid TaskId { set; get; }
 
 

vue/static/config.js

@@ -2,8 +2,8 @@ let configJSON
 if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
-			//ip: 'http://192.168.0.63',
-      ip: 'http://192.168.0.140',
+			ip: 'http://192.168.0.67',
+      //ip: 'http://192.168.0.140',
       //ip: 'http://149.223.116.5',
       auth_port: '8066',
       public_port: '8092',