Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev

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

@@ -79,7 +79,7 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
         for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
             boolean notScan;
             if (Objects.equals(model.getSecondShipping(), true)) {
-                notScan = Objects.equals(detail.getSecondScanFlg(), MesCommonConstant.FALSE_INTEGER) && Objects.equals(detail.getBarcode(), model.getSn());
+                notScan = !Objects.equals(detail.getSecondScanFlg(), MesCommonConstant.TRUE_INTEGER) && Objects.equals(detail.getBarcode(), model.getSn());
             } else {
                 notScan = StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(detail.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER);
             }