Merge branch 'uat-temp-nht-2505160000-46987' into yfai-20250418-dev

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

@@ -618,6 +618,9 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
     }
 
     private void checkOrganizeCode(MesPackageDetail mesPackageDetail, MesPackingDefine packingDefine, String[] split) {
+        if (Objects.equals(packingDefine.getCheckOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue())) {
+            return;
+        }
         if (StringUtils.isEmpty(packingDefine.getOrganizeIndex()) || packingDefine.getOrganizeIndex() > split.length
                 || StringUtils.isEmpty(split[packingDefine.getOrganizeIndex() - 1])) {
             MesPcnException.throwMesBusiException("工厂所在位置不存在,请检查数据!");