From 461e9cbf61e54bb35368045a0e500ebc9c527750 Mon Sep 17 00:00:00 2001 From: yangsb Date: Fri, 15 Mar 2024 16:30:04 +0800 Subject: [PATCH] =?UTF-8?q?order=5Fitem=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/dal/dataobject/orderItem/OrderItemDO.java | 8 ++++++++ .../module/executor/service/plan/PlanServiceImpl.java | 2 +- .../src/main/resources/mapper/plate/PlateMapper.xml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderItemDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderItemDO.java index 5f6d9c8f1..3bd008f0e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderItemDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderItemDO.java @@ -52,6 +52,14 @@ public class OrderItemDO { * 包裹 ID */ private Long packageId; + /** + * 生产单板件id + */ + private Long plateId; + /** + * 五金配件id + */ + private Long partsId; /** * 部件数量 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index 9a519b961..8e2f712f0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -282,7 +282,7 @@ public class PlanServiceImpl implements PlanService { orderItemDOS.add(OrderItemDO.builder() .planId(req.getPlanId()) .orderId(obj.getOrderId()) - .dataId(obj.getPlateId()) + .plateId(obj.getPlateId()) .type(1) .build()); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index 0ff8688dc..e3a68c4fd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -24,7 +24,7 @@ resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList"> select a.order_id, a.plate_no , a.name, e.material, e.color, e.width, e.height, e.thickness, b.room_id, b.body_id from order_plate a - left join order_item b on a.id = b.data_id and b.type =1 + left join order_item b on a.id = b.plate_id left join order_plan_item c on a.id = c.item_id left join order_goods e on e.goods_id = a.goods_id and e.order_id = a.order_id left join `order` f on f.id = a.order_id