生产管理修改

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

@@ -1172,21 +1172,21 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             return null;
         }
         ProduceMonitorOrderDataVO orderDataVO = new ProduceMonitorOrderDataVO();
+        // 组装订单基础信息
+        BeanUtils.copyProperties(workOrder, orderDataVO);
+        orderDataVO.setOrderCode(workOrderRun != null ? workOrderRun.getWoCode() : "");
+        orderDataVO.setPartCode(partCode);
+        orderDataVO.setYpQty(yieldOrder.getYpQty());
+        orderDataVO.setYieldType(yieldOrder.getYieldType());
+        orderDataVO.setCurStatus(WorkOrderEnum.getName(workOrder.getRunStatus()));
+        orderDataVO.setPriority(WorkOrder.priorityMap.get(workOrder.getPriority()));
+        User user = UserCache.getUser(workOrder.getDispatcher());
+        orderDataVO.setDispatcher(user != null ? user.getRealName() : "");
+        orderDataVO.setProdIdent(yieldOrder.getProductIdent());
+        orderDataVO.setYpMemo(yieldOrder.getYpMemo());
+        orderDataVO.setMainProcessingUnit(workOrder.getTsId() != null ? teamSetService.getById(workOrder.getTsId()).getTsName() : workOrder.getOcId() != null ? oemService.getById(workOrder.getOcId()).getOcName() : "");
         if (dsPartEntity != null) {
             ProduceMonitorDsPartVO dsPartVO = new ProduceMonitorDsPartVO();
-            // 组装订单基础信息
-            BeanUtils.copyProperties(workOrder, orderDataVO);
-            orderDataVO.setOrderCode(workOrderRun != null ? workOrderRun.getWoCode() : "");
-            orderDataVO.setPartCode(partCode);
-            orderDataVO.setYpQty(yieldOrder.getYpQty());
-            orderDataVO.setYieldType(yieldOrder.getYieldType());
-            orderDataVO.setCurStatus(WorkOrderEnum.getName(workOrder.getRunStatus()));
-            orderDataVO.setPriority(WorkOrder.priorityMap.get(workOrder.getPriority()));
-            User user = UserCache.getUser(workOrder.getDispatcher());
-            orderDataVO.setDispatcher(user != null ? user.getRealName() : "");
-            orderDataVO.setProdIdent(yieldOrder.getProductIdent());
-            orderDataVO.setYpMemo(yieldOrder.getYpMemo());
-            orderDataVO.setMainProcessingUnit(workOrder.getTsId() != null ? teamSetService.getById(workOrder.getTsId()).getTsName() : workOrder.getOcId() != null ? oemService.getById(workOrder.getOcId()).getOcName() : "");
             // 组装零件信息
             BeanUtils.copyProperties(dsPartEntity, dsPartVO);
             // todo erp查询pdm零件图纸地址
@@ -1564,7 +1564,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
 
         // 根据零件号、工序ID、版本号、工艺级别查询对应的检验项目
-        List<DsProcessProjectEntity> projects = dsPartService.selectDsProcessProjectByPartNoAndPpsId(workOrder.getPartCode(), workPlan.getOrders(), yieldOrder.getPartVersion(), yieldOrder.getRank(),yieldOrder.getRoamNo());
+        List<DsProcessProjectEntity> projects = dsPartService.selectDsProcessProjectByPartNoAndPpsId(workOrder.getPartCode(), workPlan.getOrders(), yieldOrder.getPartVersion(), yieldOrder.getRank(), yieldOrder.getRoamNo());
         if (CollectionUtils.isNotEmpty(projects)) {
             // 保存检验任务
             InspectionTask inspectionTask = new InspectionTask();