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

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

@@ -2512,7 +2512,7 @@ namespace Business.ResourceExamineManagement
             }
             else
             {
-                return "未查找到对应的计划工单，请联系管理员。";
+                return "没有需要检查的工单。";
             }
             return "ok";
         }
@@ -2883,15 +2883,14 @@ namespace Business.ResourceExamineManagement
                     {
                         try
                         {
-                            morders[0].morder_state = MorderEnum.Xd_state;
-                            morders[0].MaterialSituation = morders[0].MaterialSituation == MorderEnum.NoCarehouseComplete ? MorderEnum.Part : morders[0].MaterialSituation;
-
                             //如果生成领料单，需清理掉当前工单的占用，然后根据领料单的数据，来生成工单的占用
                             var pickRst = await CreatePickBill(morders[0].morder_no, domain, userAccount);
                             if (pickRst != "ok")
                             {
                                 return pickRst;
                             }
+                            morders[0].morder_state = MorderEnum.Xd_state;
+                            morders[0].MaterialSituation = morders[0].MaterialSituation == MorderEnum.NoCarehouseComplete ? MorderEnum.Part : morders[0].MaterialSituation;
                             await _mysql_mes_morder.UpdateManyAsync(morders);
                             //复制子工序
                             var insertList = GetCopyOP(morders[0].morder_no, domain);

MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -624,7 +624,7 @@ namespace Business.SystemJobManagement
                     int erpcls = 0;
                     string erpclsText = "配置类";
                     long itemId = help.NextId();
-                    if (custList[i].PurMfg == "P")
+                    if (custList[i].PurMfg == "L")
                     {
                         if (custList[i].EMTType == "50")
                         {
@@ -633,9 +633,10 @@ namespace Business.SystemJobManagement
                         }
                         else
                         {
-                            erpcls = 3;
-                            erpclsText = "外购";
+                            erpcls = 1;
+                            erpclsText = "自制";
                         }
+                        
                     }
                     else
                     {
@@ -646,8 +647,8 @@ namespace Business.SystemJobManagement
                         }
                         else
                         {
-                            erpcls = 1;
-                            erpclsText = "自制";
+                            erpcls = 3;
+                            erpclsText = "外购";
                         }
                     }
                     if (ic_item == null)
@@ -830,7 +831,8 @@ namespace Business.SystemJobManagement
                                 tenant_id = item.company_id,
                                 IsDeleted = false,
                                 Op = child.Op,
-                                use_status = 1
+                                use_status = 1,
+                                scrap = child.Scrap
                             };
                             childItemsAdd.Add(bomchild);
                         }
@@ -864,7 +866,8 @@ namespace Business.SystemJobManagement
                                     tenant_id = item.company_id,
                                     IsDeleted = false,
                                     Op = child.Op,
-                                    use_status = 1
+                                    use_status = 1,
+                                    scrap = child.Scrap
                                 };
                                 childItemsAdd.Add(bomchild);
                             }
@@ -879,6 +882,7 @@ namespace Business.SystemJobManagement
                                 icbomchild.company_id = item.company_id;
                                 icbomchild.tenant_id = item.company_id;
                                 icbomchild.Op = child.Op;
+                                icbomchild.scrap = child.Scrap;
                                 childItemsUpd.Add(icbomchild);
                             }
                         }