From 13cdba9ea19fa227446aa499d2e095d1b2646fff Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 14 Jun 2024 17:29:30 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=BA=93=E5=AD=98=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=A4=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/basedata/st/service/impl/StructivtServiceImpl.java  | 1 +
 .../java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql    | 6 ++++--
 lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue      | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
index 8f2d69d67..7b0d48823 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
@@ -312,6 +312,7 @@ public class StructivtServiceImpl implements StructivtService {
             mp.put("净重", json.getString("net_weight"));
             mp.put("毛重", json.getString("box_weight"));
             mp.put("长度", json.getString("length"));
+            mp.put("接头数", json.getString("joint_type"));
             mp.put("计划外分切的子卷", json.getString("is_un_plan_production"));
             mp.put("子卷的物性值1", json.getString("un_plan_product_property1"));
             mp.put("子卷的物性值2", json.getString("un_plan_product_property2"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
index 12adc2f6a..c0b1e2cf6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
@@ -90,7 +90,8 @@
                             WHEN DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '3'
                         END
                 END AS sub_type,
-                DATEDIFF( NOW(), sub.date_of_production ) AS stock_age
+                DATEDIFF( NOW(), sub.date_of_production ) AS stock_age,
+                sub.joint_type
 
                 FROM
                     ST_IVT_StructIvt ivt
@@ -243,7 +244,8 @@
                     WHEN DATEDIFF( NOW(), sub.date_of_production ) <= '90' THEN '1'
                     WHEN DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '3'
                 END AS sub_type,
-                DATEDIFF( NOW(), ivt.instorage_time ) AS stock_age
+                DATEDIFF( NOW(), ivt.instorage_time ) AS stock_age,
+                sub.joint_type
             FROM
                 ST_IVT_StructIvt ivt
                 LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
index 329ee1879..ea1de6182 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
@@ -240,6 +240,7 @@
         <el-table-column prop="warehousing_qty" label="待入数" :formatter="rounding"/>
         <el-table-column prop="unit_name" label="计量单位"/>
         <el-table-column prop="instorage_time" label="入库时间" min-width="150"/>
+        <el-table-column prop="joint_type" label="接头数" min-width="150"/>
         <el-table-column prop="sub_type" label="子卷状态" min-width="150" :formatter="formatSubType"/>
         <el-table-column prop="stock_age" label="生产时长（天）" min-width="120" />
         <el-table-column prop="paper_type" label="管件类型" min-width="150"/>