uat-temp-xw-2412241000-44315; uat-temp-castle-20241224-44242-new

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

@@ -132,6 +132,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                     qty = getQty(packingDefine, split);
                 }
                 mesPackage = mesPackageRDao.insert(getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode));
+                mesPackage.setIsPackage(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             }
             return ResultBean.success("箱条码扫描成功,请扫零件条码!").setResultObject(mesPackage);
         } else {
@@ -158,7 +159,8 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                 }else {
                     //扫描的是箱条码
                     mesPackageDetail.setIsScanPackage(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
-                    this.doScan(mesPackageDetail);
+                    mesPackageDetail.setPackageNo(mesPackageDetail.getSerialNumber());
+                    return this.doScan(mesPackageDetail);
                 }
             }
             //校验条码规则

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

@@ -474,11 +474,13 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                 if (model.getOptType() != 2) {
                     //移库
                     //移库
-                    String destLocateNo = getDestLocateNo(model, org);
                     String dest = configService.getCfgValue(org, "UMLGO");
+                    if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()){
+                        String destLocateNo = getDestLocateNo(model, org);
                         if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
                             return;
                         }
+                    }
                     MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
                     moveRepository.save(move);
                 }
@@ -566,11 +568,13 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                         srcLocateNo = version.getReceiveInventoryPoint();
                     }
                     //移库
-                    String destLocateNo = getDestLocateNo(model, org);
                     String dest = configService.getCfgValue(org, "UMLGO");
+                    if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()){
+                        String destLocateNo = getDestLocateNo(model, org);
                         if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
                             return;
                         }
+                    }
                     MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
                     moveRepository.save(move);
                 }