Merge branch 'uat-temp-castle-20241224-44242-new' into dev

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

@@ -134,6 +134,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                 mesPackage = mesPackageRDao.insert(getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode));
                 mesPackage.setIsPackage(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             }
+            mesPackage.setIsPackage(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             return ResultBean.success("箱条码扫描成功,请扫零件条码!").setResultObject(mesPackage);
         } else {
             /**