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

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

@@ -4429,7 +4429,7 @@ namespace Business.Replenishment
 
 
             var itemIds = items.Select(b => b.Id).ToList();//需要处理的dop物料id集合
-            List<ic_item_stock> mysqlStock = _mysql_ic_item_stock.GetListAsync(a => itemIds.Contains(a.Id) && a.factory_id == param.factoryId && a.company_id == param.company_id).Result;
+            List<ic_item_stock> mysqlStock = _mysql_ic_item_stock.GetListAsync(a => itemIds.Contains(a.icitem_id) && a.factory_id == param.factoryId && a.company_id == param.company_id).Result;
             List<ic_item_stock> needAddList = new List<ic_item_stock>();
 
             foreach (var stockWMS in groupList)
@@ -4437,7 +4437,7 @@ namespace Business.Replenishment
                 var num = items.Find(x => x.number == stockWMS.ItemNum);
                 if (num != null)
                 {
-                    var item = mysqlStock.Find(a => a.Id == num.Id);
+                    var item = mysqlStock.Find(a => a.icitem_id == num.Id);
                     if (item != null)
                     {
                         item.sqty = groupList.First(a => a.ItemNum == num.number).Qty;

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

@@ -2712,6 +2712,7 @@ namespace Business.ResourceExamineManagement
                 }
                 if (checkMo.Any())
                 {
+
                     var rtn = await OrderKittingCheck(checkMo);
                     if (rtn != null && rtn.examines != null)
                     {
@@ -3980,7 +3981,7 @@ namespace Business.ResourceExamineManagement
             var items = _mysql_ic_item.GetListAsync(a => itemNums.Contains(a.number) && a.factory_id == param.factoryId && a.company_id == param.company_id).Result;
 
             var itemIds = items.Select(b => b.Id).ToList();//需要处理的dop物料id集合
-            List<ic_item_stock> mysqlStock = _mysql_ic_item_stock.GetListAsync(a => itemIds.Contains(a.Id) && a.factory_id == param.factoryId && a.company_id == param.company_id).Result;
+            List<ic_item_stock> mysqlStock = _mysql_ic_item_stock.GetListAsync(a => itemIds.Contains(a.icitem_id) && a.factory_id == param.factoryId && a.company_id == param.company_id).Result;
             List<ic_item_stock> needAddList = new List<ic_item_stock>();
 
             foreach (var stockWMS in groupList)
@@ -3988,7 +3989,7 @@ namespace Business.ResourceExamineManagement
                 var num = items.Find(x => x.number == stockWMS.ItemNum);
                 if (num != null)
                 {
-                    var item = mysqlStock.Find(a => a.Id == num.Id);
+                    var item = mysqlStock.Find(a => a.icitem_id == num.Id);
                     if (item != null)
                     {
                         item.sqty = groupList.First(a => a.ItemNum == num.number).Qty;