From df4611cec7258519e310736bee8deb8a4ed92fef Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Tue, 10 Dec 2024 10:44:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85=E5=88=86?= =?UTF-8?q?=E7=A6=BB=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/order/OrderController.java | 29 ++++++++++++++++--- .../dal/mysql/orderItem/OrderItemMapper.java | 5 ++-- .../executor/service/order/OrderService.java | 2 +- .../service/order/OrderServiceImpl.java | 16 ++++++++-- .../mapper/orderItem/OrderItemMapper.xml | 15 ++++++++-- 5 files changed, 54 insertions(+), 13 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index d59b2cda9..003ebdee6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -16,6 +16,7 @@ import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderRoomBo import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; import com.cf.imes.module.executor.dal.mysql.order.OrderMapper; +import com.cf.imes.module.executor.enums.CategoryEnum; import com.cf.imes.module.executor.enums.OrderDeletedEnum; import com.cf.imes.module.executor.enums.OrderStatusEnum; import com.cf.imes.module.executor.service.order.OrderInputProcessor; @@ -45,9 +46,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import javax.validation.constraints.NotEmpty; import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; @@ -479,10 +478,15 @@ public class OrderController { if (orderBodyPageRespVO.getDeleted() == null) { orderBodyPageRespVO.setDeleted(false); } + Set types = new HashSet<>(); + // 配件 + types.add(CategoryEnum.HARDWARE.getValue()); + types.add(CategoryEnum.EDGING.getValue()); + return success(orderService.getPartsDetail(orderBodyPageRespVO.getOrderId(), orderBodyPageRespVO.getRoomIds(), orderBodyPageRespVO.getBodyIds(), orderBodyPageRespVO.getGroupIds(), orderBodyPageRespVO.getPartsName(), - orderBodyPageRespVO.getPageNo(), orderBodyPageRespVO.getPageSize(), !orderBodyPageRespVO.getDeleted() ? 0 : 1)); + orderBodyPageRespVO.getPageNo(), orderBodyPageRespVO.getPageSize(), !orderBodyPageRespVO.getDeleted() ? 0 : 1, types)); } @@ -499,6 +503,23 @@ public class OrderController { orderBodyPageRespVO.getPageNo(), orderBodyPageRespVO.getPageSize(), !orderBodyPageRespVO.getDeleted() ? 0 : 1)); } + @PostMapping("/get-componentDetailsPage") + @Operation(summary = "生产单详情-组件详细信息(分页)") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") + public CommonResult> componentDetails(@Valid @RequestBody OrderBodyPageRespVO orderBodyPageRespVO) { + if (orderBodyPageRespVO.getDeleted() == null) { + orderBodyPageRespVO.setDeleted(false); + } + Set types = new HashSet<>(); + // 配件 + types.add(CategoryEnum.ASSEMBLY.getValue()); + + return success(orderService.getPartsDetail(orderBodyPageRespVO.getOrderId(), + orderBodyPageRespVO.getRoomIds(), orderBodyPageRespVO.getBodyIds(), + orderBodyPageRespVO.getGroupIds(), orderBodyPageRespVO.getPartsName(), + orderBodyPageRespVO.getPageNo(), orderBodyPageRespVO.getPageSize(), !orderBodyPageRespVO.getDeleted() ? 0 : 1, types)); + } + @DeleteMapping("/delete-body") @Operation(summary = "删除柜体") @PreAuthorize("@ss.hasPermission('production:manager-list:deleteCabinet')") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java index 4b82617e9..70e4fdad0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java @@ -42,12 +42,13 @@ public interface OrderItemMapper extends BaseMapperX { IPage selectPartsDetailByOrderId(@Param("page") IPage page, @Param("orderId") Long orderId, @Param("roomId") Set roomId, @Param("bodyId") Set bodyId, @Param("groupId") Set groupId, @Param("name") String name, - @Param("organId") Long organId, @Param("deleted") Integer deleted); + @Param("organId") Long organId, @Param("deleted") Integer deleted, @Param("types") Set types); List selectPartsByOrderId(@Param("orderId") Long orderId, @Param("organId") Long organId, - @Param("deleted") Integer deleted); + @Param("deleted") Integer deleted, + @Param("types") Set types); List selectPlateList(@Param("reqVO") PlateDetailReqVO reqVO, @Param("organId") Long organId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java index 792fbc18d..52e0bf2af 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java @@ -80,7 +80,7 @@ public interface OrderService { * @return List * 需要修改返回值 */ - PageResult getPartsDetail(Long orderId, Set roomId , Set bodyId, Set groupId, String name, Integer pageNo, Integer pageSize, Integer deleted); + PageResult getPartsDetail(Long orderId, Set roomId , Set bodyId, Set groupId, String name, Integer pageNo, Integer pageSize, Integer deleted, Set types); /** * @param orderId: 生产单id diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index be1089e92..6b726cba1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -51,6 +51,7 @@ import com.cf.imes.module.executor.dal.mysql.plan.PlanMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateGoodMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper; import com.cf.imes.module.executor.dal.mysql.rawgoods.RawGoodsMapper; +import com.cf.imes.module.executor.enums.CategoryEnum; import com.cf.imes.module.executor.enums.OrderDeletedEnum; import com.cf.imes.module.executor.enums.OrderStatusEnum; import com.cf.imes.module.executor.service.customplateno.CustomPlateNoGenerateService; @@ -224,16 +225,25 @@ public class OrderServiceImpl implements OrderService { // 柜体信息 List orderModuleRespVOList = orderBodyMapper.selectModuleByOrderId(orderId, getUserOrganId(), deleted); + Set types = new HashSet<>(); // 配件 - List orderItemDOS = orderItemMapper.selectPartsByOrderId(orderId, getUserOrganId(), deleted); + types.add(CategoryEnum.HARDWARE.getValue()); + types.add(CategoryEnum.EDGING.getValue()); + List orderItemDOS = orderItemMapper.selectPartsByOrderId(orderId, getUserOrganId(), deleted, types); // 板材 List orderGoodsRespVOS = orderItemMapper.selectGoodsByOrderId(orderId, getUserOrganId(), deleted); + // 组件 + types.clear(); + types.add(CategoryEnum.ASSEMBLY.getValue()); + List orderComponentRespVOS = orderItemMapper.selectPartsByOrderId(orderId, getUserOrganId(), deleted, types); + Map map = new HashMap<>(); map.put("module", orderModuleRespVOList); map.put("parts", orderItemDOS); map.put("goods", orderGoodsRespVOS); + map.put("component", orderComponentRespVOS); return map; } @@ -249,10 +259,10 @@ public class OrderServiceImpl implements OrderService { } @Override - public PageResult getPartsDetail(Long orderId, Set roomId, Set bodyId, Set groupId, String name, Integer pageNo, Integer pageSize, Integer deleted) { + public PageResult getPartsDetail(Long orderId, Set roomId, Set bodyId, Set groupId, String name, Integer pageNo, Integer pageSize, Integer deleted, Set types) { PageDTO page = new PageDTO<>(pageNo, pageSize); - IPage orderDetail = orderItemMapper.selectPartsDetailByOrderId(page, orderId, roomId, bodyId, groupId, name, getUserOrganId(), deleted); + IPage orderDetail = orderItemMapper.selectPartsDetailByOrderId(page, orderId, roomId, bodyId, groupId, name, getUserOrganId(), deleted, types); return new PageResult(orderDetail.getRecords(), orderDetail.getTotal()); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml index 453f18fc9..18c9b2028 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml @@ -36,7 +36,7 @@