分页打包接口参数修改，数据源字段key名称更改

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

@@ -14,8 +14,8 @@ import lombok.ToString;
 public class PackPageReqVO extends PageParam {
 
 
-    @Schema(description = "生产状态(已完成，未完成)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    private Boolean status;
+    @Schema(description = "打包状态(0：未打包，1：已打包)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    private Integer status;
 
 
     @Schema(description = "订单号")

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 Integer status;
+    private Integer packaged;
 
 
     @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

@@ -107,12 +107,20 @@ public class PackServiceImpl implements PackService {
         PageDTO<PackRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
 
         // 根据生产状态查询生产单号
-        List<Long> orderIds = productionStatusMapper.selectOrderIds(pageReqVO,getUserOrganId()).stream().map(m->m.getId()).collect(Collectors.toList());
+        List<Long> orderIds = productionStatusMapper.selectOrderIds(pageReqVO,getUserOrganId()).stream().map(OrderDO::getId).collect(Collectors.toList());
 
         if(orderIds.isEmpty()){
             return null;
         }
 
+//        List<OrderProcessStepNDO> orderProcessStepNDOS = processStepMapper.selectByOrderIds(orderIds, getUserOrganId(), ProcessProcessingTypeEnum.PACK.getNumber());
+//
+//        List<Long> orderIdList = orderProcessStepNDOS.stream().map(OrderProcessStepNDO::getOrderId).distinct().toList();
+//
+//        if(orderIdList.isEmpty()){
+//            return null;
+//        }
+
         // 查询打包首页分页数据信息，总的板件数量信息
         IPage<PackRespVO> packRespVOS = productionStatusMapper.selectOrderPlate(page,orderIds,getUserOrganId());
 
@@ -130,8 +138,15 @@ public class PackServiceImpl implements PackService {
             record.setPackPieceCount(plateNum.stream().filter(f -> Objects.equals(f.getId(), record.getId())).mapToLong(PackRespVO::getPackPieceCount).sum());
             // 待处理量
             record.setPendingNum(record.getTotalPieceCount() - record.getPackPieceCount());
-        }
 
+//            if(record.getPackCount() == 0) {
+//                record.setStatus(OrderPackStatusEnums.UNPACKAGED.getStatus());
+//            }
+//
+//            record.setStatus(record.getTotalPieceCount().equals(record.getPackPieceCount()) ?
+//                    OrderPackStatusEnums.PACKAGED.getStatus() : OrderPackStatusEnums.INPACKAGING.getStatus());
+
+        }
 
         if (CollectionUtil.isEmpty(packRespVOS.getRecords())) {
             return new PageResult<>();
@@ -424,6 +439,7 @@ public class PackServiceImpl implements PackService {
         // 判断当前生产单的板材和配件是否已全部打包且当前生产单的包裹已全部封包
         if(validateOrderPack(packageVO.getOrderId())){
 
+            // 修改生产单的打包状态
             updateOrderStatus(packageVO.getOrderId());
 
         }
@@ -458,32 +474,32 @@ public class PackServiceImpl implements PackService {
     public void  updateOrderStatus(Long orderId) {
 
         OrderDO orderDO = productionProcessMapper.selectById(orderId);
+
         if(orderDO.getFinishTime() != null){
             return;
         }
 
-        // 判断正确，修改当前生产单对应的打包的工序状态
-        OrderProcessStepNDO orderProcessStepNDO = processStepMapper.selectOrderProcess(orderId, getUserOrganId(), ProcessProcessingTypeEnum.PACK.getNumber());
+//        // 判断正确，修改当前生产单对应的打包的工序状态
+//        OrderProcessStepNDO orderProcessStepNDO = processStepMapper.selectOrderProcess(orderId, getUserOrganId(), ProcessProcessingTypeEnum.PACK.getNumber());
+//
+//        if(orderProcessStepNDO == null){
+//            return;
+//        }
+//
+//
+//        // 工序加工添加负责人
+//        String nickname = getLoginUser().getNickname();
+//
+//
+//        BigDecimal salary = productionProcessService.calculateSalary(orderProcessStepNDO.getId(), null);
+//
+//        // 修改生产明细表和步骤表的工序状态
+//        processStepMapper.updateStatus(orderProcessStepNDO.getId(), nickname, salary);
+//
+//        processStepItemMapper.updateStatus(orderProcessStepNDO.getId());
 
-        if(orderProcessStepNDO == null){
-            return;
-        }
-
-
-        // 工序加工添加负责人
-        String nickname = getLoginUser().getNickname();
-
-
-        BigDecimal salary = productionProcessService.calculateSalary(orderProcessStepNDO.getId(), null);
-
-        // 修改生产明细表和步骤表的工序状态
-        processStepMapper.updateStatus(orderProcessStepNDO.getId(), nickname, salary);
-
-        processStepItemMapper.updateStatus(orderProcessStepNDO.getId());
-
-        // 修改生产的状态为生产完成
-        orderDO.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus());
-        orderDO.setFinishTime(LocalDateTime.now());
+        // 修改生产单的打包状态未已打包
+        orderDO.setPackaged(OrderPackageStatusEnum.PACKAGED.getStatus());
 
         productionProcessMapper.updateById(orderDO);
 

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

@@ -43,7 +43,7 @@
         <result property="dealerPhoneNumber" column="dealerPhoneNumber"/>
         <result property="orderDate" column="orderDate"/>
         <result property="deliveryDate" column="deliveryDate"/>
-        <result property="status" column="status"/>
+        <result property="packaged" column="packaged"/>
         <result property="customer" column="customer"/>
         <result property="address" column="address"/>
         <result property="phoneNumber" column="phoneNumber"/>
@@ -75,7 +75,7 @@
         o.address as address,
         o.salesman as salesman,
         o.splitter as splitter,
-        o.status as status,
+        o.packaged as packaged,
         count(distinct oi.plate_id) as totalPieceCount
 
         FROM `orders` o
@@ -88,7 +88,7 @@
                         #{id}
                 </foreach>
 
-        group by orderNo,customOrderNo,dealer,createTime,deliveryDate,customer,phoneNumber,address,salesman,splitter,status,dealerPhoneNumber,orderDate
+        group by orderNo,customOrderNo,dealer,createTime,deliveryDate,customer,phoneNumber,address,salesman,splitter,packaged,dealerPhoneNumber,orderDate
 
 
     </select>
@@ -146,18 +146,13 @@
 
             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 == false ">
-                and status in (2,3)
-            </if>
-
-            <if test="pageReqVO.status == true">
-                and status in (4)
+            <if test="pageReqVO.status !=null ">
+                and packaged = #{pageReqVO.status}
             </if>
 
             <if test="pageReqVO.customOrderNo !=null">
@@ -182,5 +177,7 @@
 
     </select>
 
-
+<!--    <if test="pageReqVO.status == true">
+        and status in (4)
+    </if>-->
 </mapper>