From 520d5ff28327345703677385ae984dd345041151 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Sat, 7 Dec 2024 09:46:29 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=BA=93=E5=AD=98=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/xml/StIvtStructattrMapper.xml  |  7 +++
 .../struct/service/dto/StructattrQuery.java   |  2 +-
 .../wms/stor_manage/storIvtInfo/index.vue     | 54 +++++++++++++------
 3 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
index 33993124..729400b5 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
@@ -133,6 +133,13 @@
                 and (struct.struct_code LIKE '%${query.search}%'
                 or struct.struct_name LIKE '%${query.search}%')
             </if>
+            <if test="query.material != null and query.material != ''">
+                and (material.material_code LIKE '%${query.material}%'
+                or material.material_name LIKE '%${query.material}%')
+            </if>
+            <if test="query.pcsn != null and query.pcsn != ''">
+                and vm.pcsn = #{query.pcsn}
+            </if>
             <if test="query.vehicle_code != null and query.vehicle_code != ''">
                 and struct.vehicle_code LIKE '%${query.vehicle_code}%'
             </if>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java
index 2df472f4..ca41e7ab 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java
@@ -22,7 +22,7 @@ public class StructattrQuery extends BaseQuery<StIvtStructattr> {
     private Boolean has_vehicle = Boolean.FALSE;
     private String material;
     private Boolean has;
-    private Boolean assign;
+    private String pcsn;
     @Override
     public void paramMapping() {
         super.doP.put("search", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build());
diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue
index c800784b..34c23ccd 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue
@@ -35,6 +35,26 @@
             class="filter-item"
           />
         </el-form-item>
+        <el-form-item label="物料信息">
+          <el-input
+            v-model="query.material"
+            clearable
+            size="mini"
+            placeholder="请输入物料信息"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
+        <el-form-item label="批号">
+          <el-input
+            v-model="query.pcsn"
+            clearable
+            size="mini"
+            placeholder="请输入批号"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
         <el-form-item label="载具编码">
           <el-input
             v-model="query.vehicle_code"
@@ -45,10 +65,10 @@
             class="filter-item"
           />
         </el-form-item>
-        <rrOperation/>
+        <rrOperation />
       </el-form>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission" />
       <!--表单组件-->
       <!--      <el-dialog-->
       <!--        :close-on-click-modal="false"-->
@@ -110,22 +130,22 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="struct_code" label="仓位编码" width="150" show-tooltip-when-overflow/>
-        <el-table-column prop="material_code" label="物料编码" width="150" show-tooltip-when-overflow/>
-        <el-table-column prop="material_name" label="物料名称" width="150" show-tooltip-when-overflow/>
-        <el-table-column prop="vehicle_code" label="载具编码" width="150" show-tooltip-when-overflow/>
-        <el-table-column prop="parent_vehicle_code" label="父载具编码" width="150" show-tooltip-when-overflow/>
-        <el-table-column prop="pcsn" label="批次" min-width="150" show-tooltip-when-overflow/>
-        <el-table-column prop="qty" label="总库存" min-width="150" show-tooltip-when-overflow/>
-        <el-table-column prop="frozen_qty" label="冻结库存" show-tooltip-when-overflow/>
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="struct_code" label="仓位编码" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="material_code" label="物料编码" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="material_name" label="物料名称" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="vehicle_code" label="载具编码" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="parent_vehicle_code" label="父载具编码" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="pcsn" label="批次" min-width="150" show-tooltip-when-overflow />
+        <el-table-column prop="qty" label="总库存" min-width="150" show-tooltip-when-overflow />
+        <el-table-column prop="frozen_qty" label="冻结库存" show-tooltip-when-overflow />
         <el-table-column prop="unit_id" label="单位" show-tooltip-when-overflow>
           <template slot-scope="scope">{{ tableEnum.label.bm_measure_unit[scope.row.unit_id] }}</template>
         </el-table-column>
         <el-table-column prop="lock_type" label="库存锁定" show-tooltip-when-overflow>
           <template slot-scope="scope">{{ statusEnum.label.LOCK[scope.row.lock_type] }}</template>
         </el-table-column>
-        <el-table-column prop="update_time" label="修改时间" width="120" show-tooltip-when-overflow/>
+        <el-table-column prop="update_time" label="修改时间" width="120" show-tooltip-when-overflow />
         <!--        <el-table-column-->
         <!--          label="操作"-->
         <!--          fixed="right"-->
@@ -139,13 +159,13 @@
         <!--        </el-table-column>-->
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
   </div>
 </template>
 
 <script>
-import CRUD, {presenter, header, form, crud} from '@crud/crud'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -170,9 +190,9 @@ const defaultForm = {
 export default {
   dicts: [],
   name: 'StructIvtInfo',
-  components: {pagination, crudOperation, rrOperation, udOperation},
-  tableEnums: [ 'bm_measure_unit#unit_name#unit_id', 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
-  statusEnums: [ 'LOCK' ],
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  tableEnums: ['bm_measure_unit#unit_name#unit_id', 'st_ivt_bsrealstorattr#stor_name#stor_code'],
+  statusEnums: ['LOCK'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({