From 72149382ee918a20ab73825ac203e7cc3d500a1c Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Sun, 23 Mar 2025 18:13:36 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=89=98=E7=9B=98=E5=BA=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BstIvtStockingivtController.java          |  6 +++
 .../service/IBstIvtStockingivtService.java    |  4 ++
 .../impl/BstIvtStockingivtServiceImpl.java    | 16 +++++--
 .../bst/ivt/stockingivt/bstIvtStockingivt.js  | 10 ++++-
 .../views/b_lms/bst/ivt/stockingivt/index.vue | 42 +++++++++----------
 5 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java
index 7a4405cc5..db396471e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java
@@ -74,5 +74,11 @@ public class BstIvtStockingivtController {
         return new ResponseEntity<>(bstIvtStockingivtService.showDetail(param), HttpStatus.OK);
     }
 
+    @Log("管芯托盘库存")
+    @GetMapping("/showDetail2")
+    public ResponseEntity<Object> showDetail2(@RequestParam Map param) {
+        return new ResponseEntity<>(bstIvtStockingivtService.showDetail2(param), HttpStatus.OK);
+    }
+
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java
index 572634226..9728cba50 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java
@@ -1,7 +1,9 @@
 package org.nl.b_lms.bst.ivt.stockingivt.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
 import org.nl.b_lms.bst.ivt.stockingivt.service.dto.ShowStockVo;
 import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto;
 import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto;
@@ -100,4 +102,6 @@ public interface IBstIvtStockingivtService extends IService<BstIvtStockingivt> {
     List<BhTubeMovePointDto> getCanMovePointList(String location, String pointType);
 
     List<List<ShowStockVo>> showDetail(JSONObject param);
+
+    List<MdPbPapervehicle> showDetail2(Map param);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
index ef6268a91..c713a71ec 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
@@ -3,6 +3,7 @@ package org.nl.b_lms.bst.ivt.stockingivt.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,6 +23,7 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService;
 import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper;
 import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
+import org.nl.modules.wql.WQL;
 import org.nl.wms.basedata.master.service.MaterialbaseService;
 import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
@@ -29,10 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author lyd
@@ -321,4 +320,13 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
         }
         return res;
     }
+
+    @Override
+    public List<MdPbPapervehicle> showDetail2(Map whereJson) {
+        // 获取数据
+        List<MdPbPapervehicle> papers = papervehicleService.list(new LambdaQueryWrapper<MdPbPapervehicle>()
+                .eq(MdPbPapervehicle::getVehicle_code, whereJson.get("vehicle_code"))
+                .orderByAsc(MdPbPapervehicle::getRow_num));
+        return papers;
+    }
 }
diff --git a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js
index cab0e3453..96ecd52c8 100644
--- a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js
+++ b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js
@@ -32,4 +32,12 @@ export function showDetail(data) {
   })
 }
 
-export default { add, edit, del, showDetail }
+export function showDetail2(params) {
+  return request({
+    url: 'api/bstIvtStockingivt/showDetail2',
+    method: 'get',
+    params
+  })
+}
+
+export default { add, edit, del, showDetail, showDetail2 }
diff --git a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
index 2c61428ee..0555d498d 100644
--- a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
+++ b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
@@ -93,14 +93,17 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')">
-          <template slot-scope="scope">
+        <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')"/>
+<!--          <template slot-scope="scope">
             <el-link type="primary" @click="toView(scope.$index, scope.row)">{{ scope.row.point_code }}</el-link>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
-        <el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')" />
-        <!--        <el-table-column prop="product_area" label="区域" :min-width="flexWidth('product_area',crud.data,'区域')" />-->
+        <el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')">
+          <template slot-scope="scope">
+            <el-link type="primary" @click="toView2(scope.$index, scope.row)">{{ scope.row.vehicle_code }}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')">
           <template slot-scope="scope">
             {{ dict.label.STOCK_POINT_TYPE[scope.row.point_type] }}
@@ -139,18 +142,17 @@
       <!--分页组件-->
       <pagination />
     </div>
-    <tube-dialog :dialog-show.sync="showView" :rows="rows" :vehicle_code="vehicle_code" />
+    <tube-dialog2 :dialog-show.sync="showView2" :rowmst="mstrow" @AddChanged="querytable" />
   </div>
 </template>
 
 <script>
 import crudBstIvtStockingivt from './bstIvtStockingivt'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import TubeDialog from '@/views/b_lms/bst/ivt/stockingivt/tubeDialog.vue'
+import TubeDialog2 from '@/views/b_lms/bst/ivt/stockingivt/tubeDialog2.vue'
 
 const defaultForm = {
   ivt_id: null,
@@ -175,7 +177,7 @@ const defaultForm = {
 export default {
   name: 'BstIvtStockingivt',
   dicts: ['STOCK_POINT_STATUS', 'STOCK_POINT_TYPE', 'point_location'],
-  components: { TubeDialog, pagination, crudOperation, rrOperation, udOperation },
+  components: { TubeDialog2, pagination, crudOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -222,7 +224,9 @@ export default {
       },
       showView: false,
       vehicle_code: '',
-      rows: {}
+      showView2: false,
+      rows: [],
+      mstrow: {}
     }
   },
   methods: {
@@ -230,17 +234,13 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    toView(index, row) {
-      // vehicle_code， point_code
-      console.log(row)
-      const param = {
-        vehicle_code: this.vehicle_code
-      }
-      crudBstIvtStockingivt.showDetail(param).then(res => {
-        this.vehicle_code = row.vehicle_code
-        this.showView = true
-        this.rows = res
-      })
+    querytable() {
+      this.$refs.table.clearSelection()
+      this.crud.toQuery()
+    },
+    toView2(index, row) {
+      this.showView2 = true
+      this.mstrow = row
     }
   }
 }