45524 PCN：武汉cockpit发运，需要卡控客户条码不允许重复扫描

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

@@ -707,6 +707,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     produceSn.setSystemSyncDatetime(MesPcnExtConstWords.EMPTY);
                     ConvertBean.serviceModelUpdate(produceSn, userInfo);
                     produceSnList.add(produceSn);
+                    mesShippingSnUniqueList.add(mesShippingSnUniqueService.getMesShippingSnUnique(organizeCode, detail.getBarcode(), orderManagement.getShippingCode(), userInfo));
                 } else {
                     //记录唯一性校验表
                     mesShippingSnUniqueList.add(mesShippingSnUniqueService.getMesShippingSnUnique(organizeCode, detail.getBarcode(), orderManagement.getShippingCode(), userInfo));

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

@@ -158,6 +158,10 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
         if (!StringUtils.isEmpty(produceSn)) {
             //校验状态
             checkStatus(model, produceSn);
+            //唯一性校验
+            if (mesShippingSnUniqueService.checkMesShippingSnUnique(model.getOrganizeCode(),model.getSn())) {
+                throw new ImppBusiException(String.format("【%s】条码唯一性校验数据已存在，请检查数据！", model.getSn()));
+            }
         } else {
             //外部条码解析
             MesShippingOrderManagementDetail mesShippingOrderManagementDetail = getMesShippingOrderManagementDetail(model);