rev：库存报表入库时间更新

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java

@@ -296,7 +296,7 @@ public class StructivtServiceImpl implements StructivtService {
             mp.put("客户名称", json.getString("customer_description"));
             mp.put("销售订单", json.getString("sale_order_name"));
             mp.put("业务员", json.getString("sales_owner"));
-            mp.put("入库日期", json.getString("instorage_time"));
+            mp.put("入库日期", json.getString("confirm_time"));
             mp.put("生产日期", json.getString("date_of_production"));
             if ("1".equals(json.getString("sub_type"))) {
                 mp.put("子卷状态", "正常");

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql

@@ -91,7 +91,8 @@
                         END
                 END AS sub_type,
                 DATEDIFF( NOW(), sub.date_of_production ) AS stock_age,
-                sub.joint_type
+                sub.joint_type,
+                dis.confirm_time
 
                 FROM
                     ST_IVT_StructIvt ivt
@@ -115,6 +116,20 @@
                     	WHERE
                     	plan1.is_delete = '0'
                     	GROUP BY container_name) plan ON plan.container_name = sub.container_name
+                    LEFT JOIN (
+                        SELECT
+                            MIN( mst.confirm_time ) AS confirm_time,
+                            dis.pcsn
+                        FROM
+                            st_ivt_iostorinvdis dis
+                            LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
+                        WHERE
+                            mst.io_type = '0'
+                            AND mst.bill_type = '0001'
+                            AND mst.is_delete = '0'
+                        GROUP BY
+                            dis.pcsn
+                        ) dis ON dis.pcsn = ivt.pcsn
 
             WHERE
                  1 = 1
@@ -245,7 +260,8 @@
                     WHEN DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '3'
                 END AS sub_type,
                 DATEDIFF( NOW(), ivt.instorage_time ) AS stock_age,
-                sub.joint_type
+                sub.joint_type,
+                dis.confirm_time
             FROM
                 ST_IVT_StructIvt ivt
                 LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id
@@ -269,6 +285,20 @@
                 	WHERE
                 	plan1.is_delete = '0'
                 	GROUP BY container_name) plan ON plan.container_name = sub.container_name
+                LEFT JOIN (
+                    SELECT
+                        MIN( mst.confirm_time ) AS confirm_time,
+                        dis.pcsn
+                    FROM
+                        st_ivt_iostorinvdis dis
+                        LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
+                    WHERE
+                        mst.io_type = '0'
+                        AND mst.bill_type = '0001'
+                        AND mst.is_delete = '0'
+                    GROUP BY
+                        dis.pcsn
+                    ) dis ON dis.pcsn = ivt.pcsn
             WHERE
                  1 = 1
                  and attr.stor_id in 输入.in_stor_id

lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue

@@ -239,7 +239,7 @@
         <el-table-column prop="ivt_qty" label="库存数" :formatter="rounding"/>
         <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="confirm_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" />