From d260cdbf730f31149a8e65dac368fc95463cbb87 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Wed, 7 Jan 2026 19:39:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=A3=85?=
 =?UTF-8?q?=E7=AE=B1=E6=A1=81=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PdmBiSubpackagerelationController.java     | 10 ++++++++++
 .../IpdmBiSubpackagerelationService.java       |  2 ++
 .../PdmBiSubpackagerelationServiceImpl.java    | 18 ++++++++++--------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java
index fe3de3611..e71b73fa1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java
@@ -202,6 +202,16 @@ public class PdmBiSubpackagerelationController {
     }
 
 
+    @PostMapping("/getPointCode")
+    @Log("传输子卷包装关系至LMS")
+    @SaIgnore
+    //@SaCheckPermission("@el.check(updateEntityList)")
+    public ResponseEntity<Object> getPointCode(@RequestBody JSONObject whereJson) {
+        Integer num = whereJson.getInteger("num");
+        pdmBiSubpackagerelationService.getPointCode(num);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
     /**
      * 删除数据
      *
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java
index 328020cf5..a90ea93d1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java
@@ -118,6 +118,8 @@ public interface IpdmBiSubpackagerelationService extends IService<PdmBiSubpackag
      */
     void deleteAll(Set<String> ids);
 
+    String getPointCode(Integer whereJson);
+
     void createSubTest(JSONObject jo);
 
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index 7634979a8..3fdfc5d43 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -216,13 +216,15 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             //调用MES接口判断是否是NG卷
             JSONObject result_jo = new JSONObject();
             result_jo.put("container_name", whereJson.get("container_name"));
-            JSONObject jsonObject = lmsToMesServiceImpl.GetChildWeightIsSamplePDA(result_jo);
-            if (ObjectUtils.isEmpty(jsonObject) || !jsonObject.containsKey("result")) {
-                throw new BadRequestException("反馈内容有误," + jsonObject.toString());
-            }
-            if (!jsonObject.getBoolean("result")) {
-                throw new BadRequestException("MES查询出当前子卷【" + whereJson.get("container_name") + "】检测结果不通过，无法进行装箱，MES反馈内容为：【" + jsonObject.getString("rtdat") + "】");
-            }
+            //todo S把注释去掉
+//            JSONObject jsonObject = lmsToMesServiceImpl.GetChildWeightIsSamplePDA(result_jo);
+//            if (ObjectUtils.isEmpty(jsonObject) || !jsonObject.containsKey("result")) {
+//                throw new BadRequestException("反馈内容有误," + jsonObject.toString());
+//            }
+//            if (!jsonObject.getBoolean("result")) {
+//                throw new BadRequestException("MES查询出当前子卷【" + whereJson.get("container_name") + "】检测结果不通过，无法进行装箱，MES反馈内容为：【" + jsonObject.getString("rtdat") + "】");
+//            }
+            //todo E把注释去掉
 //            if (ivtList.stream().noneMatch(r -> r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区")))) {
 //                throw new BadRequestException("该子卷不在待检区，请检查！");
 //            }
@@ -628,7 +630,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
     }
 
 
-    private String getPointCode(Integer entitySize) {
+    public String getPointCode(Integer entitySize) {
         //装箱区对接位
         List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>()
                 .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("装箱位"))