From bb8a8f9185e0e2bba628316613a5bf4a9aebac29 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 27 Jan 2026 13:57:04 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-27=20=E9=94=80=E5=94=AE=E5=8F=91?= =?UTF-8?q?=E8=B4=A7/=E9=80=80=E8=B4=A7=E7=9A=84MESCCode=E6=94=B9=E4=B8=BA?= =?UTF-8?q?oaOrderNo-transactionId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/erp/service/impl/ErpInterfaceServiceImpl.java | 4 +++- .../modules/stock/entity/StockTransactionLogEntity.java | 2 ++ src/main/resources/mapper/stock/StockTransactionLogDao.xml | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gaotao/modules/erp/service/impl/ErpInterfaceServiceImpl.java b/src/main/java/com/gaotao/modules/erp/service/impl/ErpInterfaceServiceImpl.java index a85d156..0e09efc 100644 --- a/src/main/java/com/gaotao/modules/erp/service/impl/ErpInterfaceServiceImpl.java +++ b/src/main/java/com/gaotao/modules/erp/service/impl/ErpInterfaceServiceImpl.java @@ -484,8 +484,10 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { headEntity.setOrderref7(""); // CMemo headEntity.setOrderref8(""); // CDepCode } else if ("GetSaveSalesOut".equals(interfaceName) || "GetSaveSalesReturn".equals(interfaceName)) { + String oaOrderNo = nullToEmpty(firstLog.getOaOrderNo()); + String orderref1Value = oaOrderNo + "-" + (firstLog.getTransactionId() != null ? firstLog.getTransactionId() : ""); // 销售出库/销售退货 - headEntity.setOrderref1(nullToEmpty(firstLog.getTransactionId())); // MESCCode + headEntity.setOrderref1(orderref1Value); // MESCCode headEntity.setOrderref2(kdType); // KdType headEntity.setOrderref3(formatDate(firstLog.getTransactionDate())); // DDate headEntity.setOrderref4(""); // CBusType diff --git a/src/main/java/com/gaotao/modules/stock/entity/StockTransactionLogEntity.java b/src/main/java/com/gaotao/modules/stock/entity/StockTransactionLogEntity.java index 09e9b74..85bd18c 100644 --- a/src/main/java/com/gaotao/modules/stock/entity/StockTransactionLogEntity.java +++ b/src/main/java/com/gaotao/modules/stock/entity/StockTransactionLogEntity.java @@ -105,6 +105,8 @@ public class StockTransactionLogEntity implements Serializable { private String erpOrderNo; private String rowNo; + + private String oaOrderNo; } diff --git a/src/main/resources/mapper/stock/StockTransactionLogDao.xml b/src/main/resources/mapper/stock/StockTransactionLogDao.xml index 6d8557d..545afb8 100644 --- a/src/main/resources/mapper/stock/StockTransactionLogDao.xml +++ b/src/main/resources/mapper/stock/StockTransactionLogDao.xml @@ -34,7 +34,8 @@ batch_flag AS batchFlag, sum(piece_qty) as pieceQty, -- 件数 erp_order_no AS erpOrderNo, - ROW_NUMBER() OVER (ORDER BY document_no, batch_flag) as rowNo + ROW_NUMBER() OVER (ORDER BY document_no, batch_flag) as rowNo, + oa_order_no as oaOrderNo FROM StockTransactionLog WITH(NOLOCK) WHERE site = #{site} AND bu_no = #{buNo} @@ -43,7 +44,7 @@ transaction_id,site, bu_no , document_type , document_no , order_line_no , order_no , part_no , transaction_type , warehouse_id , location_id , transaction_date , transaction_by , orderref1, orderref2, remarks, synced_flag , synced_time , synced_error_msg , department_id , document_no_type , bom_item_no , - umid, interface_name , batch_flag ,erp_order_no + umid, interface_name , batch_flag ,erp_order_no, oa_order_no