生产单管理相关接口调整

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java

@@ -2,6 +2,7 @@ package com.cf.imes.module.executor.controller.admin.order;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
+import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
 import com.cf.imes.framework.web.config.WebProperties;
 import com.cf.imes.module.executor.controller.admin.order.vo.order.*;
@@ -411,8 +412,8 @@ public class OrderController {
     @GetMapping("/getOrderWarn")
     @Operation(summary = "生产单超期/到期告警 （工作台）")
     @PreAuthorize("@ss.hasPermission('productManager:List')")
-    public CommonResult<Map<String, List<OrderOverdueRespVO>>> getOrderOverdue() {
+    public CommonResult<Map<String, PageResult<OrderOverdueRespVO>>> getOrderOverdue(@Valid PageParam pageParam) {
-        return success(orderService.getOrderWarn());
+        return success(orderService.getOrderWarn(pageParam));
     }
 
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java

@@ -147,10 +147,10 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
     IPage<OrderGoodsResp> selectOrderIds(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper);
 
     //    生产单预警统计
-    List<OrderOverdueRespVO> selectOrderNear(@Param("orderDate") LocalDate orderDate, @Param("organId") Long organId);
+    IPage<OrderOverdueRespVO> selectOrderNear(@Param("orderDate") LocalDate orderDate, @Param("organId") Long organId, @Param("page") IPage<OrderOverdueRespVO> page);
 
     //    生产单逾期统计
-    List<OrderOverdueRespVO> selectOrderOverdue(@Param("today") LocalDate today, @Param("organId") Long organId);
+    IPage<OrderOverdueRespVO> selectOrderOverdue(@Param("today") LocalDate today, @Param("organId") Long organId, @Param("page") IPage<OrderOverdueRespVO> page);
 
     /**
      * 生产单数量统计

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java

@@ -46,10 +46,10 @@ public interface OrderBodyMapper extends BaseMapperX<OrderBodyDO> {
     }
 
     // 单个修改删除状态 by id
-    default int updateDeletedById(Long id, Integer deleted, Long organId, Long orderId) {
+    default int updateDeletedById(Collection<Long> ids, Integer deleted, Long organId, Long orderId) {
         return update(new LambdaUpdateWrapper<OrderBodyDO>()
                 .set(OrderBodyDO::getDeleted, deleted)
-                .eq(OrderBodyDO::getId, id)
+                .in(OrderBodyDO::getId, ids)
                 .eq(OrderBodyDO::getOrganId, organId)
                 .eq(OrderBodyDO::getOrderId, orderId));
     }
@@ -119,6 +119,7 @@ public interface OrderBodyMapper extends BaseMapperX<OrderBodyDO> {
                 .eq(OrderBodyDO::getOrganId, organId)
                 .eqIfPresent(OrderBodyDO::getOrderId, orderId));
     }
+
     // 批量删除
     default int deleteBatch(Collection<?> orderId) {
         return delete(new LambdaQueryWrapperX<OrderBodyDO>()

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java

@@ -40,13 +40,16 @@ public interface OrderGroupMapper extends BaseMapperX<OrderGroupDO> {
     }
 
     // 单个修改删除状态 by bodyId
-    default int updateDeletedById(Long id, Integer deleted, Long organId, Long orderId) {
+    default int updateDeletedById(Collection<Long> bodyIds, Integer deleted, Long organId, Long orderId) {
+        if (bodyIds != null && !bodyIds.isEmpty()) {
             return update(new LambdaUpdateWrapper<OrderGroupDO>()
                     .set(OrderGroupDO::getDeleted, deleted)
-                .eq(OrderGroupDO::getBodyId, id)
+                    .in(OrderGroupDO::getBodyId, bodyIds)
                     .eq(OrderGroupDO::getOrganId, organId)
                     .eq(OrderGroupDO::getOrderId, orderId));
         }
+        return 0;
+    }
 
     default int deletedById(Long id, Long organId) {
         return delete(new LambdaUpdateWrapper<OrderGroupDO>()
@@ -92,9 +95,18 @@ public interface OrderGroupMapper extends BaseMapperX<OrderGroupDO> {
                 .eq(OrderGroupDO::getOrganId, organId)
                 .eqIfPresent(OrderGroupDO::getOrderId, orderId));
     }
+
     // 批量删除
     default int deleteBatch(Collection<?> orderId) {
         return delete(new LambdaQueryWrapperX<OrderGroupDO>()
                 .in(OrderGroupDO::getOrderId, orderId));
     }
+
+    // 批量查询
+    default List<Long> selectListByBodyId(Collection<Long> bodyIds, Long orderId, Long organId, Integer deleted) {
+        return selectList(new LambdaQueryWrapperX<OrderGroupDO>()
+                .eq(OrderGroupDO::getOrderId, orderId)
+                .eq(OrderGroupDO::getOrganId, organId)
+                .in(OrderGroupDO::getBodyId, bodyIds)).stream().map(OrderGroupDO::getId).collect(Collectors.toList());
+    }
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java

@@ -70,7 +70,7 @@ public interface OrderPartsMapper extends BaseMapperX<OrderPartsDO> {
 
     List<PrintOrderPartsRespVO> selectPartList( @Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
 
-    List<Long> selectPartsIdListByBodyId(@Param("bodyId") Long bodyId, @Param("organId") Long organId, @Param("orderId") Long orderId);
+    List<Long> selectPartsIdListByBodyId(@Param("bodyIds") Collection<Long> bodyIds, @Param("organId") Long organId, @Param("orderId") Long orderId);
 
     int countPartsByOrderId(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted);
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java

@@ -150,9 +150,8 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
     }
 
 //    房间id查小板的开料状态
-    List<Long> selectPlateTypeByRoomId(@Param("orderId") Long orderId, @Param("roomId") Set<Long> roomId,
+    List<Long> selectPlateTypeByRoomId(@Param("orderId") Long orderId, @Param("bodyIds") Collection<Long> bodyIds,
-                                       @Param("bodyId") Long bodyId, @Param("organId") Long organId,
+                                       @Param("organId") Long organId, @Param("deleted") Integer deleted);
-                                       @Param("deleted") Integer deleted);
 
 //    根据生产单id删除
     default int deleteByOrderId(Long orderId, Long organId) {

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.*;
 
 import com.alibaba.fastjson.JSONObject;
+import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.module.executor.controller.admin.order.vo.order.*;
 import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderBodyRespVO;
 import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderRoomBodyRespVO;
@@ -143,7 +144,7 @@ public interface OrderService {
     /**
      * 生产单超期告警分析统计
      */
-    Map<String,List<OrderOverdueRespVO>> getOrderWarn();
+    Map<String,PageResult<OrderOverdueRespVO>> getOrderWarn(PageParam pageParam);
 
 
     /**

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
+import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.framework.mybatis.core.generator.SnowFlakeGenerator;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
@@ -242,34 +243,23 @@ public class OrderServiceImpl implements OrderService {
     public void updateBodyDeletedByOrderId(Long orderId, Set<Long> roomIds, Long bodyId, Integer status) { // 要删除传1,还原传0
         validateOrderStatus(orderId, getUserOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus());
 
-        List<Long> plateDOList;
+        List<Long> bodyIds = new ArrayList<>();
-        List<Long> bodyIds = null;
         Integer index = status == 1 ? 0 : 1;
 
         if (roomIds != null && roomIds.size() != 0) {
-//            查询当前房间下的所有板材
-            plateDOList = plateMapper.selectPlateTypeByRoomId(orderId, roomIds, null, getUserOrganId(), index);
             bodyIds = orderBodyMapper.selectBodyIdByRoomId(orderId, roomIds, getUserOrganId(), index);
         } else if (bodyId != null && bodyId != 0) {
-//            校验柜体存在
             validateOrderBodyExists(orderId, bodyId, getUserOrganId(), index);
-//            查询当前房间下的所有板材
-            plateDOList = plateMapper.selectPlateTypeByRoomId(orderId, null, bodyId, getUserOrganId(), index);
-            bodyIds = new ArrayList<>();
             bodyIds.add(bodyId);
-        } else {
-            plateDOList = null;
         }
 
-        if (CollectionUtils.isNotEmpty(bodyIds)) {
+        if (bodyIds.size() != 0){
-            bodyIds.forEach(id -> {
+            List<Long> plateDOList = plateMapper.selectPlateTypeByRoomId(orderId, bodyIds, getUserOrganId(), index);
-                // 逻辑删除
+//            List<Long> groupIds = orderGroupMapper.selectListByBodyId(bodyIds, orderId, getUserOrganId(), index);
-                orderBodyMapper.updateDeletedById(id, status, getUserOrganId(), orderId);// 柜体
-                orderGroupMapper.updateDeletedById(id, status, getUserOrganId(), orderId);// 加工组
 
-                if (CollectionUtils.isNotEmpty(plateDOList) ){
+            orderBodyMapper.updateDeletedById(bodyIds, status, getUserOrganId(), orderId);// 柜体
-                    // (删除小板) 小板变为删除状态
+            orderGroupMapper.updateDeletedById(bodyIds, status, getUserOrganId(), orderId);// 加工组
-                    plateMapper.updateDeletedById(plateDOList, status, getUserOrganId(), orderId);
+            plateMapper.updateDeletedById(plateDOList, status, getUserOrganId(), orderId);// 删小板
             // 删除大板
             List<PlateDO> goodsIdList = plateMapper.selectPlateNum(orderId, getUserOrganId());
             Map<Long, List<PlateDO>> goodsIdMap = goodsIdList.stream()
@@ -277,33 +267,45 @@ public class OrderServiceImpl implements OrderService {
 
             List<Long> goodsIdDeleted = new ArrayList<>();
 
-                    if (status == 1) {
+            goodsIdMap.forEach((goodsId, plates) -> {
-                        goodsIdMap.forEach((k, v) -> {
+                if (plates.isEmpty()) {
+                    goodsIdDeleted.add(goodsId);
+                    return;
+                }
                 boolean allDeleted = true;
-                            for (PlateDO plateDO : v) {
+                for (PlateDO plateDO : plates) {
+                    if (status == 1) {
                         if (!plateDO.getDeleted()) {
                             allDeleted = false;
                             break;
                         }
+                    } else {
+                        if (plateDO.getDeleted()) {
+                            break;
+                        }
+                    }
                 }
                 if (allDeleted) {
-                                goodsIdDeleted.add(k);
+                    goodsIdDeleted.add(goodsId);
                 }
             });
-                    }
 
             if (goodsIdDeleted.size() > 0) {
                 goodsMapper.updateDeletedById(goodsIdDeleted, status, getUserOrganId());
             }
+
+            List<Long> partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyIds, getUserOrganId(), orderId); // 配件
+            if (partsList != null && partsList.size() != 0){
+                orderPartsMapper.updateDeletedById(partsList, status, getUserOrganId());
+            }
         }
 
-                List<Long> partsList = orderPartsMapper.selectPartsIdListByBodyId(id, getUserOrganId(), orderId); // 配件
+
-                orderPartsMapper.updateDeletedById(partsList, status, getUserOrganId());
-            });
-        }
         // 生产单柜体数量判断
         if (orderBodyMapper.selectCountByOrderId(orderId, getUserOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()) == 0) {
             orderMapper.updateOrderStatus(orderId, OrderStatusEnum.EMPTY.getStatus(), getUserOrganId());
+        }else {
+            orderMapper.updateOrderStatus(orderId, OrderStatusEnum.NEW_ORDER.getStatus(), getUserOrganId());
         }
 
     }
@@ -561,20 +563,18 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public Map<String, List<OrderOverdueRespVO>> getOrderWarn() {
+    public Map<String, PageResult<OrderOverdueRespVO>> getOrderWarn(PageParam pageParam) {
-        Map<String, List<OrderOverdueRespVO>> map = new HashMap<>();
+        Map<String, PageResult<OrderOverdueRespVO>> map = new HashMap<>();
-
-        LocalDate yesterday = LocalDate.now().minus(1, ChronoUnit.DAYS);
 
         LocalDate todayDate = LocalDate.now();
         LocalDate tomorrow = LocalDate.now().plus(1, ChronoUnit.DAYS);
-
+        PageDTO<OrderOverdueRespVO> page = new PageDTO<>(pageParam.getPageNo(), pageParam.getPageSize());
         // 查询预警单
-        List<OrderOverdueRespVO> orderNearVOS = orderMapper.selectOrderNear(tomorrow, OrganContextHolder.getOrganId());
+        IPage<OrderOverdueRespVO> orderNearVOS = orderMapper.selectOrderNear(tomorrow, OrganContextHolder.getOrganId(), page);
-        map.put("orderNearVOS", orderNearVOS);
+        map.put("orderNearVOS", new PageResult<OrderOverdueRespVO>(orderNearVOS.getRecords(), orderNearVOS.getTotal()));
         // 查询超时单
-        List<OrderOverdueRespVO> orderOverdueVOS = orderMapper.selectOrderOverdue(todayDate, OrganContextHolder.getOrganId());
+        IPage<OrderOverdueRespVO> orderOverdueVOS = orderMapper.selectOrderOverdue(todayDate, OrganContextHolder.getOrganId(), page);
-        map.put("orderOverdueVOS", orderOverdueVOS);
+        map.put("orderOverdueVOS", new PageResult<OrderOverdueRespVO>(orderOverdueVOS.getRecords(), orderOverdueVOS.getTotal()));
         return map;
     }
 
@@ -806,7 +806,7 @@ public class OrderServiceImpl implements OrderService {
     //    判断生产单状态是否符合(开料之前状态判断)
     private void validateOrderStatus(Long orderId, Long organId, Integer status) {
         // 校验存在
-        OrderDO orderDO = orderMapper.selectOrderOne(orderId, organId, status);
+        OrderDO orderDO = orderMapper.selectOrderOne(orderId, organId);
         if (orderDO == null)
             throw exception(ORDER_NOT_EXISTS);
         // 状态排除

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml

@@ -148,13 +148,7 @@
             o.dealer_phone_number,
             o.salesman,
             o.splitter,
-            o.remark,
+            o.remark
-            CONCAT(
-                    LPAD(FLOOR(TIMESTAMPDIFF(SECOND, #{orderDate}, o.delivery_date ) / (24 * 60 * 60)), 2, '0'), '天 ',
-                    LPAD(FLOOR(MOD(TIMESTAMPDIFF(SECOND, #{orderDate}, o.delivery_date), (24 * 60 * 60)) / (60 * 60)), 2, '0'), ':',
-                    LPAD(FLOOR(MOD(MOD(TIMESTAMPDIFF(SECOND, #{orderDate}, o.delivery_date), (24 * 60 * 60)), (60 * 60)) / 60), 2, '0'), ':',
-                    LPAD(MOD(MOD(TIMESTAMPDIFF(SECOND, #{orderDate}, o.delivery_date), (24 * 60 * 60)), (60 * 60)) % 60, 2, '0')
-                ) AS becomeDue
         from orders o
         where o.organ_id = #{organId}
           and o.deleted = 0
@@ -183,12 +177,7 @@
             o.salesman,
             o.splitter,
             o.remark,
-    CONCAT(
+            LPAD(FLOOR(TIMESTAMPDIFF(DAY, o.delivery_date, #{today})), 2, '0') AS beOverdue
-        LPAD(FLOOR(TIMESTAMPDIFF(SECOND, o.delivery_date, #{today}) / (24 * 60 * 60)), 2, '0'), '天 ',
-        LPAD(FLOOR(MOD(TIMESTAMPDIFF(SECOND, o.delivery_date, #{today}), (24 * 60 * 60)) / (60 * 60)), 2, '0'), ':',
-        LPAD(FLOOR(MOD(MOD(TIMESTAMPDIFF(SECOND, o.delivery_date, #{today}), (24 * 60 * 60)), (60 * 60)) / 60), 2, '0'), ':',
-        LPAD(MOD(MOD(TIMESTAMPDIFF(SECOND, o.delivery_date, #{today}), (24 * 60 * 60)), (60 * 60)) % 60, 2, '0')
-    ) AS beOverdue
         from orders o
         where o.organ_id = #{organId}
           and o.deleted = 0

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml

@@ -69,10 +69,13 @@
     <update id="updateDeletedById">
         UPDATE order_parts
         SET deleted = #{deleted}
-        WHERE id IN
+        WHERE
+        id IN
         <foreach collection="partsIds" item="partsId" open="(" separator="," close=")">
             #{partsId}
-              </foreach>AND organ_id = #{organId}
+        </foreach>
+        AND
+        organ_id = #{organId}
     </update>
     <delete id="deletedById">
         DELETE FROM order_parts
@@ -112,7 +115,11 @@
 
     <select id="selectPartsIdListByBodyId" resultType="java.lang.Long">
         SELECT parts_id FROM order_item
-        WHERE body_id = #{bodyId} AND organ_id = #{organId} and order_id = #{orderId}
+        WHERE body_id IN
+        <foreach item="bodyId" collection="bodyIds" open="(" separator="," close=")">
+            #{bodyId}
+        </foreach>
+        AND organ_id = #{organId} and order_id = #{orderId}
     </select>
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -401,9 +401,11 @@
         UPDATE order_plate
         SET deleted = #{deleted}
         WHERE id IN
+        <if test="plateIds != null and plateIds.size() > 0">
             <foreach item="plateId" collection="plateIds" open="(" separator="," close=")">
                 #{plateId}
             </foreach>
+        </if>
         AND organ_id = #{organId} and order_id = #{orderId}
     </update>
 
@@ -687,15 +689,12 @@
         FROM order_plate p
         LEFT JOIN order_item i ON p.id = i.plate_id
         WHERE i.organ_id = #{organId} AND i.order_id = #{orderId} AND p.deleted = #{deleted}
-        <if test="roomId != null and roomId.size() > 0">
+        <if test="bodyIds != null and bodyIds.size() > 0">
-            AND i.room_id IN
+            AND i.body_id IN
-            <foreach item="roomIdItem" collection="roomId" open="(" separator="," close=")">
+            <foreach item="roomIdItem" collection="bodyIds" open="(" separator="," close=")">
                 #{roomIdItem}
             </foreach>
         </if>
-        <if test="bodyId != null">
-            AND i.body_id = #{bodyId}
-        </if>
     </select>