宁德二次装箱

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() ) {
+            if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == mesPackage.getIsSealed() && !Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), packingDefine.getIsConfirmCheck())) {
                 List<MesProduceSn> produceSnList = mesProduceSnExtService.getProduceSnList(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getSerialNumber());
                 //1.查询包装明细是否包含此零件
                 List<MesPackingDefineDetails> defineDetails = getMesPackingDefineDetailsNew(mesPackageDetail.getOrganizeCode(), mesPackage.getPackageSn(), mesPackage.getPartNo());
@@ -171,7 +171,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                 //保存包装明细
                 mesPackageDetailRDao.insert(saveMesPackageDetail);
                 //更新包装表
-                updateMesPackage(mesPackage, mesPackageDetail.getModifyUser(), 1d, false);
+                updateMesPackage(mesPackage, mesPackageDetail.getModifyUser(), 1d, false, packingDefine);
             }
             //缓存是否记忆开关
             saveRedis(getKey(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getModifyUser()),mesPackageDetail.getIsMemory());
@@ -200,7 +200,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
             mesPackageDetailRDao.saveAll(saveMesPackageDetailList);
             int qty = saveMesPackageDetailList.size();
             //更新包装表
-            updateMesPackage(mesPackage, userName, qty, false);
+            updateMesPackage(mesPackage, userName, qty, false, null);
         }
         if(mesPackage.getIsSealed() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
             return ResultBean.success("当前箱条码已完成装箱,请扫描下一个箱条码!").setResultObject(mesPackage);
@@ -227,7 +227,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                 MesPcnException.throwMesBusiException("箱条码[%s]下不存在零件条码,不允许关箱,请检查数据!", mesPackage.getPackageNo());
             }
             //关箱
-            updateMesPackage(mesPackageDb, mesPackage.getModifyUser(), 0d, true);
+            updateMesPackage(mesPackageDb, mesPackage.getModifyUser(), 0d, true, null);
             return ResultBean.success("关箱成功!");
         } else {
             if (CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == mesPackageDb.getIsSealed()) {
@@ -387,13 +387,15 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
     }
 
 
-    private void updateMesPackage(MesPackage mesPackage, String userName, double qty, boolean close) {
+    private void updateMesPackage(MesPackage mesPackage, String userName, double qty, boolean close, MesPackingDefine packingDefine) {
         mesPackage.setQty(MathOperation.add(mesPackage.getQty(), qty));
         if (mesPackage.getPackSpecQty() <= mesPackage.getQty() || close) {
             mesPackage.setIsSealed(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             mesPackage.setLotNo(TimeTool.getToday());
             //数据写入接口表回传wms
-            saveMesPackageResult(mesPackage, userName);
+            if (packingDefine == null || !Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), packingDefine.getIsConfirmCheck())) {
+                saveMesPackageResult(mesPackage, userName);
+            }
         }
         ConvertBean.serviceModelUpdate(mesPackage, userName);
         mesPackageRDao.update(mesPackage);