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 7b0d48823..4957fe537 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 @@ -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("子卷状态", "正常"); 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 c0b1e2cf6..170793a81 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 @@ -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 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 ea1de6182..2cb0dcbe7 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 @@ -239,7 +239,7 @@ - +