From fc4dfeef2f7c581bf127e4ff01f77bf01a1cc236 Mon Sep 17 00:00:00 2001 From: jason Date: Tue, 6 May 2025 18:14:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=89=AB=E6=8F=8F=E5=AE=A2=E6=88=B7=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=8F=91=E8=BF=90=E5=8D=95=E6=98=8E=E7=BB=86barcode?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java index 30ac10d..26a7e42 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java @@ -83,7 +83,7 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr checkShippingDetails(model, orderManagement, shippingGroup, produceSn, detail); scanFlg = true; //明细更新 - updateOrderManagementDetails(produceSn, orderManagement, detail, model.getUserInfo()); + updateOrderManagementDetails(produceSn, orderManagement, detail, model.getUserInfo(), model); break; } } @@ -216,9 +216,9 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr return mesShippingOrderManagementDetail; } - private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, String userInfo) { + private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, String userInfo, MesSortShippingCheckModel model) { if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) { - detail.setBarcode(produceSn.getProductSn()); + detail.setBarcode(model.getSn()); detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER); detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue()); detail.setRemark("扫描完成"); From b1fc30cf8589556d54db3c1e943784036db9cb0a Mon Sep 17 00:00:00 2001 From: jason Date: Tue, 6 May 2025 18:14:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=89=AB=E6=8F=8F=E5=AE=A2=E6=88=B7=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=8F=91=E8=BF=90=E5=8D=95=E6=98=8E=E7=BB=86barcode?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java index 30ac10d..adce8b0 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java @@ -83,6 +83,9 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr checkShippingDetails(model, orderManagement, shippingGroup, produceSn, detail); scanFlg = true; //明细更新 + if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) { + detail.setBarcode(model.getSn()); + } updateOrderManagementDetails(produceSn, orderManagement, detail, model.getUserInfo()); break; } @@ -218,7 +221,6 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, String userInfo) { if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) { - detail.setBarcode(produceSn.getProductSn()); detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER); detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue()); detail.setRemark("扫描完成");