From d9e681b8495824757f45e3c678c2c77d905a1a79 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sun, 4 Jan 2026 11:35:25 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-04=20erp=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ErpInterfaceServiceImpl.java | 24 +++++++++---------- .../service/impl/InterfaceLogServiceImpl.java | 12 ++++++---- .../mapper/stock/StockTransactionLogDao.xml | 4 +++- 3 files changed, 22 insertions(+), 18 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 e72e5d3..7471eff 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 @@ -189,7 +189,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { requestBody = buildProductionInRequestBody(transactionLogs, interfaceName); } else { // 默认格式 - requestBody = buildDefaultRequestBody(transactionLogs, interfaceName); + //requestBody = buildDefaultRequestBody(transactionLogs, interfaceName); } return requestBody; @@ -228,7 +228,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { detail.put("OutIrowNo", nullToEmpty(log.getOrderLineNo())); detail.put("CInvCode", nullToEmpty(log.getPartNo())); detail.put("IQuantity", log.getRollQty() != null ? log.getRollQty().toString() : "0"); - detail.put("INum", ""); + detail.put("INum", log.getPieceQty() != null ? log.getPieceQty().toString() : "0"); detail.put("CUnitID", ""); detail.put("ITaxRate", ""); detail.put("ITaxUnitPrice", ""); @@ -274,7 +274,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { detail.put("OutIrowNo", nullToEmpty(log.getOrderLineNo())); detail.put("CInvCode", nullToEmpty(log.getPartNo())); detail.put("IQuantity", log.getRollQty() != null ? log.getRollQty().toString() : "0"); - detail.put("INum", ""); + detail.put("INum", log.getPieceQty() != null ? log.getPieceQty().toString() : "0"); detail.put("CUnitID", ""); detail.put("ITaxRate", ""); detail.put("ITaxUnitPrice", ""); @@ -311,7 +311,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { detail.put("MESIrowNo", String.valueOf(rowNo)); detail.put("CInvCode", nullToEmpty(log.getPartNo())); detail.put("IQuantity", log.getRollQty() != null ? log.getRollQty().toString() : "0"); - detail.put("INum", ""); + detail.put("INum", log.getPieceQty() != null ? log.getPieceQty().toString() : "0"); detail.put("CUnitID", ""); detail.put("CbMemo", ""); detail.put("CBatch", nullToEmpty(log.getBatchFlag())); @@ -347,9 +347,9 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { detail.put("CInvCode", nullToEmpty(log.getPartNo())); detail.put("IQuantity", log.getRollQty() != null ? log.getRollQty().toString() : "0"); detail.put("CUnitID", ""); - detail.put("INum", ""); + detail.put("INum", log.getPieceQty() != null ? log.getPieceQty().toString() : "0"); detail.put("CBatch", nullToEmpty(log.getBatchFlag())); - detail.put("OutMocode", nullToEmpty(log.getOrderref1())); // erp_order_no + detail.put("OutMocode", nullToEmpty(log.getErpOrderNo())); // erp_order_no detail.put("OutIrowNo", nullToEmpty(log.getOrderLineNo())); detail.put("OutIrowNo_zj", nullToEmpty(log.getBomItemNo())); detailList.add(detail); @@ -383,11 +383,11 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { detail.put("CInvCode", nullToEmpty(log.getPartNo())); detail.put("IQuantity", log.getRollQty() != null ? log.getRollQty().toString() : "0"); detail.put("CUnitID", nullToEmpty(log.getUmid())); - detail.put("INum", nullToEmpty(log.getOrderref2())); // piece_qty + detail.put("INum", log.getPieceQty() != null ? log.getPieceQty().toString() : "0"); // piece_qty detail.put("NumberOfCases", ""); detail.put("CbMemo", ""); detail.put("CBatch", nullToEmpty(log.getBatchFlag())); - detail.put("OutMocode", nullToEmpty(log.getOrderref1())); // erp_order_no + detail.put("OutMocode", nullToEmpty(log.getErpOrderNo())); // erp_order_no detail.put("OutIrowNo", nullToEmpty(log.getOrderLineNo())); detail.put("OutIrowNo_zj", ""); detailList.add(detail); @@ -610,7 +610,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { detailEntity.setOrderref9(""); // CUnitID detailEntity.setOrderref10(""); // ITaxRate detailEntity.setOrderref11(""); // ITaxUnitPrice - detailEntity.setOrderref12(""); + detailEntity.setOrderref12(log.getPieceQty() != null ? log.getPieceQty().toString() : "0"); detailEntity.setOrderref13(""); } else if ("GetSaveSalesOut".equals(interfaceName) || "GetSaveSalesReturn".equals(interfaceName)) { // 销售出库/销售退货 @@ -625,7 +625,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { detailEntity.setOrderref9(""); // CUnitID detailEntity.setOrderref10(""); // ITaxRate detailEntity.setOrderref11(""); // ITaxUnitPrice - detailEntity.setOrderref12(""); + detailEntity.setOrderref12(log.getPieceQty() != null ? log.getPieceQty().toString() : "0"); detailEntity.setOrderref13(""); } else if ("GetSaveOthersStorageOut".equals(interfaceName) || "GetSaveOthersStorage".equals(interfaceName)) { // 其他出库/其他入库 @@ -640,7 +640,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { detailEntity.setOrderref9(""); detailEntity.setOrderref10(""); detailEntity.setOrderref11(""); - detailEntity.setOrderref12(""); + detailEntity.setOrderref12(log.getPieceQty() != null ? log.getPieceQty().toString() : "0"); detailEntity.setOrderref13(""); } else if ("GetSaveroductionIssue".equals(interfaceName) || "GetSaveroductionReturn".equals(interfaceName)) { // 生产领料/生产退料 @@ -655,7 +655,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService { detailEntity.setOrderref9(""); // OutIrowNo_zj detailEntity.setOrderref10(nullToEmpty(log.getBomItemNo())); detailEntity.setOrderref11(""); - detailEntity.setOrderref12(""); + detailEntity.setOrderref12(log.getPieceQty() != null ? log.getPieceQty().toString() : "0"); detailEntity.setOrderref13(""); } else if ("GetSaveroductionIn".equals(interfaceName)) { // 生产入库 diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/InterfaceLogServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/InterfaceLogServiceImpl.java index 6b88959..f747126 100644 --- a/src/main/java/com/gaotao/modules/sys/service/impl/InterfaceLogServiceImpl.java +++ b/src/main/java/com/gaotao/modules/sys/service/impl/InterfaceLogServiceImpl.java @@ -150,7 +150,7 @@ public class InterfaceLogServiceImpl implements InterfaceLogService { detailResult.put("OutIrowNo", getStringValue(detail, "orderref3")); detailResult.put("CInvCode", getStringValue(detail, "orderref4")); detailResult.put("IQuantity", getStringValue(detail, "orderref5")); - detailResult.put("INum", ""); + detailResult.put("INum", getStringValue(detail, "orderref12")); detailResult.put("CUnitID", ""); detailResult.put("ITaxRate", ""); detailResult.put("ITaxUnitPrice", ""); @@ -184,7 +184,7 @@ public class InterfaceLogServiceImpl implements InterfaceLogService { result.put("Cexch_name", ""); result.put("Cgatheringplan", ""); result.put("CCusOAddress", ""); - result.put("CMemo", ""); + result.put("CMemo", getStringValue(head, "orderref5")); } if (detailList != null && !detailList.isEmpty()) { @@ -196,7 +196,7 @@ public class InterfaceLogServiceImpl implements InterfaceLogService { detailResult.put("OutIrowNo", getStringValue(detail, "orderref3")); detailResult.put("CInvCode", getStringValue(detail, "orderref4")); detailResult.put("IQuantity", getStringValue(detail, "orderref5")); - detailResult.put("INum", ""); + detailResult.put("INum", getStringValue(detail, "orderref12")); detailResult.put("CUnitID", ""); detailResult.put("ITaxRate", ""); detailResult.put("ITaxUnitPrice", ""); @@ -233,7 +233,7 @@ public class InterfaceLogServiceImpl implements InterfaceLogService { detailResult.put("MESIrowNo", getStringValue(detail, "orderref1")); detailResult.put("CInvCode", getStringValue(detail, "orderref4")); detailResult.put("IQuantity", getStringValue(detail, "orderref5")); - detailResult.put("INum", ""); + detailResult.put("INum", getStringValue(detail, "orderref12")); detailResult.put("CUnitID", ""); detailResult.put("CbMemo", getStringValue(detail, "orderref7")); detailResult.put("CBatch", getStringValue(detail, "orderref6")); @@ -269,7 +269,7 @@ public class InterfaceLogServiceImpl implements InterfaceLogService { detailResult.put("CInvCode", getStringValue(detail, "orderref4")); detailResult.put("IQuantity", getStringValue(detail, "orderref5")); detailResult.put("CUnitID", ""); - detailResult.put("INum", ""); + detailResult.put("INum", getStringValue(detail, "orderref12")); detailResult.put("CBatch", getStringValue(detail, "orderref6")); detailResult.put("OutMocode", getStringValue(detail, "orderref8")); detailResult.put("OutIrowNo", getStringValue(detail, "orderref3")); @@ -686,6 +686,8 @@ public class InterfaceLogServiceImpl implements InterfaceLogService { case 9: return "OutMocode"; case 10: return "OutIrowNo_zj"; case 11: return "NumberOfCases"; + case 12: return "INum"; + case 13: return "CUnitID"; default: return "orderref" + position; } } diff --git a/src/main/resources/mapper/stock/StockTransactionLogDao.xml b/src/main/resources/mapper/stock/StockTransactionLogDao.xml index 960811e..8b2b223 100644 --- a/src/main/resources/mapper/stock/StockTransactionLogDao.xml +++ b/src/main/resources/mapper/stock/StockTransactionLogDao.xml @@ -33,7 +33,9 @@ bom_item_no AS bomItemNo, umid, interface_name AS interfaceName, - batch_flag AS batchFlag + batch_flag AS batchFlag, + piece_qty as pieceQty, + erp_order_no AS erpOrderNo FROM StockTransactionLog WITH(NOLOCK) WHERE site = #{site} AND bu_no = #{buNo}