生产监控订单详情修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -86,7 +86,7 @@
             mwp.FACT_END_TIME AS factEndTime
         FROM MES_WORK_PLAN mwp
                  LEFT JOIN BS_PROCESS_SET bpe ON mwp.PPS_ID = bpe.ID
-                 LEFT JOIN BA_TEAM_SET bte ON mwp.MAKE_TEAM = bte.ID
+                 LEFT JOIN BS_TEAM_SET bte ON mwp.MAKE_TEAM = bte.ID
                  LEFT JOIN MES_MAKE_REC mmr ON mwp.ID = mmr.WP_ID
         WHERE mwp.WO_ID = #{woId}
         ORDER BY mwp.ORDERS

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

@@ -1111,14 +1111,14 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
         WorkOrderRun workOrderRun = workOrderRunService.getById(woId);
         List<ProduceMonitorWorkPlanVO> workPlans = workPlanService.getProduceMonitorWorkPlanList(woId);
-        if (yieldOrder == null || CollectionUtils.isEmpty(workPlans) || workOrderRun == null) {
+        if (yieldOrder == null || CollectionUtils.isEmpty(workPlans)) {
             return null;
         }
         ProduceMonitorOrderDataVO orderDataVO = new ProduceMonitorOrderDataVO();
         ProduceMonitorDsPartVO dsPartVO = new ProduceMonitorDsPartVO();
         // 组装订单基础信息
         BeanUtils.copyProperties(workOrder, orderDataVO);
-        orderDataVO.setOrderCode(workOrderRun.getWoCode());
+        orderDataVO.setOrderCode(workOrderRun != null ? workOrderRun.getWoCode() : "");
         orderDataVO.setPartCode(partCode);
         orderDataVO.setYpQty(yieldOrder.getYpQty());
         orderDataVO.setYieldType(yieldOrder.getYieldType());