Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanRunVO.java

@@ -26,8 +26,8 @@ public class WorkPlanRunVO extends WorkPlanRun {
     @Schema(description = "工艺能力")
     private ProcessAbility processAbility;
 
-//    @Schema(description = "工序号")
+    @Schema(description = "工序号")
-//    private String orders;
+    private String orders;
 //
 //    @Schema(description = "工序代码")
 //    private String ppsCode;
@@ -38,10 +38,10 @@ public class WorkPlanRunVO extends WorkPlanRun {
 //    @Schema(description = "工艺能力")
 //    private String caName;
 //
-//    @Schema(description = "工序描述")
+    @Schema(description = "工序描述")
-//    private String makeMemo;
+    private String makeMemo;
 //
-//    @Schema(description = "不可转外协原因")
+    @Schema(description = "不可转外协原因")
-//    private String reason;
+    private String reason;
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -318,6 +318,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 }
                 //获取到通用的工序信息
                 oldWpr = map.get(wp.getOrders() + "_" + wp.getPpsId());
+                if (oldWpr == null) {
+                    continue;
+                }
                 //创建各自的工序运行信息
                 wpr = new WorkPlanRun();
                 wpr.setWpId(wp.getId());
@@ -408,6 +411,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             wpr.setWpId(wp.getId());
             wpr.setWorkPlan(wpVO);
             wpr.setWorkOrderRun(CollectionUtils.isNotEmpty(workOrderRuns) ? workOrderRuns.get(0) : null);
+            wpr.setOrders(wp.getOrders());
+            wpr.setMakeMemo(wp.getMakeMemo());
+            // 不可外协原因
+            wpr.setReason("测试");
             wprList.add(wpr);
         }