From 0962d51a6c716ee3069977b2ec2211bfdddbeca9 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Thu, 30 Oct 2025 19:06:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=A3=9E=E4=B9=A6=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/service/impl/LmsToMesServiceImpl.java | 42 ++++++++++++++++++- .../nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql | 2 +- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index 40445e047..129a4677a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -1255,7 +1255,47 @@ public class LmsToMesServiceImpl implements LmsToMesService { .addParam("begin_time", begin_time) .addParam("end_time", end_time) .process().getResultJSONArray(0); - feishu_json.put("MsgList", rows); + JSONArray fs_rows = new JSONArray(); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + JSONObject fs_row = new JSONObject(); + fs_row.put("日期", row.getLongValue("日期")); + fs_row.put("班次", row.getString("班次")); + fs_row.put("销售订单", row.getLongValue("销售订单")); + fs_row.put("行号", row.getLongValue("行号")); + fs_row.put("业务类型", row.getString("业务类型")); + fs_row.put("客户编码", row.getLongValue("客户编码")); + fs_row.put("客户名称", row.getString("客户名称")); + fs_row.put("业务员", row.getString("业务员")); + fs_row.put("规格", row.getDoubleValue("规格")); + fs_row.put("尺寸(mm)(客户要求幅宽)", row.getDoubleValue("尺寸(mm)(客户要求幅宽)")); + fs_row.put("实际尺寸(mm)(实际幅宽)", row.getDoubleValue("实际尺寸(mm)(实际幅宽)")); + fs_row.put("木箱规格|尺寸", row.getString("木箱规格|尺寸")); + fs_row.put("毛重合计", row.getDoubleValue("毛重合计")); + fs_row.put("小卷号", row.getString("小卷号")); + fs_row.put("SAP批次号", row.getString("sap批次号")); + fs_row.put("净重(KG)", row.getDoubleValue("净重(kg)")); + fs_row.put("卷数", row.getIntValue("卷数")); + fs_row.put("品级", row.getString("品级")); + fs_row.put("箱号", row.getString("箱号")); + fs_row.put("销售订单及行号", row.getString("销售订单及行号")); + fs_row.put("母卷号", row.getString("母卷号")); + fs_row.put("基重(面密度)(g|m³)", row.getDoubleValue("基重(面密度)(g|m³)")); + fs_row.put("居中度(mm)", row.getString("居中度(mm)")); + fs_row.put("塌边(mm)", row.getString("塌边(mm)")); + fs_row.put("米数(长度)", row.getDoubleValue("米数(长度)")); + fs_row.put("管件类型", row.getString("管件类型")); + fs_row.put("管件编码", row.getLongValue("管件编码")); + fs_row.put("管件描述", row.getString("管件描述")); + fs_row.put("生产实际抗拉值", row.getDoubleValue("生产实际抗拉值")); + fs_row.put("内控标准抗拉下限", row.getDoubleValue("内控标准抗拉下限")); + fs_row.put("客户需求抗拉下限", row.getDoubleValue("客户需求抗拉下限")); + fs_row.put("生产日期", row.getLongValue("生产日期")); + fs_row.put("入库日期", row.getLongValue("入库日期")); + fs_row.put("生产区域", row.getString("生产区域")); + fs_rows.add(fs_row); + } + feishu_json.put("MsgList", fs_rows); log.info(feishu_json.toString()); return null; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql index dd79cb6d3..816dfddba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql @@ -1310,7 +1310,7 @@ SUBSTRING_INDEX(sub.sale_order_name, '-', '1') AS '销售订单', SUBSTRING_INDEX(sub.sale_order_name, '-', '-1') AS '行号', '生产入库' AS '业务类型', - cust.cust_name AS '客户编码', + cust.cust_code AS '客户编码', sub.customer_description AS '客户名称', cust.sales_owner AS '业务员', sub.thickness AS '规格',