生产管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/OemApproval.java

@@ -27,6 +27,6 @@ public class OemApproval {
      */
     @Schema(description = "审批结果", required = true)
     @NotNull(message = "审批结果不能为空")
-    private Short approvalStatus;
+    private Integer approvalStatus;
 
 }

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

@@ -271,7 +271,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     //新增状态：外协状态，转外协审批通过后，置为待外协
                     workOrderRun.setOemStatus(WorkOrderRun.OEM_STATUS_IN);
                     //调用转外协自动分派处理
-                    if (wpList != null && wpList.size() > 0) {
+                    if (!wpList.isEmpty()) {
                         //判断工序是否存在外协商，如果存在不进行二次分派
                         WorkPlan workPlan = workPlanMapper.selectById(wprList.get(0).getWpId());
                         if (workPlan.getOcId() == null || workPlan.getOcId() < 1 ) {
@@ -286,13 +286,13 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                         wo.setOemType(WorkOrder.OEM_TYPE_SINGLE);
                         //加工周期(协作)+
                         if (StringUtil.isNotBlank(DictCache.getValue(DictEnum.PROCESS_CYCLE, WorkOrder.OEM_TYPE_SINGLE))) {
-                            days = Integer.valueOf(DictCache.getValue(DictEnum.PROCESS_CYCLE, WorkOrder.OEM_TYPE_SINGLE));
+                            days = Integer.parseInt(DictCache.getValue(DictEnum.PROCESS_CYCLE, WorkOrder.OEM_TYPE_SINGLE));
                         }
                     } else {
                         wo.setOemType(WorkOrder.OEM_TYPE_WHOLE);
                         //加工周期(外协)+
                         if (StringUtil.isNotBlank(DictCache.getValue(DictEnum.PROCESS_CYCLE, WorkOrder.OEM_TYPE_WHOLE))) {
-                            days = Integer.valueOf(DictCache.getValue(DictEnum.PROCESS_CYCLE, WorkOrder.OEM_TYPE_WHOLE));
+                            days = Integer.parseInt(DictCache.getValue(DictEnum.PROCESS_CYCLE, WorkOrder.OEM_TYPE_WHOLE));
                         }
                         //根据外协工艺更新车间订单信息
                         OemCraftAbilityEntity oa = null;
@@ -353,8 +353,8 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                         wpList.add(wp);
                     }
 
-                    if (wpList == null || wpList.size() == 0) {
-                        throw new Exception("product.notTurnBackProcess", null);
+                    if (wpList.isEmpty()) {
+                        throw new ServiceException("未选择转回工序，请走外协交件流程！");
                     }
                     wo.setWorId(workOrderRun.getId());
                     workOrderRun.setRunStatus(WorkOrderRun.RUN_STATUS_ISSUED);
@@ -415,7 +415,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     List<WorkPlan> workPlans = workPlanMapper.selectList(new LambdaQueryWrapper<WorkPlan>()
                             .eq(WorkPlan::getOem, "1")
                             .eq(WorkPlan::getWoId, wo.getId()));
-                    if (null == workPlans || workPlans.size() < 1) {
+                    if (null == workPlans || workPlans.isEmpty()) {
                         wo.setCollaborate("0");
                     }
                     // 修改订单业务中心