生产管理修改

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

@@ -54,7 +54,7 @@
         mwo.MES_CARD_NO mesCardNo,
         myo.PLATE plate,
         myo.PRODUCT_TYPE productType,
-        myo.PRIORITY_ERP priority,
+        mwo.PRIORITY priority,
         myo.USE_DEPT useDept,
         ROUND(myo.YP_AREA * mwo.MAKE_QTY,10) totalArea,
         myo.YP_AREA area,

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

@@ -18,12 +18,10 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.desk.basic.constant.FlowConst;
+import org.springblade.desk.basic.pojo.entity.BsAssignEntity;
 import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
-import org.springblade.desk.basic.service.IOemCraftAbilityService;
-import org.springblade.desk.basic.service.IOemService;
-import org.springblade.desk.basic.service.IProcessAbilityService;
-import org.springblade.desk.basic.service.IWorkCenterService;
+import org.springblade.desk.basic.service.*;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
 import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
@@ -142,6 +140,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IWorkCenterService workCenterService;
 
+    private final IBsAssignService bsAssignService;
+
     @Override
     public IPage<WorkOrderVO> selectWorkOrderPage(IPage<WorkOrderVO> page, WorkOrderDTO workOrder) {
         return page.setRecords(baseMapper.selectWorkOrderPage(page, workOrder));
@@ -413,8 +413,19 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             wpr.setWorkOrderRun(CollectionUtils.isNotEmpty(workOrderRuns) ? workOrderRuns.get(0) : null);
             wpr.setOrders(wp.getOrders());
             wpr.setMakeMemo(wp.getMakeMemo());
-            // 不可外协原因
-            wpr.setReason("测试");
+            // 不可外协原因：
+            // 先判断该工艺能力是否可以查到必须厂内的分派规则，如果有返回【工序不可外协】
+            // 在判断该工艺能力是否可以找到对应的外协厂商，如果没有返回【无对应工艺能力厂商】
+            wpr.setReason("无");
+            long count = bsAssignService.count(Wrappers.lambdaQuery(BsAssignEntity.class).eq(BsAssignEntity::getCraftAbilityId, wp.getCaId()).eq(BsAssignEntity::getLimitType, BsAssignEntity.MUST).eq(BsAssignEntity::getPointType, BsAssignEntity.IN_FACTORY));
+            if (count > 0) {
+                wpr.setReason("工序不可外协");
+            } else {
+                oemCraftAbilityService.count(Wrappers.lambdaQuery(OemCraftAbilityEntity.class).eq(OemCraftAbilityEntity::getCraftAbilityId, wp.getCaId()));
+                if (count == 0) {
+                    wpr.setReason("无对应工艺能力厂商");
+                }
+            }
             wprList.add(wpr);
         }
 
@@ -1689,7 +1700,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     @Override
     public boolean updatePriority(UpdatePriorityDTO updatePriorityDTO) {
         WorkOrder wo = this.getById(updatePriorityDTO.getWoId());
-        wo.setPriority(WorkOrder.PRIORITY_SCH_IMP);
+//        wo.setPriority(WorkOrder.PRIORITY_SCH_IMP);
         wo.setPriority(updatePriorityDTO.getPriority());
         wo.setDemandDate(updatePriorityDTO.getDemandDate());
         boolean b = this.updateById(wo);