From 26da5008d41b9fddcbc2e6879fc9f208c3c629f7 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Fri, 10 Jan 2025 15:33:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=8B=A3=E9=80=89?=
 =?UTF-8?q?=E4=BD=8D=E5=90=AF=E5=81=9C=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml  | 4 ++--
 .../wms/pda_manage/devicemanage/DeviceManageController.java  | 5 ++++-
 wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue      | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml
index 3d07745c..e5a1e3ff 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml
@@ -24,10 +24,10 @@
             md_group_dick
         <where>
             <if test="query.material_code != null and query.material_code != ''">
-                and material_code = #{query.material_code}
+                and material_code LIKE '%${query.material_code}%'
             </if>
             <if test="query.vehicle_code != null and query.vehicle_code != ''">
-                and vehicle_code = #{query.vehicle_code}
+                and vehicle_code LIKE '%${query.vehicle_code}%'
             </if>
             <if test="query.pcsn != null and query.pcsn != ''">
                 and pcsn = #{query.pcsn}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java
index 79f883f4..6bccbe8d 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java
@@ -91,10 +91,13 @@ public class DeviceManageController {
     @Log("切换拣选工位启停模式")
     public ResponseEntity<TableDataInfo> changeModePick(@RequestBody ComTp form) {
         Assert.noNullElements(new Object[]{form.getDevice_code(),form.getMode()},"请求参数不能为空");
+        if (!"1207".equals(form.getDevice_code()) && !"1210".equals(form.getDevice_code())) {
+            throw new BadRequestException("您输入的拣选位不存在，请输入1207或1210拣选位!");
+        }
         wmsToAcsService.changeMode(form.getDevice_code(),"pinkStartStop",form.getMode());
         LambdaUpdateWrapper<SchBasePoint>  updateWrapper =  new LambdaUpdateWrapper<>();
         updateWrapper.set(SchBasePoint::getIs_used,form.getMode());
-        updateWrapper.eq(SchBasePoint::getCode,form.getDevice_code());
+        updateWrapper.eq(SchBasePoint::getCode, "1207".equals(form.getDevice_code())?"1308":"1311");
         iSchBasePointService.update(updateWrapper);
         return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
     }
diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
index 22d37e9f..ab8776ee 100644
--- a/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
+++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
@@ -11,11 +11,11 @@
           label-width="100px"
           label-suffix=":"
         >
-          <el-form-item label="托盘号">
+          <el-form-item label="载具号">
             <el-input
               v-model="query.vehicle_code"
               clearable
-              placeholder="托盘号"
+              placeholder="载具号"
               style="width: 200px;"
               class="filter-item"
             />