From 2c61663bc6ff985d70604c223f16aea70e342166 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Thu, 26 Dec 2024 15:33:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=BC=96=E5=8F=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/executor/service/order/OrderServiceImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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); }