From a11ec028fd1b1c8842038fbde380f7e050bcec3e Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 20 Apr 2026 18:01:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=80=BE?= =?UTF-8?q?=E6=9C=9F=E8=AE=A2=E5=8D=95=E6=81=A2=E5=A4=8D=E4=B8=BA=E5=B9=B3?= =?UTF-8?q?=E9=93=BA=EF=BC=9B2=E3=80=81=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E3=80=81=E5=88=86=E5=A0=86=E6=89=93=E5=8C=85?= =?UTF-8?q?=E3=80=81cad=E4=B8=89=E7=BB=B4=E7=9C=8B=E5=9B=BE=E7=AD=89?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90=E6=A2=B3=E7=90=86=EF=BC=9B?= =?UTF-8?q?3=E3=80=81=E8=A3=85=E9=85=8D=E8=AE=BE=E7=BD=AE=E9=A1=B6?= =?UTF-8?q?=E7=BA=A7=E9=83=A8=E4=BB=B6=E5=85=B3=E8=81=94item=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A8=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E9=A1=B9=E5=88=A0=E9=99=A4=E5=90=8E=E9=83=A8=E4=BB=B6=E5=8F=AF?= =?UTF-8?q?=E8=A7=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assemblylist/AssemblyListController.java | 7 +++++ .../manage/pack/HeapSplitController.java | 3 ++ .../admin/manage/pack/PackController.java | 2 ++ .../OrderComponentController.java | 17 +++++----- .../admin/plate/PlateController.java | 4 +++ .../executor/dal/mysql/order/OrderMapper.java | 4 +-- .../ordercomponent/OrderComponentMapper.java | 9 ++++++ .../assemblylist/AssemblyListServiceImpl.java | 29 ++++++++++++----- .../service/order/OrderServiceImpl.java | 31 ++----------------- .../OrderComponentServiceImpl.java | 4 --- .../resources/mapper/order/OrderMapper.xml | 11 ------- .../ordercomponent/OrderComponentMapper.xml | 16 ++++++++++ .../AssemblyConfigController.java | 8 +++++ 13 files changed, 83 insertions(+), 62 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/assemblylist/AssemblyListController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/assemblylist/AssemblyListController.java index 244c7b9cd..403ef1d11 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/assemblylist/AssemblyListController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/assemblylist/AssemblyListController.java @@ -13,6 +13,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -40,24 +41,28 @@ public class AssemblyListController { @PostMapping("/list") @Operation(summary = "装配清单-获取部件列表") + @PreAuthorize("@ss.hasPermission('production:assemblyList:query')") public CommonResult> getComponentList(@RequestBody AssemblyListComponentPageReqVO reqVO) { return CommonResult.success(assemblyListService.getComponentList(reqVO)); } @PostMapping("/list/view/plate/page") @Operation(summary = "装配清单-获取订单部件下的板件视图分页列表数据") + @PreAuthorize("@ss.hasPermission('production:assemblyList:query')") public CommonResult> getComponentViewPlatesPage(@Valid @RequestBody AssemblyListComponentPageReqVO pageReqVO) { return success(assemblyListService.getViewComponentPlatePage(pageReqVO)); } @PostMapping("/list/view/part/page") @Operation(summary = "装配清单-获取订单部件下的配件视图分页列表数据") + @PreAuthorize("@ss.hasPermission('production:assemblyList:query')") public CommonResult> getComponentViewPartsPage(@Valid @RequestBody AssemblyListComponentPageReqVO pageReqVO) { return success(assemblyListService.getViewComponentPartPage(pageReqVO)); } @PostMapping("/list/view/cadinfo") @Operation(summary = "装配清单-获取订单部件下的所有板件+配件视图列表数据") + @PreAuthorize("@ss.hasPermission('production:assemblyList:query')") public CommonResult getComponentViewPlates(@Valid @RequestBody AssemblyListComponentPageReqVO pageReqVO) { return success(assemblyListService.getViewComponentPlatesCadInfo(pageReqVO)); } @@ -65,6 +70,7 @@ public class AssemblyListController { @PostMapping("/process/{id}") @Operation(summary = "装配清单-加工部件") @Parameter(name = "id", description = "部件编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('production:assemblyList:process')") public CommonResult processComponent(@PathVariable Long id) { assemblyListService.processComponent(id); return CommonResult.success(true); @@ -73,6 +79,7 @@ public class AssemblyListController { @PostMapping("/restore/{id}") @Operation(summary = "装配清单-恢复未加工") @Parameter(name = "id", description = "部件编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('production:assemblyList:process')") public CommonResult restoreComponent(@PathVariable Long id) { assemblyListService.restoreComponent(id); return CommonResult.success(true); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/HeapSplitController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/HeapSplitController.java index a7c5b2b45..aec17c337 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/HeapSplitController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/HeapSplitController.java @@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -37,6 +38,7 @@ public class HeapSplitController { @PostMapping("") @Operation(summary = "保存分堆") + @PreAuthorize("@ss.hasPermission('manage:heapsplit:query')") public CommonResult saveHeapsplit(@Valid @RequestBody HeapSplitSaveReqVO reqVO) { heapSplitService.saveHeapsplit(reqVO); return success(true); @@ -45,6 +47,7 @@ public class HeapSplitController { @PostMapping("/details") @Operation(summary = "查询分堆详情") @Parameter(name = "orderIds", description = "订单ID列表", required = true) + @PreAuthorize("@ss.hasPermission('manage:heapsplit:save')") public CommonResult getOrdersHeapSplitDetail(@RequestBody @NotEmpty(message = "订单ID不能为空") List orderIds) { return success(heapSplitService.getOrdersHeapSplitedDetail(orderIds)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java index 9ee8c7164..8838ea185 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java @@ -44,6 +44,7 @@ public class PackController { @PostMapping("/unpack/details") @Operation(summary = "获取订单列表下未打包明细") @Parameter(name = "orderIds", description = "订单ID列表", required = true) + @PreAuthorize("@ss.hasAnyPermissions('manage:pack:pack')") public CommonResult getOrdersUnpackDetail(@RequestBody @NotEmpty(message = "订单ID不能为空") List orderIds) { return success(packService.getOrdersUnpackDetails(orderIds)); } @@ -124,6 +125,7 @@ public class PackController { @PostMapping("/scan/correlation") @Operation(summary = "查询扫描类型相关的板件+配件id") + @PreAuthorize("@ss.hasPermission('manage:pack:query')") public CommonResult> getComponentCorrelation(@Valid @RequestBody PackScanComponentCorrelationReqVO reqVO) { return success(packService.getComponentCorrelation(reqVO)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java index f3ed6a8fe..bbcebd806 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java @@ -16,6 +16,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -47,20 +48,16 @@ public class OrderComponentController { @Resource private AssemblyListService assemblyListService; - @PostMapping("/detail/list") - @Operation(summary = "查询订单详情部件列表") - public CommonResult> getOrderComponentList(@Valid @RequestBody OrderDetailComponentListReqVO reqVO) { - return success(orderComponentService.getOrderComponentList(reqVO)); - } - @PostMapping("/top/list") @Operation(summary = "查询订单顶级部件列表") + @PreAuthorize("@ss.hasPermission('production:assemblyList:query')") public CommonResult> getOrderTopComponentList(@Valid @RequestBody OrdersTopComponentListReqVO reqVO) { - return success(assemblyListService.getOrderTopComponentList(reqVO)); + return success(assemblyListService.getOrderTopComponentList(reqVO)); } @PostMapping("/view/list") @Operation(summary = "查询订单详情cad视图部件列表") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult> getOrderViewComponentList(@Valid @RequestBody OrderDetailComponentListReqVO reqVO) { return success(orderComponentService.getComponentListOnTopId(reqVO)); } @@ -68,30 +65,35 @@ public class OrderComponentController { @GetMapping("/view/{id}/list") @Operation(summary = "查询指定顶级部件下部件列表") @Parameter(name = "id", description = "部件编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:query')") public CommonResult> getChildViewComponentList(@PathVariable Long id) { return success(orderComponentService.getChildComponentListOnTopId(id)); } @PostMapping("/view/plate/page") @Operation(summary = "获取部件下的板件视图分页列表数据") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult> getComponentViewPlatesPage(@Valid @RequestBody OrderDetailComponentPageReqVO pageReqVO) { return success(orderComponentService.getViewComponentPlatesPage(pageReqVO)); } @PostMapping("/view/part/page") @Operation(summary = "获取部件下的配件视图分页列表数据") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult> getComponentViewPartsPage(@Valid @RequestBody OrderDetailComponentPageReqVO pageReqVO) { return success(orderComponentService.getViewComponentPartsPage(pageReqVO)); } @PostMapping("/view/cadinfo") @Operation(summary = "获取部件下的所有板件+配件视图列表数据") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult getComponentViewPlates(@Valid @RequestBody OrderDetailComponentPageReqVO pageReqVO) { return success(orderComponentService.getViewComponentCadInfo(pageReqVO)); } @DeleteMapping("/{orderId}/{id}") @Operation(summary = "删除订单部件") + @PreAuthorize("@ss.hasPermission('production:manager-list:deleteComponent')") public CommonResult deleteOrderComponent(@PathVariable("orderId") Long orderId, @PathVariable("id") Long id) { orderComponentService.deleteOrderComponent(orderId, id); return success(true); @@ -99,6 +101,7 @@ public class OrderComponentController { @PutMapping("/{orderId}/{id}") @Operation(summary = "恢复订单部件") + @PreAuthorize("@ss.hasPermission('production:manager-list:restoreComponent')") public CommonResult restoreOrderComponent(@PathVariable("orderId") Long orderId, @PathVariable("id") Long id) { orderComponentService.restoreOrderComponent(orderId, id); return success(true); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java index 2579b37a9..a9dff9f7c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java @@ -139,24 +139,28 @@ public class PlateController { @PostMapping("/body/view/plate/page") @Operation(summary = "获取柜体下的板件视图分页列表数据") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult> getBodyViewPlatesPage(@Validated(OrderCadViewPageGroup.class) @RequestBody OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { return success(plateService.getBodyViewPlatesPage(orderCadViewPlatePageReqVO)); } @PostMapping("/body/view/part/page") @Operation(summary = "获取柜体下的配件视图分页列表数据") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult> getBodyViewPartsPage(@Validated(OrderCadViewPageGroup.class) @RequestBody OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { return success(plateService.getBodyViewPartsPage(orderCadViewPlatePageReqVO)); } @PostMapping("/body/view/cadinfo") @Operation(summary = "获取板件对应柜体下的所有板件+配件视图列表数据") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult getBodyViewCadInfo(@Validated @RequestBody OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { return success(plateService.getBodyViewCadInfo(orderCadViewPlatePageReqVO)); } @PostMapping("/body/view/part/cadinfo") @Operation(summary = "获取板件对应柜体下的所有配件视图列表数据") + @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult getBodyViewPartCadInfo(@Validated @RequestBody OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { return success(plateService.getBodyViewPartCadInfo(orderCadViewPlatePageReqVO)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index 49b914a32..c8f037d57 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -180,13 +180,11 @@ public interface OrderMapper extends BaseMapperX { * @param today * @param organId * @param page - * @param orderIds 父级订单数组 * @return */ IPage selectOrderOverdue(@Param("today") LocalDate today, @Param("organId") Long organId, - @Param("page") IPage page, - @Param("orderIds") Long... orderIds); + @Param("page") IPage page); /** * 订单数量统计 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/ordercomponent/OrderComponentMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/ordercomponent/OrderComponentMapper.java index ab985af0a..dcfe12bdb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/ordercomponent/OrderComponentMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/ordercomponent/OrderComponentMapper.java @@ -35,6 +35,15 @@ public interface OrderComponentMapper extends BaseMapperX { */ List getTopComponentListIn(@Param("ids") List ids, boolean deleted); + /** + * 查询订单顶级部件，关联order_item，如果被移除了就不展示了 + * + * @param orderIds + * @param name + * @return + */ + List getOrderTopComponentList(@Param("orderIds")List orderIds, @Param("name") String name); + /** * 查询订单topid下的所有大于level层级的部件列表 * @param orderId diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java index dd879fe62..d62e52df9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java @@ -835,15 +835,15 @@ public class AssemblyListServiceImpl implements AssemblyListService { return BeanUtil.copyToList(result, OrderComponentRespVO.class); } - + /** + * 整理状态对应的树数据 + * + * @param reqVO + * @return + */ private List buildTopComponentStates(OrdersTopComponentListReqVO reqVO) { - - List topComponents = orderComponentMapper.selectList( - new LambdaQueryWrapperX() - .in(OrderComponentDO::getOrderId, reqVO.getOrderIds()) - .eq(OrderComponentDO::getPid, OrderComponentDO.PARENT_ID_ROOT) - .likeIfPresent(OrderComponentDO::getName, reqVO.getName()) - ); + // 查询顶级部件 + List topComponents = orderComponentMapper.getOrderTopComponentList(reqVO.getOrderIds(), reqVO.getName()); if (CollUtil.isEmpty(topComponents)) { return Collections.emptyList(); @@ -904,6 +904,12 @@ public class AssemblyListServiceImpl implements AssemblyListService { return result; } + /** + * 解析树数据 + * + * @param node + * @return + */ private ProcessStats analyzeTree(OrderComponentTreeCompareVO node) { ProcessStats stats = new ProcessStats(); @@ -941,6 +947,13 @@ public class AssemblyListServiceImpl implements AssemblyListService { return stats; } + /** + * 过滤规则，是否匹配状态 + * + * @param state + * @param statusSet + * @return + */ private boolean matchAnyStatus(TopComponentState state, Set statusSet) { 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 cbc6b9a87..0e172810c 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 @@ -775,38 +775,11 @@ public class OrderServiceImpl implements OrderService { @Override public PageResult getOrderOverdue(PageParam pageParam) { - Long organId = OrganContextHolder.getOrganId(); - LocalDate todayDate = LocalDate.now(); PageDTO page = new PageDTO<>(pageParam.getPageNo(), pageParam.getPageSize()); // 查询超时单 - IPage orderOverdueVOS = orderMapper.selectOrderOverdue(todayDate, organId, page); - List records = orderOverdueVOS.getRecords(); - long total = orderOverdueVOS.getTotal(); - - // 查询子单 - if (CollUtil.isNotEmpty(records)) { - // 主单id列表 - Long[] mainOrderIds = records.stream().map(OrderOverdueRespVO::getId).toArray(Long[]::new); - PageDTO childPage = new PageDTO<>(pageParam.getPageNo(), PageParam.PAGE_SIZE_NONE); - IPage childOrderOverdueVOS = orderMapper.selectOrderOverdue(todayDate, organId, childPage, mainOrderIds); - - List childList = childOrderOverdueVOS.getRecords(); - - if (CollUtil.isNotEmpty(childList)) { - // 按 parentId 分组 - Map> childMap = childList.stream() - .collect(Collectors.groupingBy(OrderOverdueRespVO::getParentId)); - - // 回填 child - for (OrderOverdueRespVO order : records) { - order.setChild(childMap.getOrDefault(order.getId(), null)); - } - } - return new PageResult<>(records, total); - - } - return new PageResult<>(orderOverdueVOS.getRecords(), total); + IPage orderOverdueVOS = orderMapper.selectOrderOverdue(todayDate, OrganContextHolder.getOrganId(), page); + return new PageResult<>(orderOverdueVOS.getRecords(), orderOverdueVOS.getTotal()); } @Override diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java index 6ba15d537..76eb4bd1e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java @@ -30,7 +30,6 @@ import com.cf.imes.module.executor.dal.dataobject.orderItem.OrdersViewPlatesPage import com.cf.imes.module.executor.dal.dataobject.ordercomponent.OrderComponentDO; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; import com.cf.imes.module.executor.dal.dataobject.orderBody.OrderBodyDO; -import com.cf.imes.module.executor.dal.mysql.goods.GoodsMapper; import com.cf.imes.module.executor.dal.mysql.order.OrderMapper; import com.cf.imes.module.executor.dal.mysql.orderBody.OrderBodyMapper; import com.cf.imes.module.executor.dal.mysql.orderItem.OrderItemMapper; @@ -87,9 +86,6 @@ public class OrderComponentServiceImpl implements OrderComponentService { @Resource private PlateMapper plateMapper; - @Resource - private GoodsMapper goodsMapper; - @Resource private OrderBodyMapper orderBodyMapper; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index 76f1f4d9c..1d55662b6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml @@ -153,17 +153,6 @@ and o.deleted = 0 and o.status != 4 and #{today} >= DATE(o.delivery_date) - - - AND parent_id IN - - #{orderId} - - - - AND parent_id = 0 - - + +