diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTDIV.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTDIV.wql index d398c3c2f..b179b4d5a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTDIV.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTDIV.wql @@ -60,9 +60,9 @@ attr.sect_name, sub.sale_order_name, CASE - WHEN SUBSTRING(sub.container_name,1,1) = 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '180' + WHEN SUBSTRING(sub.container_name,1,2) = 'BB' AND DATEDIFF( NOW(), sub.date_of_production ) > '180' THEN '1' - WHEN SUBSTRING(sub.container_name,1,1) != 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '90' + WHEN SUBSTRING(sub.container_name,1,2) != 'BB' AND DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '1' ELSE '0' END AS is_overdue 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 4957fe537..66acb3318 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 @@ -306,6 +306,7 @@ public class StructivtServiceImpl implements StructivtService { mp.put("子卷状态", "超期"); } mp.put("库龄", json.getString("stock_age")); + mp.put("生产时长", json.getString("produce_age")); mp.put("产品规格(幅宽)", String.format("%.0f", json.getDoubleValue("width"))); mp.put("产品厚度", json.getString("thickness")); mp.put("单位面积重量", json.getString("mass_per_unit_area")); 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 a0a098a7a..ee26abf8e 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 @@ -76,14 +76,14 @@ case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then plan.FRP_description end AS paper_name, sub.box_weight, CASE - WHEN SUBSTRING( sub.container_name, 1, 1 ) = 'B' THEN + WHEN SUBSTRING( sub.container_name, 1, 2 ) = 'BB' THEN CASE WHEN DATEDIFF( NOW(), sub.date_of_production ) > '150' AND DATEDIFF( NOW(), sub.date_of_production ) <= '180' THEN '2' WHEN DATEDIFF( NOW(), sub.date_of_production ) <= '180' THEN '1' WHEN DATEDIFF( NOW(), sub.date_of_production ) > '180' THEN '3' END - WHEN SUBSTRING( sub.container_name, 1, 1 ) <> 'B' THEN + WHEN SUBSTRING( sub.container_name, 1, 2 ) <> 'BB' THEN CASE WHEN DATEDIFF( NOW(), sub.date_of_production ) > '60' AND DATEDIFF( NOW(), sub.date_of_production ) <= '90' THEN '2' WHEN DATEDIFF( NOW(), sub.date_of_production ) <= '90' THEN '1' @@ -91,6 +91,7 @@ END END AS sub_type, DATEDIFF( NOW(), dis.confirm_time ) AS stock_age, + DATEDIFF( NOW(), sub.date_of_production ) AS produce_age, sub.joint_type, dis.confirm_time @@ -250,14 +251,14 @@ sub.box_weight, cust.sales_owner, CASE - WHEN SUBSTRING( sub.container_name, 1, 1 ) = 'B' THEN + WHEN SUBSTRING( sub.container_name, 1, 2 ) = 'BB' THEN CASE WHEN DATEDIFF( NOW(), sub.date_of_production ) > '150' AND DATEDIFF( NOW(), sub.date_of_production ) <= '180' THEN '2' WHEN DATEDIFF( NOW(), sub.date_of_production ) <= '180' THEN '1' WHEN DATEDIFF( NOW(), sub.date_of_production ) > '180' THEN '3' END - WHEN SUBSTRING( sub.container_name, 1, 1 ) <> 'B' THEN + WHEN SUBSTRING( sub.container_name, 1, 2 ) <> 'BB' THEN CASE WHEN DATEDIFF( NOW(), sub.date_of_production ) > '60' AND DATEDIFF( NOW(), sub.date_of_production ) <= '90' THEN '2' WHEN DATEDIFF( NOW(), sub.date_of_production ) <= '90' THEN '1' @@ -265,6 +266,7 @@ END END AS sub_type, DATEDIFF( NOW(), dis.confirm_time ) AS stock_age, + DATEDIFF( NOW(), sub.date_of_production ) AS produce_age, sub.joint_type, dis.confirm_time FROM diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql index ed680aa78..e3c1ac618 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql @@ -62,9 +62,9 @@ attr.struct_name, attr.struct_code, CASE - WHEN SUBSTRING(sub.container_name,1,1) = 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '180' + WHEN SUBSTRING(sub.container_name,1,2) = 'BB' AND DATEDIFF( NOW(), sub.date_of_production ) > '180' THEN '1' - WHEN SUBSTRING(sub.container_name,1,1) != 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '90' + WHEN SUBSTRING(sub.container_name,1,2) != 'BB' AND DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '1' ELSE '0' END AS is_overdue @@ -168,9 +168,9 @@ attr.struct_name, attr.struct_code, CASE - WHEN SUBSTRING(sub.container_name,1,1) = 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '180' + WHEN SUBSTRING(sub.container_name,1,2) = 'BB' AND DATEDIFF( NOW(), sub.date_of_production ) > '180' THEN '1' - WHEN SUBSTRING(sub.container_name,1,1) != 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '90' + WHEN SUBSTRING(sub.container_name,1,2) != 'BB' AND DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '1' ELSE '0' END AS is_overdue 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 be4b14f04..3d4dcaaa7 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 @@ -260,7 +260,7 @@ - + diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue index 8d8fbf59d..e7b1a5a13 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue @@ -281,12 +281,18 @@ - + + + + + + +