Browse Source

功能提交。

tangdi 2 năm trước cách đây
mục cha
commit
4ab2130274

+ 3 - 4
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);