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 58823b5..6fffde3 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 @@ -82,7 +82,10 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr checkShippingDetails(model, orderManagement, shippingGroup, produceSn, detail); scanFlg = true; //明细更新 - updateOrderManagementDetails(produceSn, orderManagement, detail, model.getUserInfo(), model); + if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) { + detail.setBarcode(model.getSn()); + } + updateOrderManagementDetails(produceSn, orderManagement, detail, model.getUserInfo()); break; } } @@ -223,9 +226,8 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr return mesShippingOrderManagementDetail; } - private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, String userInfo, MesSortShippingCheckModel model) { + private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, String userInfo) { if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) { - detail.setBarcode(model.getSn()); detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER); detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue()); detail.setRemark("扫描完成");