Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java

@@ -82,6 +82,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;
             }
@@ -225,7 +228,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("扫描完成");