From 5a8916bebf48d5c3e9275a1a959c72b80c2e8621 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 17 Mar 2026 17:35:30 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/ConsumeReportMapper.xml | 12 ++- .../impl/ConsumeReportServiceImpl.java | 2 +- .../service/dao/mapper/IosReportMapper.xml | 52 +++++++----- .../nl/wms/biBoard/run/AutoSyncAgvStatus.java | 37 ++++---- .../biBoard/screen/service/dto/AgvStatus.java | 4 +- .../nl/wms/ext/service/WmsToAcsService.java | 3 +- .../ext/service/impl/WmsToAcsServiceImpl.java | 79 ++---------------- .../nl/wms/ext/service/util/AgvResponse.java | 71 ++++++++++++++++ .../java/org/nl/wms/ext/util/AcsUtil.java | 57 ++++++++++++- wms/nladmin-ui/src/assets/images/1.png | Bin 0 -> 47900 bytes wms/nladmin-ui/src/assets/images/haDian.png | Bin 0 -> 23461 bytes .../views/wms/biBoard/consumeReport/index.vue | 9 +- .../src/views/wms/biBoard/iosReport/index.vue | 3 +- .../src/views/wms/biBoard/screen/index.vue | 4 +- 14 files changed, 198 insertions(+), 135 deletions(-) create mode 100644 wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/AgvResponse.java create mode 100644 wms/nladmin-ui/src/assets/images/1.png create mode 100644 wms/nladmin-ui/src/assets/images/haDian.png diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/dao/mapper/ConsumeReportMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/dao/mapper/ConsumeReportMapper.xml index 03e58ba..8da02a7 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/dao/mapper/ConsumeReportMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/dao/mapper/ConsumeReportMapper.xml @@ -6,7 +6,7 @@ SELECT - bom.create_id AS groupCode, + u.username AS groupCode, bom.create_name AS groupName, mater.material_code AS materialCode, mater.material_name AS materialName, @@ -89,10 +91,12 @@ FROM pdm_bom_callmaterial bom INNER JOIN md_me_materialbase mater ON mater.material_id = bom.material_id + LEFT JOIN sys_user u ON bom.create_id = u.user_id 1 = 1 - AND bom.create_id = #{param.groupCode} + AND (u.username LIKE #{param.groupCode} or + u.person_name LIKE #{param.groupCode}) AND (mater.material_code LIKE CONCAT('%', #{param.materialCode}, '%') diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/impl/ConsumeReportServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/impl/ConsumeReportServiceImpl.java index 41c5586..004e4ed 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/impl/ConsumeReportServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/impl/ConsumeReportServiceImpl.java @@ -89,7 +89,7 @@ public class ConsumeReportServiceImpl implements IConsumeReportService { // 创建标题行 Row headerRow = sheet.createRow(0); - String[] headers = {"序号", "班组编码", "班组名称", "物料编码", "物料名称", "规格型号", "批次", "领料重量", "退料重量", "消耗重量", "单位"}; + String[] headers = {"序号", "班组编码", "班组名称", "物料编码", "物料名称", "规格型号", "工单编码", "领料重量", "退料重量", "消耗重量", "单位"}; for (int i = 0; i < headers.length; i++) { Cell cell = headerRow.createCell(i); cell.setCellValue(headers[i]); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/materialRequisition/service/dao/mapper/IosReportMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/materialRequisition/service/dao/mapper/IosReportMapper.xml index f4eba8e..0b46d51 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/materialRequisition/service/dao/mapper/IosReportMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/materialRequisition/service/dao/mapper/IosReportMapper.xml @@ -7,8 +7,8 @@ SELECT @rownum := @rownum + 1 AS rowNum, DATE_FORMAT(inv.confirm_time, '%Y-%m-%d %H:%i:%s') AS confirmTime, - inv.confirm_optid AS groupCode, - inv.confirm_optname AS groupName, + u.username AS groupCode, + u.person_name AS groupName, CASE inv.bill_type WHEN '1001' THEN '领料' WHEN '0002' THEN '退料' @@ -17,19 +17,23 @@ mater.material_code AS materialCode, mater.material_name AS materialName, mater.material_spec AS materialSpec, - dtl.pcsn AS batchNo, - dtl.real_qty AS weight, - dtl.qty_unit_name AS qtyUnitName + dis.pcsn AS batchNo, + dis.real_qty AS weight, + dis.qty_unit_name AS qtyUnitName FROM - st_ivt_iostorinv inv - INNER JOIN st_ivt_iostorinvdtl dtl ON inv.iostorinv_id = dtl.iostorinv_id - INNER JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id, + st_ivt_iostorinvdis dis + INNER JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinv_id = dis.iostorinv_id + INNER JOIN st_ivt_iostorinv inv ON inv.iostorinv_id = dtl.iostorinv_id + INNER JOIN sys_user u ON u.user_id = inv.input_optid + INNER JOIN md_me_materialbase mater ON mater.material_id = dis.material_id, (SELECT @rownum := 0) r inv.bill_status = '99' + AND inv.is_delete = '0' AND inv.bill_type IN ('1001', '0002') - AND inv.confirm_optid = #{param.groupCode} + AND (u.username LIKE #{param.groupCode} or + u.person_name LIKE #{param.groupCode}) AND (mater.material_code LIKE CONCAT('%', #{param.materialCode}, '%') @@ -83,28 +87,32 @@