From 6c4fb9bdde4f1aea4732a87a3dc853c4ad4bc1e0 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 8 Jun 2026 15:43:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E4=BF=9D=E5=AD=98=EF=BC=8CmaterialId=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9=E4=B8=BAString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/component/BoardLayoutResultSummary.java | 2 +- .../service/optimizeplan/OptimizePlanServiceImpl.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/component/BoardLayoutResultSummary.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/component/BoardLayoutResultSummary.java index 7637f1cf6..6a3d9379d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/component/BoardLayoutResultSummary.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/component/BoardLayoutResultSummary.java @@ -78,7 +78,7 @@ public class BoardLayoutResultSummary { /** * 材料ID列表 */ - private List materialIds; + private List materialIds; /** * 已优化排版ID列表 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index ba4240291..66f06b429 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -49,7 +49,6 @@ import com.cf.imes.module.executor.controller.admin.plan.component.OptimizationR import com.cf.imes.module.executor.controller.admin.plan.component.OrderBoardDosageResultsReqVO; import com.cf.imes.module.executor.controller.admin.plan.saveOptimize.*; import com.cf.imes.module.executor.controller.admin.plan.vo.*; -import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.executor.dal.dataobject.goods.OptimizeBoardModelDO; import com.cf.imes.module.executor.dal.dataobject.goods.PlanActualGoodsModelDO; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; @@ -1932,12 +1931,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { JSONArray orderBoardDosageJsonArr = new JSONArray(); for (BoardLayoutResultSummary summary : layoutResultSummary) { - List materialIds = summary.getMaterialIds(); + List materialIds = summary.getMaterialIds(); if(CollUtil.isEmpty(materialIds)) { continue; } - Long orderGoodsId = materialIds.get(0); - GoodsDO goodsDO = goodsMapper.selectById(orderGoodsId); // 提取大板计算数据 JSONObject orderBoardDosageJSON = new JSONObject(); @@ -1946,7 +1943,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { orderBoardDosageJSON.put("trimAmount", summary.getTrimAmount()); // 最大可执行修边量 orderBoardDosageJSON.put("boardCount", summary.getBoardCount()); // 排版大板数量 orderBoardDosageJSON.put("gap", summary.getGap()); // 小板排版间隙 - orderBoardDosageJSON.put(FIELD_GOODS_ID, goodsDO.getGoodsId()); // 商品编号 + orderBoardDosageJSON.put(FIELD_GOODS_ID, materialIds.get(0)); // 商品编号 orderBoardDosageJSON.put("name", summary.getName()); // 大板名称 orderBoardDosageJSON.put("length", summary.getLength()); // 长 orderBoardDosageJSON.put("width", summary.getWidth()); // 宽