Merge remote-tracking branch 'origin/main'

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java

@@ -27,6 +27,7 @@ import com.cf.imes.module.executor.dal.mysql.orderBody.OrderBodyMapper;
 import com.cf.imes.module.executor.dal.mysql.orderItem.OrderItemMapper;
 import com.cf.imes.module.executor.dal.mysql.planitem.PlanItemMapper;
 import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper;
+import com.cf.imes.module.executor.enums.OrderStatusEnum;
 import com.cf.imes.module.system.api.machine.MachineApi;
 import com.cf.imes.module.system.api.machine.dto.CuttingRespDTO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -109,7 +110,7 @@ public class PlanServiceImpl implements PlanService {
 
         // 修改对应的生产单的状态为 生产中
         List<Long> orderIds = JSON.parseArray(orderNos).toJavaList(Long.class);
-        List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds).stream().map(m -> m.setStatus(3)).collect(Collectors.toList());
+        List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds).stream().map(m -> m.setStatus(OrderStatusEnum.IN_PRODUCTION.getStatus())).collect(Collectors.toList());
         orderMapper.updateBatch(orderDOS);
 
         Long planId = plan.getId();
@@ -200,7 +201,7 @@ public class PlanServiceImpl implements PlanService {
 
         // 修改生产单的状态为待排单
         List<Long> orderIds = JSON.parseArray(planDO.getOrderNos()).toJavaList(Long.class);
-        List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds).stream().map(m -> m.setStatus(2)).collect(Collectors.toList());
+        List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds).stream().map(m -> m.setStatus(OrderStatusEnum.NO_SORT.getStatus())).collect(Collectors.toList());
         orderMapper.updateBatch(orderDOS);
 
         return Boolean.TRUE;
@@ -309,7 +310,7 @@ public class PlanServiceImpl implements PlanService {
         QueryWrapperX<OrderDO> queryWrapperX = new QueryWrapperX<>();
         queryWrapperX
                 .eq("a.organ_id",getUserOrganId())
-                .eq("a.status",2)
+                .eq("a.status",OrderStatusEnum.NO_SORT.getStatus())
                 .eqIfPresent("a.id", pageReqVO.getOrderId())
                 .isNull("opi.item_id")
                 .eqIfPresent("a.customer", pageReqVO.getConsignee())

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java

@@ -15,7 +15,7 @@ public class ProcessStepStatus {
     private Boolean processStepItemStatus;
 
     //  工序步骤表的类型
-    private Long type;
+    private Integer type;
 
     //  柜体id
     private List<Long> bodyId;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java

@@ -71,7 +71,7 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
     @Override
     public PageResult<ProcessRespVO> getProcessPage(ProcessPageReqVO pageReqVO) {
 
-
+        // 模糊搜索添加条件
         pageReqVO.setCustomer(insertSeparator(pageReqVO.getCustomer()));
         pageReqVO.setCustomOrderNo(insertSeparator(pageReqVO.getCustomOrderNo()));
         pageReqVO.setAddress(insertSeparator(pageReqVO.getAddress()));

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml

@@ -38,7 +38,7 @@
         o.custom_order_no as customOrderNo,
         o.customer as customer,
         o.address as address,
-        ops.status as processStatus,
+        opsi.status as processStatus,
         opsi.name as name,
         ops.Name as processName,
         ops.manager as manager,