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 3380583c4..cfd57d5a3 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 @@ -183,7 +183,7 @@ public class StructivtServiceImpl implements StructivtService { String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name"); JSONObject map = new JSONObject(); - map.put("flag", "1"); + map.put("flag", "2"); map.put("stor_id", stor_id); if (StrUtil.isNotEmpty(material)) { map.put("material", "%" + material + "%"); @@ -217,21 +217,36 @@ public class StructivtServiceImpl implements StructivtService { JSONObject json = resultJSONArray.getJSONObject(i); Map mp = new LinkedHashMap<>(); - mp.put("仓位编码", json.getString("struct_code")); - mp.put("仓位名称", json.getString("struct_name")); mp.put("仓库", json.getString("stor_name")); mp.put("库区", json.getString("sect_name")); + mp.put("仓位编码", json.getString("struct_code")); + mp.put("仓位名称", json.getString("struct_name")); + mp.put("木箱码", json.getString("package_box_sn")); mp.put("物料编码", json.getString("material_code")); mp.put("物料名称", json.getString("material_name")); - mp.put("木箱码", json.getString("package_box_sn")); mp.put("子卷号", json.getString("pcsn")); mp.put("sap批次", json.getString("sap_pcsn")); - mp.put("可用数", json.getString("canuse_qty")); - mp.put("冻结数", json.getString("frozen_qty")); - mp.put("库存数", json.getString("ivt_qty")); - mp.put("待入数", json.getString("warehousing_qty")); - mp.put("计量单位", json.getString("unit_name")); - mp.put("入库时间", json.getString("instorage_time")); + mp.put("重量", json.getString("canuse_qty")); + mp.put("单位", json.getString("unit_name")); + mp.put("客户编码", json.getString("customer_name")); + mp.put("客户名称", json.getString("customer_description")); + mp.put("销售订单", json.getString("sale_order_name")); + mp.put("入库日期", json.getString("instorage_time")); + mp.put("生产日期", json.getString("date_of_production")); + mp.put("产品规格（幅宽）", json.getString("width")); + mp.put("产品厚度", json.getString("thickness")); + mp.put("单位面积重量", json.getString("mass_per_unit_area")); + mp.put("净重", json.getString("net_weight")); + mp.put("长度", json.getString("length")); + 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")); + mp.put("子卷的物性值3", json.getString("un_plan_product_property3")); + mp.put("备注", json.getString("remark")); + mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel")); + mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox")); + mp.put("客户要求规格幅宽", json.getString("width_standard")); + mp.put("物料标准厚度", json.getString("thickness_request")); list.add(mp); } FileUtil.downloadExcel(list, response); 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 fde0ca6e3..2d601ad29 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 @@ -107,5 +107,84 @@ ENDPAGEQUERY ENDIF + IF 输入.flag = "2" + QUERY + SELECT + ivt.*, + attr.sect_id, + attr.sect_code, + attr.sect_name, + attr.stor_name, + mater.material_code, + mater.material_name, + unit.unit_name, + region.region_name, + sub.sap_pcsn, + sub.package_box_sn, + sub.sale_order_name, + sub.customer_name, + sub.customer_description, + sub.date_of_production, + sub.width, + sub.thickness, + sub.mass_per_unit_area, + sub.net_weight, + sub.length, + sub.is_un_plan_production, + sub.un_plan_product_property1, + sub.un_plan_product_property2, + sub.un_plan_product_property3, + sub.remark, + sub.isUnPackBox, + sub.isRePrintPackageBoxLabel, + sub.width_standard, + sub.thickness_request + FROM + ST_IVT_StructIvt ivt + LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id + LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id + LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id + LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn AND attr.storagevehicle_code = sub.package_box_sn + WHERE + 1 = 1 + and attr.stor_id in 输入.in_stor_id + + OPTION 输入.struct <> "" + ( + ivt.struct_code like 输入.struct or + ivt.struct_name like 输入.struct + ) + ENDOPTION + OPTION 输入.material <> "" + ( + mater.material_code like 输入.material or + mater.material_name like 输入.material + ) + ENDOPTION + OPTION 输入.pcsn <> "" + ivt.pcsn like 输入.pcsn + ENDOPTION + + OPTION 输入.sap_pcsn <> "" + sub.sap_pcsn like 输入.sap_pcsn + ENDOPTION + + OPTION 输入.stor_id <> "" + attr.stor_id = 输入.stor_id + ENDOPTION + + OPTION 输入.package_box_sn <> "" + sub.package_box_sn like 输入.package_box_sn + ENDOPTION + + OPTION 输入.sale_order_name <> "" + sub.sale_order_name like 输入.sale_order_name + ENDOPTION + + ENDSELECT + ENDQUERY + ENDIF +