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 2c68afde6..6bf2d33b4 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 @@ -349,16 +349,17 @@ public class OrderServiceImpl implements OrderService { List plateDO = (List) listMap.get("platesDO"); List plateDetail = (List) listMap.get("plateDetail"); List itemDO = (List) listMap.get("itemDO"); + List partsRemark = (List) listMap.get("partsRemark"); Map> map = getPlateGoods(goodsDO);// 检验商品板材信息是否存在 goodsDO = (List) map.get("goodsDO"); List plateGoodDOS = (List) map.get("plateGoodDOLists"); validateCustomOrderNoExists(order.get(0).getCustomOrderNo()); -// orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS); -// List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); -// orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId())); -// orderInputProcessor.batchSaveModel(orderModelDOs); + orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS); + List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); + orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId())); + orderInputProcessor.batchSaveModel(orderModelDOs); return order.get(0).getId(); } @@ -528,9 +529,9 @@ public class OrderServiceImpl implements OrderService { goodsDO = (List) map.get("goodsDO"); List plateGoodDOS = (List) map.get("plateGoodDOLists"); -// validateCustomOrderNoExists(orderDO.getCustomOrderNo()); -// orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS); -// orderInputProcessor.batchSaveModel(orderModelDOS); + validateCustomOrderNoExists(orderDO.getCustomOrderNo()); + orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS); + orderInputProcessor.batchSaveModel(orderModelDOS); }