合并冲突解决

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

@@ -435,18 +435,6 @@ namespace Business.ResourceExamineManagement
         /// <exception cref="NotImplementedException"></exception>
         public async Task<string> ReceiveResult(ResourceCheckInputDto input)
         {
-            AutoCreatePickBill(new List<string>());
-            return "";
-            List<mo_mes_morder> morders = new List<mo_mes_morder>();
-            morders.Add(new mo_mes_morder
-            {
-                morder_no = "Test0000003",
-                moentry_sys_stime = Convert.ToDateTime("2023-06-07 12:00"),
-                product_code = "1.TEST1.D.0087",
-                need_number = 2000
-            });
-            CreateWorkOrdDates(morders);
-            return "";
             //资源检查入参全局变量赋值
             param.sorderId = input.sorderId;
             param.tenantId = input.tenantId;
@@ -549,6 +537,7 @@ namespace Business.ResourceExamineManagement
             //批量保存 后期考虑子工单
             if (_CalcBomViewAppService.mordersInsertList.Any())
             {
+                _CalcBomViewAppService.mordersInsertList.ForEach(s => { s.tenant_id = param.tenantId; s.factory_id = param.factoryId; });
                 await _mes_morder.InsertMany(_CalcBomViewAppService.mordersInsertList);
                 var mesorders = ObjectMapper.Map<List<mo_mes_morder>, List<mes_morder>>(_CalcBomViewAppService.mordersInsertList);
                 _businessDbContext.BulkInsert(mesorders);
@@ -1424,6 +1413,7 @@ namespace Business.ResourceExamineManagement
                     po_Main.factory_id = input.factoryId;
                     po_Main.tenant_id = input.tenantId;
                     po_Main.bang_id = bangid;
+                    po_Main.po_delivery = 1;
                     polist.Add(po_Main);
 
                     mo_srm_po_list podetail = new mo_srm_po_list();
@@ -1453,6 +1443,7 @@ namespace Business.ResourceExamineManagement
                     podetail.factory_id = input.factoryId;
                     podetail.tenant_id = input.tenantId;
                     podetail.bang_id = bangid;
+                    podetail.stock_id = 1;
                     podetaillist.Add(podetail);
 
                     supplierId = item.pr_purchaseid;
@@ -1507,6 +1498,7 @@ namespace Business.ResourceExamineManagement
                             podetail.tenant_id = input.tenantId;
                             podetail.bang_id = bangid;
                             podetaillist.Add(podetail);
+                            podetail.stock_id = 1;
                             pomain.po_total = pomain.po_total + item.pr_orderprice;
                         }
 
@@ -1545,6 +1537,7 @@ namespace Business.ResourceExamineManagement
                         po_Main.factory_id = input.factoryId;
                         po_Main.tenant_id = input.tenantId;
                         po_Main.bang_id = bangid;
+                        po_Main.po_delivery = 1;
                         polist.Add(po_Main);
 
                         mo_srm_po_list podetail = new mo_srm_po_list();
@@ -1574,6 +1567,7 @@ namespace Business.ResourceExamineManagement
                         podetail.factory_id = input.factoryId;
                         podetail.tenant_id = input.tenantId;
                         podetail.bang_id = bangid;
+                        podetail.stock_id = 1;
                         podetaillist.Add(podetail);
 
                         supplierId = item.pr_purchaseid;
@@ -1633,6 +1627,7 @@ namespace Business.ResourceExamineManagement
                     po_Main.factory_id = input.factoryId;
                     po_Main.tenant_id = input.tenantId;
                     po_Main.bang_id = bangid;
+                    po_Main.po_delivery = 1;
                     polist.Add(po_Main);
 
                     mo_srm_po_list podetail = new mo_srm_po_list();
@@ -1662,6 +1657,7 @@ namespace Business.ResourceExamineManagement
                     podetail.factory_id = input.factoryId;
                     podetail.tenant_id = input.tenantId;
                     podetail.bang_id = bangid;
+                    podetail.stock_id = 1;
                     podetaillist.Add(podetail);
 
                     supplierId = item.pr_purchaseid;
@@ -1715,6 +1711,7 @@ namespace Business.ResourceExamineManagement
                             podetail.factory_id = input.factoryId;
                             podetail.tenant_id = input.tenantId;
                             podetail.bang_id = bangid;
+                            podetail.stock_id = 1;
                             podetaillist.Add(podetail);
                             pomain.po_total = pomain.po_total + item.pr_orderprice;
                         }
@@ -1754,6 +1751,7 @@ namespace Business.ResourceExamineManagement
                         po_Main.factory_id = input.factoryId;
                         po_Main.tenant_id = input.tenantId;
                         po_Main.bang_id = bangid;
+                        po_Main.po_delivery = 1;
                         polist.Add(po_Main);
 
                         mo_srm_po_list podetail = new mo_srm_po_list();
@@ -1783,6 +1781,7 @@ namespace Business.ResourceExamineManagement
                         podetail.factory_id = input.factoryId;
                         podetail.tenant_id = input.tenantId;
                         podetail.bang_id = bangid;
+                        podetail.stock_id = 1;
                         podetaillist.Add(podetail);
 
                         supplierId = item.pr_purchaseid;