装箱防错一个条码只能存在一个箱子里面

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

@@ -286,10 +286,10 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
 
     private void checkSerialNumber(MesPackageDetail mesPackageDetail) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPackageDetail.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(mesPackageDetail.getPackageNo(), "packageNo", ddlPackBean);
+//        DdlPreparedPack.getStringEqualPack(mesPackageDetail.getPackageNo(), "packageNo", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(mesPackageDetail.getSerialNumber(), "serialNumber", ddlPackBean);
         if (mesPackageDetailRDao.isExitByHql(ddlPackBean)) {
-            MesPcnException.throwMesBusiException("零件条码【%s】已存在该箱，不允许重复扫描，请检查数据！", mesPackageDetail.getSerialNumber());
+            MesPcnException.throwMesBusiException("零件条码【%s】已装箱，请检查数据！", mesPackageDetail.getSerialNumber());
         }
     }
 

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

@@ -164,6 +164,10 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
         if (mesShippingSnUniqueService.checkMesShippingSnUnique(model.getOrganizeCode(),model.getSn())) {
             throw new ImppBusiException(String.format("【%s】条码唯一性校验数据已存在，请检查数据！", model.getSn()));
         }
+        //发运组代码不存在
+        if (Objects.isNull(model.getMesPartShippingGroup())) {
+            MesPcnException.throwMesBusiException("发运组信息不存在，请检查数据！");
+        }
         List<MesShippingOrderManagementDetail> detailList = model.getDetailList().stream().filter(k -> !StringUtils.isEmpty(k.getCustPartNo()) && StringUtils.isEmpty(k.getBarcode()) && !Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).collect(Collectors.toList());
         MesShippingOrderManagementDetail mesShippingOrderManagementDetail = null;
         for (MesShippingOrderManagementDetail managementDetail : detailList) {