机台,标签接口返回错误修改,打包分页接口条件修改

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

@@ -42,7 +42,7 @@ public class PackRespVO {
 
 
     @Schema(description = "订单状态", requiredMode = Schema.RequiredMode.REQUIRED,example = "0")
-    private Boolean status;
+    private Integer status;
 
 
     @Schema(description = "客户", requiredMode = Schema.RequiredMode.REQUIRED,example = "张三")

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java

@@ -20,6 +20,7 @@ import com.cf.imes.module.manage.dal.dataobject.query.OrderPackageDO;
 import com.cf.imes.module.manage.dal.dataobject.query.OrderPartsNDO;
 import com.cf.imes.module.manage.dal.mysql.pack.OrderBodyMapper;
 import com.cf.imes.module.manage.dal.mysql.pack.OrderPackageMapper;
+import com.cf.imes.module.manage.dal.mysql.process.ProcessStepMapper;
 import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper;
 import com.cf.imes.module.manage.dal.mysql.query.OrderPartsMapper;
 import com.cf.imes.module.manage.dal.mysql.query.ProductionStatusMapper;
@@ -63,6 +64,9 @@ public class PackServiceImpl implements PackService {
     @Resource
     private OrderBodyMapper orderBodyMapper;
 
+    @Resource
+    private ProcessStepMapper processStepMapper;
+
 
     // 打包分页查询
     @Override

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

@@ -426,6 +426,7 @@
             ob.room_name as roomName,
             ob.name as bodyName,
             op.id as plateId,
+            op.plate_no as plateNo,
             op.name as plateName,
             ogs.material as plateMaterial,
             ogs.color as plateColor,

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

@@ -146,13 +146,18 @@
 
             organ_id =#{organId}
             and deleted = false
+            and status in (2,3,4)
 
             <if test="pageReqVO.orderId !=null">
                 and id like concat('%', #{pageReqVO.orderId},'%')
             </if>
 
-            <if test="pageReqVO.status !=null">
-                and status = #{pageReqVO.status}
+            <if test="pageReqVO.status == false ">
+                and status in (2,3)
+            </if>
+
+            <if test="pageReqVO.status == true">
+                and status in (4)
             </if>
 
             <if test="pageReqVO.customOrderNo !=null">