Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -4831,7 +4831,7 @@ namespace Business.Replenishment
             }
             var pretreatList = pretreatments.Select(x => x.item_number).Distinct().ToList();
             itemNums.AddRange(pretreatList);
-            AsyncItemStockFromWMS(itemNums);
+            AsyncItemStockFromWMS(itemNums, analogCalcVersion);
 
             //数据库快照-同步mysql库数据到mongoDB中
             await DbSnapShot(input.company_id, input.factoryId, bangid, pretreatments, analogCalcVersion);
@@ -5587,7 +5587,10 @@ namespace Business.Replenishment
                         }
                         item.sqty += lctQty;
                     }
-                    item.sqty += sapInvList.Where(x => x.MATNR == item.icitem_number && x.SOBKZ.ToUpper() == "O").Sum(p => p.LABST + p.INSME);
+                    if(!string.IsNullOrEmpty(analogCalcVersion))
+                    {
+                        item.sqty += sapInvList.Where(x => x.MATNR == item.icitem_number && x.SOBKZ.ToUpper() == "O").Sum(p => p.LABST + p.INSME);
+                    }
                 });
                 var moIcitemStokc = ObjectMapper.Map<List<ic_item_stock>, List<mo_ic_item_stock>>(icitemStokc);
                 moIcitemStokc.ForEach(item => { item.GenerateNewId(help.NextId()); });
@@ -6556,7 +6559,7 @@ namespace Business.Replenishment
             return result;
         }
 
-        public void AsyncItemStockFromWMS(List<string> itemList)
+        public void AsyncItemStockFromWMS(List<string> itemList,string analogCalcVersion)
         {
             //产品编码
             //var itemList = bom_Pretreatments.Select(a => a.item_number).Distinct().ToList();
@@ -6624,7 +6627,7 @@ namespace Business.Replenishment
                         }
                         item.sqty += lctQty;
                     }
-                    if (param.checkPlan)
+                    if (!string.IsNullOrEmpty(analogCalcVersion))
                     {
                         item.sqty += sapInvList.Where(x => x.MATNR == item.icitem_number && x.SOBKZ.ToUpper() == "O").Sum(p => p.LABST + p.INSME);
                     }

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -1188,7 +1188,7 @@ namespace Business.ResourceExamineManagement
                         toTime = toTime.AddDays(-7);
                         break;
                     default:
-                        toTime = toTime.AddDays(dayOfWeek - 1);
+                        toTime = toTime.AddDays(-dayOfWeek);
                         break;
                 }
                 DateTime starttime = toTime.Date.AddDays(1);
@@ -1378,7 +1378,7 @@ namespace Business.ResourceExamineManagement
                     toTime = toTime.AddDays(-7);
                     break;
                 default:
-                    toTime = toTime.AddDays(dayOfWeek - 1);
+                    toTime = toTime.AddDays(-dayOfWeek);
                     break;
             }
             DateTime starttime = toTime.Date.AddDays(1);
@@ -1510,7 +1510,7 @@ namespace Business.ResourceExamineManagement
                     toTime = toTime.AddDays(-7);
                     break;
                 default:
-                    toTime = toTime.AddDays(dayOfWeek - 1);
+                    toTime = toTime.AddDays(-dayOfWeek);
                     break;
             }
             DateTime starttime = toTime.Date.AddDays(1);
@@ -2104,8 +2104,8 @@ namespace Business.ResourceExamineManagement
                     }
                 }
                 var locStock = _invMaster.Select(a => numbers.Contains(a.ItemNum) && a.IsActive && a.Domain == factoryId.ToString() && locationList.Contains(a.Location));
-                var sapInvList = _SAPInv.Select(a => a.WERKS == factoryId.ToString() && numbers.Contains(a.MATNR) && (a.SOBKZ.ToUpper() == "O" || locationList.Contains(a.LGORT)));
-
+                //var sapInvList = _SAPInv.Select(a => a.WERKS == factoryId.ToString() && numbers.Contains(a.MATNR) && (a.SOBKZ.ToUpper() == "O" || locationList.Contains(a.LGORT)));
+                var sapInvList = _SAPInv.Select(a => a.WERKS == factoryId.ToString() && numbers.Contains(a.MATNR) && locationList.Contains(a.LGORT));
                 //设置当前计算bangid
                 icitemStokc.ForEach(item => {
                     item.bang_id = bangid;
@@ -2120,10 +2120,10 @@ namespace Business.ResourceExamineManagement
                         }
                         item.sqty += lctQty;
                     }
-                    if (param.checkPlan)
+                    /*if (param.checkPlan)
                     {
                         item.sqty += sapInvList.Where(x => x.MATNR == item.icitem_number && x.SOBKZ.ToUpper() == "O").Sum(p => p.LABST + p.INSME);
-                    }
+                    }*/
                 });
                 var moIcitemStokc = ObjectMapper.Map<List<ic_item_stock>, List<mo_ic_item_stock>>(icitemStokc);
                 moIcitemStokc.ForEach(item => { item.GenerateNewId(help.NextId()); });
@@ -4358,8 +4358,8 @@ namespace Business.ResourceExamineManagement
                 }
             }
             var locStock = _invMaster.Select(a => itemChildList.Contains(a.ItemNum) && a.IsActive && a.Domain == param.factoryId.ToString() && locationList.Contains(a.Location));
-            var sapInvList = _SAPInv.Select(a => a.WERKS == param.factoryId.ToString() && itemChildList.Contains(a.MATNR) && (a.SOBKZ.ToUpper() == "O" || locationList.Contains(a.LGORT)));
-
+            //var sapInvList = _SAPInv.Select(a => a.WERKS == param.factoryId.ToString() && itemChildList.Contains(a.MATNR) && (a.SOBKZ.ToUpper() == "O" || locationList.Contains(a.LGORT)));
+            var sapInvList = _SAPInv.Select(a => a.WERKS == param.factoryId.ToString() && itemChildList.Contains(a.MATNR) && locationList.Contains(a.LGORT));
             //根据WMS物料，取出DOP物料数据
             var items = _mysql_ic_item.GetListAsync(a => itemChildList.Contains(a.number) && a.factory_id == param.factoryId).Result;
 
@@ -4400,10 +4400,10 @@ namespace Business.ResourceExamineManagement
                         }
                         item.sqty += lctQty;
                     }
-                    if (param.checkPlan)
+                    /*if (param.checkPlan)
                     {
                         item.sqty += sapInvList.Where(x => x.MATNR == item.icitem_number && x.SOBKZ.ToUpper() == "O").Sum(p => p.LABST + p.INSME);
-                    }
+                    }*/
                 }
             }
             if (needAddList.Count > 0)

MicroServices/Business/Business.HttpApi/Controllers/ResourceExamineController.cs

@@ -158,9 +158,9 @@ namespace Business.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("PrAutoMerge")]
-        public Task<string> PrAutoMerge(string companyid)
+        public Task<string> PrAutoMerge(string domain)
         {
-            return _ResourceExamineAppService.PrAutoMerge(companyid);
+            return _ResourceExamineAppService.PrAutoMerge(domain);
         }
 
         /// <summary>
@@ -182,9 +182,9 @@ namespace Business.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("PrAutoApprove")]
-        public Task<string> PrAutoApprove(string companyid)
+        public Task<string> PrAutoApprove(string domain)
         {
-            return _ResourceExamineAppService.PrAutoApprove(companyid);
+            return _ResourceExamineAppService.PrAutoApprove(domain);
         }
 
         /// <summary>
@@ -244,9 +244,9 @@ namespace Business.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("PrSendSAP")]
-        public Task<string> PrSendSAP(string companyid)
+        public Task<string> PrSendSAP(string domain)
         {
-            return _ResourceExamineAppService.PrSendSAP(companyid);
+            return _ResourceExamineAppService.PrSendSAP(domain);
         }
 
         /// <summary>
@@ -310,5 +310,17 @@ namespace Business.Controllers
         {
             return _ResourceExamineAppService.WorkOrdKittingCheckByNo(workord, qty, instockdate, priority, domain, userAccount);
         }
+
+        /// <summary>
+        /// 调整过去采购申请时间
+        /// </summary>
+        /// <param name="domain"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("AutomaticPrAdjustDate")]
+        public Task<string> AutomaticPrAdjustDate(string domain)
+        {
+            return _ResourceExamineAppService.AutomaticPrAdjustDate(domain);
+        }
     }
 }