From 0f256d3cbebd737259f97d8edc90d05154f68df5 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Mon, 3 Nov 2025 10:57:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext/mes/rest/LmsToMesController.java | 3 ++- .../wms/ext/mes/service/LmsToMesService.java | 2 +- .../mes/service/impl/LmsToMesServiceImpl.java | 22 +++++++++++++------ .../nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql | 4 ++-- lms/nladmin-ui/src/views/wms/pdm/bi/index.vue | 1 - 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java index 032cb5145..8ab02d789 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java @@ -158,6 +158,7 @@ public class LmsToMesController { @Log("LMS获取MES称重后子卷信息") @SaIgnore public ResponseEntity EditSheetApi(@RequestBody JSONObject jo) { - return new ResponseEntity<>(lmsToMesService.EditSheetApi(jo), HttpStatus.OK); + lmsToMesService.EditSheetApi(jo); + return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java index 974ce0789..8b76322e1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java @@ -187,5 +187,5 @@ public interface LmsToMesService { JSONObject getInspectionResult(JSONObject jo); - JSONObject EditSheetApi(JSONObject jo); + void EditSheetApi(JSONObject jo); } 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 129a4677a..00b71a3d9 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 @@ -1230,7 +1230,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } @Override - public JSONObject EditSheetApi(JSONObject jo) { + public void EditSheetApi(JSONObject jo) { JSONObject feishu_json = new JSONObject(); feishu_json.put("app_token", "B6r1bVaHmak3xQsL8kMc9gM5nxf"); feishu_json.put("tableid", "tbluPCwWQcvOprcx"); @@ -1247,10 +1247,8 @@ public class LmsToMesServiceImpl implements LmsToMesService { // 2. 前一天早上 8 点：当天 8 点减去 1 天 LocalDateTime yesterday8AM = today8AM.minus(1, ChronoUnit.DAYS).plusSeconds(1); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - //String begin_time = yesterday8AM.format(formatter); - String begin_time = "2025-06-24 08:00:00"; - //String end_time = today8AM.format(formatter); - String end_time = "2025-06-25 07:59:59"; + String begin_time = yesterday8AM.format(formatter); + String end_time = today8AM.format(formatter); JSONArray rows = WQL.getWO("ST_IVT_INBILLQUERY").addParam("flag", "7") .addParam("begin_time", begin_time) .addParam("end_time", end_time) @@ -1296,7 +1294,17 @@ public class LmsToMesServiceImpl implements LmsToMesService { fs_rows.add(fs_row); } feishu_json.put("MsgList", fs_rows); - log.info(feishu_json.toString()); - return null; + + try { + String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_INSTOR").getValue(); + String api = "FeiShuNoticesWebApi/EditSheetApi"; + String resultMsg = HttpRequest.post(url+api) + .body(String.valueOf(feishu_json)) + .execute().body(); + log.info("飞书输入参数为：-------------------" + feishu_json); + log.info("飞书输出参数为：-------------------" + resultMsg); + } catch (Exception e) { + log.info(e.getMessage()); + } } } 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 16c4c1fe3..982e0f2fa 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 @@ -1368,8 +1368,8 @@ LEFT JOIN st_ivt_iostorinv b ON a.iostorinv_id = b.iostorinv_id WHERE b.io_type = '0' AND b.bill_type = '0001' - AND b.confirm_time >= '2025-06-24 08:00:00' - AND b.confirm_time <= '2025-06-25 07:59:59' + AND b.confirm_time >= 输入.begin_time + AND b.confirm_time <= 输入.end_time AND b.bill_status = '99' GROUP BY pcsn UNION diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue index 1388a15e6..29bfe72d7 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue @@ -588,7 +588,6 @@ />