From 917bf37baa86d6934fc137739f7ee2281a7082a6 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Thu, 12 Jun 2025 11:19:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B0=86=E7=AE=A1=E5=88=B6=E7=82=B9?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=9F=A5=E8=AF=A2=E7=82=B9=E4=BD=8D=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/controller/VehicleTwoController.java  | 24 +++++++++++++++++++
 .../impl/BstIvtPackageinfoivtServiceImpl.java | 13 ++++------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
index 0dabf07cc..d0538eeac 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
@@ -2,10 +2,14 @@ package org.nl.b_lms.pda.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.pda.service.VehicleTwoService;
 import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
+import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
+import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
 import org.nl.modules.logging.annotation.Log;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +21,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author liuxy
@@ -35,6 +41,8 @@ public class VehicleTwoController {
     private IbstIvtPackageinfoivtService bstIvtPackageInfoIvtService;
     @Autowired
     private IpdmBiSubpackagerelationService subpackagerelationService;
+    @Autowired
+    private BstIvtPackageinfoivtMapper bstIvtPackageinfoivtMapper;
 
 
     @PostMapping("/vehicleIn")
@@ -80,4 +88,20 @@ public class VehicleTwoController {
         Map result = subpackagerelationService.toEndSubpackagerelation(whereJson.getString("container_name"));
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
+
+    @PostMapping("/getControlList")
+    @Log("获取管制下拉框")
+    @SaIgnore
+    public ResponseEntity<Object> getControlList(@RequestBody JSONObject whereJson) {
+        List<BstIvtPackageinfoivt> bstIvtPackageinfoivts = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_status, "4"));
+        JSONArray jsonArray = bstIvtPackageinfoivts.stream()
+                .map(item -> {
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("text", item.getPoint_code());
+                    jsonObject.put("value", item.getPoint_code());
+                    return jsonObject;
+                })
+                .collect(Collectors.toCollection(JSONArray::new));
+        return new ResponseEntity<>(jsonArray, HttpStatus.OK);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
index 758220be1..1fc23da89 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
@@ -1028,8 +1028,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 return result;
             }
             BstIvtPackageinfoivt packageinfoivt = dtoList.get(0);
-            String pointCode = packageinfoivt.getPoint_code();
-            if (pointCode.equals("ZXQ_135") || pointCode.equals("ZXQ_136")) {
+            if (packageinfoivt.getPoint_status().equals("4")) {
                 throw new BadRequestException("管制点设置子卷状态时需要选择点位");
             }
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) {
@@ -1074,7 +1073,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         }
         //复称
         else if (StringUtils.isNotBlank(whereJson.getString("container_name")) && StringUtils.isNotBlank(whereJson.getString("pointCode"))) {
-            dtoList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode").equals("1") ? "ZXQ_135" : "ZXQ_136"));
+            dtoList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("point_code")));
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) {
                 //获取子卷最新信息
                 jo.put("container_name", whereJson.getString("container_name"));
@@ -1098,13 +1097,11 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             if (StringUtils.isEmpty(pointCode)){
                 throw new BadRequestException("人工管制点不能为空");
             }
-            HashMap of = MapOf.of("1", "ZXQ_135", "2", "ZXQ_136");
-            // "ZXQ_135" : "ZXQ_136";
             JSONObject task = new JSONObject();
-            task.put("point_code1", of.get(pointCode));
+            task.put("point_code1", pointCode);
             int count = taskService.count(new QueryWrapper<SchBaseTask>()
                     .eq("is_delete", "0")
-                    .eq("point_code1", of.get(pointCode))
+                    .eq("point_code1", pointCode)
                     .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
             if (count>0){
                 throw new BadRequestException("当前人工管制点存在任务,稍后操作");
@@ -1112,7 +1109,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("管制品"))){
                 autoSendVehicleToDjq.getPointCode(task,PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
             }
-            dtoList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode").equals("1") ? "ZXQ_135" : "ZXQ_136"));
+            dtoList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode")));
             updateWrapper.set("container_name", null);
             updateWrapper.set("ivt_status", whereJson.getString("ivt_status"));
         } else {