Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

组件优化结果保存，materialId类型修改为String

Browse Source
This commit is contained in:
gaoqr
2026-06-08 15:43:37 +08:00
parent bbb5c18066
commit 6c4fb9bdde
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/component/BoardLayoutResultSummary.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class BoardLayoutResultSummary {
/** /**
* 材料ID列表 * 材料ID列表
*/ */
private List<Long> materialIds; private List<String> materialIds;
/** /**
* 已优化排版ID列表 * 已优化排版ID列表
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+2 -5
View File
@@ -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.component.OrderBoardDosageResultsReqVO;
import com.cf.imes.module.executor.controller.admin.plan.saveOptimize.*; 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.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.OptimizeBoardModelDO;
import com.cf.imes.module.executor.dal.dataobject.goods.PlanActualGoodsModelDO; import com.cf.imes.module.executor.dal.dataobject.goods.PlanActualGoodsModelDO;
import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;
@@ -1932,12 +1931,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
JSONArray orderBoardDosageJsonArr = new JSONArray(); JSONArray orderBoardDosageJsonArr = new JSONArray();
for (BoardLayoutResultSummary summary : layoutResultSummary) { for (BoardLayoutResultSummary summary : layoutResultSummary) {
List<Long> materialIds = summary.getMaterialIds(); List<String> materialIds = summary.getMaterialIds();
if(CollUtil.isEmpty(materialIds)) { if(CollUtil.isEmpty(materialIds)) {
continue; continue;
} }
Long orderGoodsId = materialIds.get(0);
GoodsDO goodsDO = goodsMapper.selectById(orderGoodsId);
// 提取大板计算数据 // 提取大板计算数据
JSONObject orderBoardDosageJSON = new JSONObject(); JSONObject orderBoardDosageJSON = new JSONObject();
@@ -1946,7 +1943,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
orderBoardDosageJSON.put("trimAmount", summary.getTrimAmount()); // 最大可执行修边量 orderBoardDosageJSON.put("trimAmount", summary.getTrimAmount()); // 最大可执行修边量
orderBoardDosageJSON.put("boardCount", summary.getBoardCount()); // 排版大板数量 orderBoardDosageJSON.put("boardCount", summary.getBoardCount()); // 排版大板数量
orderBoardDosageJSON.put("gap", summary.getGap()); // 小板排版间隙 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("name", summary.getName()); // 大板名称
orderBoardDosageJSON.put("length", summary.getLength()); // 长 orderBoardDosageJSON.put("length", summary.getLength()); // 长
orderBoardDosageJSON.put("width", summary.getWidth()); // 宽 orderBoardDosageJSON.put("width", summary.getWidth()); // 宽