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 f1ac61191..cd3e03035 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 @@ -801,7 +801,7 @@ public class OrderServiceImpl implements OrderService { long plateNo = idWorker.nextId(); long obtainingTime = idWorker.obtainingTime(); - String goodsId = (obtainingTime) + Long.toString(plateNo).substring(2); + String goodsId = goodsDO.getGoodsId() == null ? (obtainingTime) + Long.toString(plateNo).substring(2) : goodsDO.getGoodsId(); goodsDO.setGoodsId(goodsId); @@ -810,12 +810,7 @@ public class OrderServiceImpl implements OrderService { plateGoodDO = BeanUtils.toBean(goodsDO, PlateGoodDO.class) .setId(plateGoods) .setGoodsId(goodsId); - // 判断是否存在raw_goods_id -// if (goodsDO.getGoodsId() != null) { -// plateGoodDO.setGoodsId(goodsDO.getGoodsId()); -// } else { -// goodsDO.setGoodsId(plateGoodDO.getGoodsId()); -// } + plateGoodLists.add(plateGoodDO); }