Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server

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,