在途在制BUG修复。

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -45,6 +45,8 @@ namespace Business.ResourceExamineManagement
         public List<mo_srm_po_occupy> srm_Po_Occupies = new List<mo_srm_po_occupy>();
         public List<mo_srm_po_occupy> srm_Po_OccupiesInsert = new List<mo_srm_po_occupy>();
 
+        public List<mo_ic_item_stockoccupy> newStockOccList = new List<mo_ic_item_stockoccupy>();
+
         public crm_seorder seorder = new crm_seorder();
 
         SnowFlake help = new SnowFlake();
@@ -189,6 +191,7 @@ namespace Business.ResourceExamineManagement
                     }
                     itemStockoccupyDto.quantity = level1Dto.sqty;
                     sklist.Add(itemStockoccupyDto);
+                    newStockOccList.Add(itemStockoccupyDto);
                 }
             }
             else {
@@ -563,7 +566,7 @@ namespace Business.ResourceExamineManagement
                     }
                     else
                     {
-                        Calczykc(item, parent, sklist, bangid);
+                        Calczykc(item, parent, newStockOccList, bangid);
 
                         //直接占用库存，缺料就生成采购
                         mo_ic_item_stockoccupy itemStockoccupyDto = new mo_ic_item_stockoccupy();
@@ -601,6 +604,7 @@ namespace Business.ResourceExamineManagement
                 if (item.sqty > 0)
                 {
                     itemStockoccupyDto.quantity = item.sqty;
+                    newStockOccList.Add(itemStockoccupyDto);
                     sklist.Add(itemStockoccupyDto);
                 }
                 item.use_qty = item.sqty;
@@ -730,6 +734,7 @@ namespace Business.ResourceExamineManagement
                     itemStockoccupyDto.quantity = item.use_qty;
                 }
                 sklist.Add(itemStockoccupyDto);
+                newStockOccList.Add(itemStockoccupyDto);
             }
         }
 
@@ -973,6 +978,7 @@ namespace Business.ResourceExamineManagement
                         itemStockoccupyDto.quantity = zy.use_qty;
                         itemStockoccupyDto.item_no = zy.num;
                         sklist.Add(itemStockoccupyDto);
+                        newStockOccList.Add(itemStockoccupyDto);
                     }
                     idx++;
                 }
@@ -1010,6 +1016,7 @@ namespace Business.ResourceExamineManagement
                         itemStockoccupyDto.quantity = lack_Count;
                         sct.use_qty += lack_Count;
                         sklist.Add(itemStockoccupyDto);
+                        newStockOccList.Add(itemStockoccupyDto);
                     }
                     else
                     {
@@ -1017,6 +1024,7 @@ namespace Business.ResourceExamineManagement
 
                         itemStockoccupyDto.quantity = sqty;
                         sklist.Add(itemStockoccupyDto);
+                        newStockOccList.Add(itemStockoccupyDto);
                         sct.lack_qty = lack_num * -1;
                         sct.kitting_time = DateTime.Now;
                         sct.use_qty += sqty;
@@ -1282,6 +1290,8 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         public void CalcInTransit(crm_seorderentry sentrys, BomChildExamineDto item, long bangid, DateTime plan_date)
         {
+            _purchaseOrderAppService.mo_Srm_Po_Lists = srm_Po_Lists; //采购明细
+            _purchaseOrderAppService.srm_Po_Occupies = srm_Po_Occupies; //采购明细
             var occupylist = _purchaseOrderAppService.CheckPurchaseOrder(sentrys, item.item_id, item.lack_qty, plan_date, planList, bangid);
             if (occupylist.Any())
             {

MicroServices/Business/Business.Application/ResourceExamineManagement/PurchaseOrderAppService.cs

@@ -102,9 +102,9 @@ namespace Business.ResourceExamineManagement
             foreach (var item in poDetails)
             {
                 var poOccupy = poOccupys.Where(x => x.polist_id == item.id).ToList();
-                decimal? Qtys = poOccupy.Count > 0 ? poOccupy.Sum(x => x.qty) : 0.00m;
+                decimal? Qtys = poOccupy.Count > 0 ? poOccupy.Sum(x => x.qty.GetValueOrDefault()) : 0.00m;
                 //剩余可用数量
-                var PlanQty = item.plan_qty - item.rqty - item.esqty - Qtys;
+                var PlanQty = item.plan_qty.GetValueOrDefault() - item.rqty.GetValueOrDefault() - item.esqty.GetValueOrDefault() - Qtys;
                 if (PlanQty > 0)
                 {
                     //可占用数量-需求数量小于0时 占用全部可占用数量

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

@@ -662,6 +662,7 @@ namespace Business.ResourceExamineManagement
                     getBomList.ForEach(s => s.sentry_id = item.Id);
                     //库存初始化
                     _CalcBomViewAppService.BomStock(getBomList, stocklist, bangid);
+                    _CalcBomViewAppService.newStockOccList = new List<mo_ic_item_stockoccupy>();
                     //计算
                     _CalcBomViewAppService.CalcView(getBomList, bangid, item.qty.GetValueOrDefault(), item.plan_date, sklist, item, urgent, icitemlist);
 
@@ -2150,9 +2151,9 @@ namespace Business.ResourceExamineManagement
           && boms.Select(p => p.item_number).Contains(x.fitem_number) && x.bang_id == bangid).Result;
 
             //物料采购订单明细
-            var poDetailList = _srm_po_list.GetManyByCondition(x => boms.Select(p => p.icitem_id).ToList().Contains(x.icitem_id.Value) && x.state == 1 && x.rstate == 1 && !x.IsDeleted).Result;
+            var poDetailList = _srm_po_list.GetManyByCondition(x => icitemlist.Select(p => p.mysql_id).ToList().Contains(x.icitem_id.Value) && x.bang_id == bangid && x.state == 1 && x.rstate == 1 && !x.IsDeleted).Result;
             //采购订单占用数据
-            var poOccupys = _srm_po_occupy.GetManyByCondition(x => poDetailList.Select(p => p.id).ToList().Contains(x.polist_id) && !x.IsDeleted).Result;
+            var poOccupys = _srm_po_occupy.GetManyByCondition(x => poDetailList.Select(p => p.id).ToList().Contains(x.polist_id) && x.bang_id == bangid && !x.IsDeleted).Result;
             #endregion
 
             //物料库存
@@ -2162,7 +2163,6 @@ namespace Business.ResourceExamineManagement
             leadTimeList = GetLeadTime(itemIds, param.tenantId, param.factoryId);//提前期列表
             supplierList = GetSupplier(itemIds, param.tenantId, param.factoryId);//供应商列表
             planList = GetICPlan(itemIds, param.tenantId, param.factoryId);//plan列表
-
             
             _CalcBomViewAppService.planList = planList;
             _CalcBomViewAppService.leadTimeList = leadTimeList;

MicroServices/Business/Bussiness.MongoModel/MES/IC/mo_ic_item_stock.cs

@@ -11,7 +11,7 @@ namespace Business.MongoModel.MES.IC
     /// <summary>
     /// 物料库存表
     /// </summary>
-    [CollectionName("dopbang", "mo_ic_item_stock")]
+    [CollectionName("dopbase", "mo_ic_item_stock")]
     [Comment("物料库存表")]
     public class mo_ic_item_stock : MoBaseEntity
     {

MicroServices/Business/Bussiness.MongoModel/MES/IC/mo_ic_item_stockoccupy.cs

@@ -15,7 +15,7 @@ namespace Business.MongoModel.MES.IC
     /// <summary>
     /// 资源检查物料占用明细表
     /// </summary>
-    [CollectionName("dopbang", "mo_ic_item_stockoccupy")]
+    [CollectionName("dopbase", "mo_ic_item_stockoccupy")]
     [Comment("资源检查物料占用明细表")]
     public class mo_ic_item_stockoccupy:MoBaseEntity
     {

MicroServices/Business/Bussiness.MongoModel/Production/mo_mes_moentry.cs

@@ -15,7 +15,7 @@ namespace Business.MongoModel.Production
     /// <summary>
     /// 生成工单子表
     /// </summary>
-    [CollectionName("dopbang", "mo_mes_moentry")]
+    [CollectionName("dopbase", "mo_mes_moentry")]
     [Comment("生成工单子表")]
     public class mo_mes_moentry : MoBaseEntity
     {

MicroServices/Business/Bussiness.MongoModel/Production/mo_mes_mooccupy.cs

@@ -15,7 +15,7 @@ namespace Business.MongoModel.Production
     /// <summary>
     /// 在制工单占用记录表
     /// </summary>
-    [CollectionName("dopbang", "mo_mes_mooccupy")]
+    [CollectionName("dopbase", "mo_mes_mooccupy")]
     [Comment("在制工单占用记录表")]
     public class mo_mes_mooccupy : MoBaseEntity
     {

MicroServices/Business/Bussiness.MongoModel/Production/mo_mes_morder.cs

@@ -16,7 +16,7 @@ namespace Business.MongoModel.Production
     /// <summary>
     /// 工单主表
     /// </summary>
-    [CollectionName("dopbang", "mo_mes_morder")]
+    [CollectionName("dopbase", "mo_mes_morder")]
     [Comment("工单主表")]
     public class mo_mes_morder : MoBaseEntity
     {

MicroServices/Business/Bussiness.MongoModel/Production/mo_mes_oorder.cs

@@ -15,7 +15,7 @@ namespace Business.MongoModel.Production
     /// <summary>
     /// 委外订单表
     /// </summary>
-    [CollectionName("dopbang", "mo_mes_oorder")]
+    [CollectionName("dopbase", "mo_mes_oorder")]
     [Comment("委外订单表")]
     public class mo_mes_oorder : MoBaseEntity
     {

MicroServices/Business/Bussiness.MongoModel/SRM/mo_srm_po_list.cs

@@ -10,7 +10,7 @@ namespace Business.MongoModel.SRM
     /// <summary>
     /// 采购订单明细详情
     /// </summary>
-    [CollectionName("dopbang", "mo_srm_po_list")]
+    [CollectionName("dopbase", "mo_srm_po_list")]
     [Comment("采购订单明细详情")]
     public class mo_srm_po_list : MoBaseEntity
     {

MicroServices/Business/Bussiness.MongoModel/SRM/mo_srm_po_main.cs

@@ -10,7 +10,7 @@ namespace Business.MongoModel.SRM
     /// <summary>
     /// 采购订单
     /// </summary>
-    [CollectionName("dopbang", "mo_srm_po_main")]
+    [CollectionName("dopbase", "mo_srm_po_main")]
     [Comment("采购订单")]
     public class mo_srm_po_main : MoBaseEntity
     {

MicroServices/Business/Bussiness.MongoModel/SRM/mo_srm_po_occupy.cs

@@ -10,7 +10,7 @@ namespace Business.MongoModel.SRM
     /// <summary>
     /// 采购订单占用详情
     /// </summary>
-    [CollectionName("dopbang", "mo_srm_po_occupy")]
+    [CollectionName("dopbase", "mo_srm_po_occupy")]
     [Comment("采购订单占用详情")]
     public class mo_srm_po_occupy : MoBaseEntity
     {

MicroServices/Business/Bussiness.MongoModel/SRM/mo_srm_pr_main.cs

@@ -11,7 +11,7 @@ namespace Business.MongoModel.SRM
     /// <summary>
     /// 采购申请单
     /// </summary>
-    [CollectionName("dopbang", "mo_srm_pr_main")]
+    [CollectionName("dopbase", "mo_srm_pr_main")]
     [Comment("采购申请单")]
     public class mo_srm_pr_main : MoBaseEntity
     {