宁德二次装箱

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

@@ -149,7 +149,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
             //校验包装条码信息
             MesPackage mesPackage = getMesPackageAndCheck(mesPackageDetail.getPackageNo(), mesPackageDetail.getOrganizeCode());
             //校验是否已关闭
-            if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == mesPackage.getIsSealed() && !Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), packingDefine.getIsConfirmCheck())) {
+            if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == mesPackage.getIsSealed()) {
                 List<MesProduceSn> produceSnList = mesProduceSnExtService.getProduceSnList(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getSerialNumber());
                 //1.查询包装明细是否包含此零件
                 List<MesPackingDefineDetails> defineDetails = getMesPackingDefineDetailsNew(mesPackageDetail.getOrganizeCode(), mesPackage.getPackageSn(), mesPackage.getPartNo());
@@ -166,7 +166,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
             //校验条码规则
             MesPart mesPart = getMesPartNew(mesPackageDetail, mesPackage, packingDefine);
             //包装规格明细
-            MesPackageDetail saveMesPackageDetail = getPackageDetail(mesPackageDetail, mesPart);
+            MesPackageDetail saveMesPackageDetail = getPackageDetail(mesPackageDetail, mesPart, packingDefine);
             if (mesPackageDetail.getIsMemoryBoolean()) {
                 //保存包装明细
                 mesPackageDetailRDao.insert(saveMesPackageDetail);
@@ -294,31 +294,34 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
         }
     }
 
-    private MesPart getMesPart(MesPackageDetail mesPackageDetail, MesPackage mesPackage, MesPackingDefine packingDefine) {
+//    private MesPart getMesPart(MesPackageDetail mesPackageDetail, MesPackage mesPackage, MesPackingDefine packingDefine) {
-        //校验是否重复扫描
+//        //校验是否重复扫描
-        checkSerialNumber(mesPackageDetail);
+//        checkSerialNumber(mesPackageDetail);
-        //获取包装定义明细
+//        //获取包装定义明细
-        List<MesPackingDefineDetails> defineDetails = getMesPackingDefineDetails(mesPackageDetail.getOrganizeCode(), mesPackage.getPackageSn());
+//        List<MesPackingDefineDetails> defineDetails = getMesPackingDefineDetails(mesPackageDetail.getOrganizeCode(), mesPackage.getPackageSn());
-        //校验是否包含
+//        //校验是否包含
-//        String partNo = getPartNo(mesPackageDetail, mesPackage, defineDetails);
+////        String partNo = getPartNo(mesPackageDetail, mesPackage, defineDetails);
-        //校验条码信息
+//        //校验条码信息
-        String partNo = checkSn(mesPackageDetail, packingDefine, mesPackage, defineDetails);
+//        String partNo = checkSn(mesPackageDetail, packingDefine, mesPackage, defineDetails);
-        //物料信息
+//        //物料信息
-        return getPart(mesPackageDetail.getOrganizeCode(), partNo);
+//        return getPart(mesPackageDetail.getOrganizeCode(), partNo);
-    }
+//    }
 
     private MesPart getMesPartNew(MesPackageDetail mesPackageDetail, MesPackage mesPackage, MesPackingDefine packingDefine) {
         //校验是否重复扫描
-        checkSerialNumber(mesPackageDetail);
+        checkSerialNumber(mesPackageDetail, packingDefine);
         //校验条码信息
         String partNo = checkSnNew(mesPackageDetail, packingDefine, mesPackage);
         //物料信息
         return getPart(mesPackageDetail.getOrganizeCode(), partNo);
     }
 
-    private void checkSerialNumber(MesPackageDetail mesPackageDetail) {
+    private void checkSerialNumber(MesPackageDetail mesPackageDetail, MesPackingDefine packingDefine) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPackageDetail.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesPackageDetail.getSerialNumber(), MesPcnExtConstWords.SERIAL_NUMBER, ddlPackBean);
+        if (Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), packingDefine.getIsConfirmCheck())) {
+            DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isSecondPack", ddlPackBean);
+        }
         if (mesPackageDetailRDao.isExitByHql(ddlPackBean)) {
             MesPcnException.throwMesBusiException("零件条码[%s]已装箱,请检查数据!", mesPackageDetail.getSerialNumber());
         }
@@ -420,7 +423,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
         return mesPackageDetails;
     }
 
-    private MesPackageDetail getPackageDetail(MesPackageDetail mesPackageDetail, MesPart mesPart) {
+    private MesPackageDetail getPackageDetail(MesPackageDetail mesPackageDetail, MesPart mesPart, MesPackingDefine packingDefine) {
         MesPackageDetail saveMesPackageDetail = new MesPackageDetail();
         saveMesPackageDetail.setPackageNo(mesPackageDetail.getPackageNo());
         saveMesPackageDetail.setSerialNumber(mesPackageDetail.getSerialNumber());
@@ -428,6 +431,11 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
         saveMesPackageDetail.setPartName(mesPart.getPartName());
         saveMesPackageDetail.setQty(1d);
         saveMesPackageDetail.setOrganizeCode(mesPackageDetail.getOrganizeCode());
+        if (packingDefine != null && Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), packingDefine.getIsConfirmCheck())) {
+            saveMesPackageDetail.setIsSecondPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+        } else {
+            saveMesPackageDetail.setIsSecondPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+        }
         ConvertBean.serviceModelInitialize(saveMesPackageDetail, mesPackageDetail.getCreateUser());
         return saveMesPackageDetail;
     }