From 36785e32d8ca95b62871e6c4a3b8cd5b7583b96c Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 8 Jul 2025 16:23:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9D=9E=E6=B7=B7=E5=8D=95?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8E=92=E5=8D=95=E6=97=B6=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E7=BA=B9=E8=B7=AF=E5=88=86=E7=BB=84=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imes/framework/tracer/core/filter/TraceFilter.java | 1 - .../controller/admin/plan/vo/SavePlanPlateList.java | 3 +++ .../module/executor/service/plan/PlanServiceImpl.java | 10 +++++++--- .../executor/service/plate/PlateServiceImpl.java | 9 +++++++-- .../src/main/resources/mapper/goods/GoodsMapper.xml | 1 + .../src/main/resources/mapper/plan/PlanMapper.xml | 5 +++-- .../main/resources/mapper/planitem/PlanItemMapper.xml | 7 +++++-- 7 files changed, 26 insertions(+), 10 deletions(-) diff --git a/cf-framework/cf-spring-boot-starter-monitor/src/main/java/com/cf/imes/framework/tracer/core/filter/TraceFilter.java b/cf-framework/cf-spring-boot-starter-monitor/src/main/java/com/cf/imes/framework/tracer/core/filter/TraceFilter.java index 556751060..a488bf3db 100644 --- a/cf-framework/cf-spring-boot-starter-monitor/src/main/java/com/cf/imes/framework/tracer/core/filter/TraceFilter.java +++ b/cf-framework/cf-spring-boot-starter-monitor/src/main/java/com/cf/imes/framework/tracer/core/filter/TraceFilter.java @@ -28,7 +28,6 @@ public class TraceFilter extends OncePerRequestFilter { // 继续过滤 chain.doFilter(request, response); } finally { - System.out.println("traceId: " + traceId); // 清理跟踪ID MDC.remove(TRACE_ID); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java index d9e54b662..e16ca96d8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java @@ -85,6 +85,9 @@ public class SavePlanPlateList { @Schema(description = "大板的品牌") private String brand; + @Schema(description = "纹理") + private Boolean texture; + } } 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 ff1fceae0..d440d1c11 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 @@ -649,13 +649,16 @@ public class PlanServiceImpl implements PlanService { List brand = records.stream().map(OrderGoodsResp::getBrand).distinct().toList(); + List texture = records.stream().map(OrderGoodsResp::getTexture).distinct().toList(); + queryWrapperX .inIfPresent("og.goods_name",goodsName) .inIfPresent("og.material",material) .inIfPresent("og.color",color) .inIfPresent("og.thickness",thickness) - .inIfPresent("og.brand",brand); + .inIfPresent("og.brand",brand) + .inIfPresent("og.texture", texture); List orderGoodsIdList = planItemMapper.selectNoOrderGoodsIdList(queryWrapperX, getUserOrganId(), type); @@ -1582,7 +1585,7 @@ public class PlanServiceImpl implements PlanService { for (SavePlanPlateList.GoodsItemList item : items) { // 将 material 和 thickness 组合成键 - String key = item.getMaterial() + "|" + item.getThickness() + "|" + item.getColor()+ "|" + item.getBrand(); + String key = item.getMaterial() + "|" + item.getThickness() + "|" + item.getColor()+ "|" + item.getBrand() + "|" + item.getTexture(); // 如果键不存在，初始化一个新的列表 groupedItems.putIfAbsent(key, new ArrayList<>()); @@ -1803,7 +1806,8 @@ public class PlanServiceImpl implements PlanService { Objects.toString(item.getMaterial(), ""), Objects.toString(item.getColor(), ""), Objects.toString(item.getThickness(), ""), - Objects.toString(item.getBrand(), "") + Objects.toString(item.getBrand(), ""), + Objects.toString(item.getTexture(), "") ); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 5def6dce0..5bf9a33ae 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -113,6 +113,7 @@ public class PlateServiceImpl implements PlateService { private static final String FIELD_OG_BRAND = "og.brand"; private static final String FIELD_OG_COLOR = "og.color"; private static final String FIELD_OP_THICKNESS = "op.thickness"; + private static final String FIELD_OG_TEXTURE = "og.texture"; SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -360,6 +361,8 @@ public class PlateServiceImpl implements PlateService { List thickness = goodsRespVOS.stream().map(OrderGoodsResp::getThickness).distinct().toList(); + List texture = goodsRespVOS.stream().map(OrderGoodsResp::getTexture).distinct().toList(); + // 混单 if(planDO.getType().equals(PlanTypeEnum.MIXEDORDERPLAN.getType())){ @@ -372,7 +375,7 @@ public class PlateServiceImpl implements PlateService { else { // 非混单条件查询条件 - noMixedInsertQuery(pageReqVO, planDO, material, brand, color, thickness, queryWrapperX); + noMixedInsertQuery(pageReqVO, planDO, material, brand, color, thickness, texture, queryWrapperX); } } @@ -812,6 +815,7 @@ public class PlateServiceImpl implements PlateService { List brand, List color, List thickness, + List texture, QueryWrapperX queryWrapperX) { // 是否开启混单 @@ -844,7 +848,8 @@ public class PlateServiceImpl implements PlateService { .inIfPresent(FIELD_OG_MATERIAL, material) .inIfPresent(FIELD_OG_BRAND, brand) .inIfPresent(FIELD_OG_COLOR, color) - .inIfPresent(FIELD_OP_THICKNESS, thickness); + .inIfPresent(FIELD_OP_THICKNESS, thickness) + .inIfPresent(FIELD_OG_TEXTURE, texture); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml index fbc50de9e..badf05baf 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml @@ -34,6 +34,7 @@ og.color, og.thickness, og.brand, + og.texture, og.remark, orp.id as remainId diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml index b46f7a93e..48c0d6bb7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml @@ -265,9 +265,10 @@ select distinct og.thickness as thickness, og.material as material, og.color as color, - og.brand as brand + og.brand as brand, + og.texture as texture from order_plate op - left join order_goods og on op.organ_id = og.organ_id and opi.goods_id = og.id + left join order_goods og on op.organ_id = og.organ_id and op.goods_id = og.id where op.organ_id = #{organId} and op.plan_id = #{planId}; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml index 6335bfcd8..a4ddfc181 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml @@ -242,7 +242,8 @@ og.goods_name as goodsName, og.material as material, og.thickness as thickness, - og.brand as brand + og.brand as brand, + og.texture as texture from order_item oi join order_plate op on op.order_id = oi.order_id and op.organ_id = oi.organ_id and op.id = oi.plate_id @@ -265,7 +266,8 @@ og.goods_name as goodsName, og.material as material, og.thickness as thickness, - og.brand as brand + og.brand as brand, + og.texture as texture from orders o join order_goods og on o.id = og.order_id and og.organ_id = #{organId} @@ -289,6 +291,7 @@ og.material as material, og.thickness as thickness, og.brand as brand, + og.texture as texture, og.goods_id as goodsId, og.order_id as orderId