diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTATTR.wql index 065bafe58..e75839db6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTATTR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTATTR.wql @@ -60,3 +60,26 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "2" + QUERY + SELECT + attr.*, + sub.package_box_sn, + sub.quanlity_in_box, + sub.box_weight, + sub.sale_order_name, + sub.container_name, + sub.product_description, + sub.net_weight + FROM + sch_base_point attr + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = attr.vehicle_code + WHERE + 1 = 1 + OPTION 输入.struct_id <> "" + attr.point_id = 输入.struct_id + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql index 213e9dc4f..5e9ba851a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql @@ -281,3 +281,24 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "9" + QUERY + SELECT + attr.layer_num + FROM + ST_IVT_IOStorInvDis dis + LEFT JOIN st_ivt_structattr attr ON dis.struct_id = attr.struct_id + WHERE + dis.work_status = '00' + + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + + group by attr.layer_num + + + ENDSELECT + ENDQUERY + ENDIF