From a969d2f7070121496896446e985f10a5672aab46 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 10 Apr 2025 15:30:18 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=BE=85=E6=A3=80=E5=8C=BA=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BstIvtPackageinfoivtController.java       |  1 +
 .../impl/BstIvtPackageinfoivtServiceImpl.java |  4 +++
 .../wms/pdm/ivt/packageinfoivt/index.vue      | 31 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java
index ccbd70f48..3b1c4a8eb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java
@@ -46,6 +46,7 @@ public class BstIvtPackageinfoivtController {
      * @param page      分页参数
      */
     @GetMapping
+    @SaIgnore
     @Log("查询点位库存")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(bstIvtPackageinfoivtService.queryAll(whereJson, page)), 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 d3c6d4b7f..f3c7758fb 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
@@ -102,6 +102,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         String isUsed = MapUtil.getStr(whereJson, "is_used");
         String pointCode = MapUtil.getStr(whereJson, "point_code");
         String packageInfoArea = MapUtil.getStr(whereJson, "packageinfo_area");
+        String container_name = MapUtil.getStr(whereJson, "container_name");
         String ivtStatus = MapUtil.getStr(whereJson, "ivt_status");
         if (StringUtils.isNotEmpty(isUsed)) {
             queryWrapper.eq(BstIvtPackageinfoivt::getIs_used, isUsed);
@@ -109,6 +110,9 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         if (StringUtils.isNotEmpty(pointCode)) {
             queryWrapper.like(BstIvtPackageinfoivt::getPoint_code, pointCode);
         }
+        if (StringUtils.isNotEmpty(container_name)) {
+            queryWrapper.eq(BstIvtPackageinfoivt::getContainer_name, container_name);
+        }
         if (StringUtils.isNotEmpty(packageInfoArea)) {
             queryWrapper.eq(BstIvtPackageinfoivt::getPoint_status, packageInfoArea);
         }
diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue
index 89747db7b..4988e3c48 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue
@@ -21,6 +21,16 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="子卷编码">
+            <el-input
+              v-model="query.container_name"
+              clearable
+              placeholder="输入子卷编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="点位区域">
             <el-select
               v-model="query.packageinfo_area"
@@ -125,6 +135,7 @@
         v-loading="crud.loading"
         :data="crud.data"
         size="mini"
+        :row-style="rowStyle"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
@@ -186,7 +197,7 @@ const defaultForm = {
   qzzno: null,
   vehicle_code: null,
   point_status: null,
-  packageinfo_area: null,
+  packageinfo_area: '3',
   sch_packageinfo_status: null,
   sort_seq: null,
   is_used: null,
@@ -211,6 +222,10 @@ export default {
       idField: 'ivt_id',
       sort: 'ivt_id,desc',
       crudMethod: { ...crudDeliverypointivt },
+      query: {
+        packageinfo_area:'3',
+        size:100
+      },
       optShow: {
         add: false,
         edit: false,
@@ -241,6 +256,20 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    rowStyle({row,index}){
+      let backgroun = {}
+      if (row.container_name!=null && row.update_time!=null && row.update_time!=undefined){
+        let now = new Date()
+        let before = new Date(row.update_time)
+        const diff = now.getTime() - before.getTime();
+        let min = Math.floor(diff/(1000*60))
+        console.log(min)
+        if (min>120){
+          backgroun.background = 'red';
+        }
+      }
+      return backgroun;
+    },
     hand(value) {
       this.crud.toQuery()
     }