发运明细顺序校验逻辑调整

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

@@ -251,7 +251,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     //判断是否需要排序校验 默认排序则需要校验
                     if (!StringUtils.isEmpty(orderManagement.getScanSeqWay()) && orderManagement.getScanSeqWay() == MesExtEnumUtil.SHIPPING_GROUP_SCAN_CONFIRM_SEQ_MODE.DEFAULT_SORT.getValue()) {
                         //获取明细中最小的
-                        Optional<String> minPartNO = model.getDetailList().stream().filter(k -> StringUtils.isEmpty(k.getBarcode()))
+                        Optional<String> minPartNO = model.getDetailList().stream().filter(k -> StringUtils.isEmpty(k.getBarcode()) && !Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER))
                                 .min(Comparator.comparingLong(k -> k.getCustInfoSeq())).map(k -> k.getPartNo());
                         //若扫描的不是最小顺序 则报错
                         if (minPartNO.isPresent() && !minPartNO.get().equals(produceSn.getPartNo())) {