From a93c33eab9f21829788f7330fcbc6277dd24c0c8 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 16 Apr 2025 15:05:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A1=E3=80=81=E8=B0=83?= =?UTF-8?q?=E6=8B=A8-=E9=80=80=E5=BA=93=E6=97=B6=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E5=8E=BB=E5=85=A5=E5=BA=93=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lets/plugin/transfer/TransferOutPluginInitializer.java | 7 ++++++- .../frame/plugin/lets/plugin/transfer/TransferTest.java | 4 ++-- .../ttxofs/dto/stock/StockoutOrderSearchResponse.java | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java index 5070dfb0..94865cf1 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java @@ -454,7 +454,12 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { //nprice 单价(含税单价)，取上一次结账的单价 nmny金额 nnotaxmny无税金额 nnotaxprice 无税单价 //202411091719：妮妮姐说：优先取结存价，没有的话取采购价，如果都没有就报错！！！ //202502121700：妮妮姐说：取bd_produce-》nbzyj - String nabprice = queryIaMonthledger(ofsDetail, ofsTranseferOrder.getHeader().getCompanyCode(), ofsTranseferOrder.getHeader().getFacilityCode()); + String nabprice = null; + if (isReturn) { + nabprice = queryIaMonthledger(ofsDetail, ofsTranseferOrder.getHeader().getToCompanyCode(), ofsTranseferOrder.getHeader().getFacilityCode()); + } else { + nabprice = queryIaMonthledger(ofsDetail, ofsTranseferOrder.getHeader().getCompanyCode(), ofsTranseferOrder.getHeader().getFacilityCode()); + } if (nabprice == null) { // Assert.state(false, "公司：{}，货品：{},SKU编码：{}，无结存价、起初价、采购价，请维护！", ofsTranseferOrder.getHeader().getCompanyCode(), ofsDetail.getSkuName(), ofsDetail.getSkuCode()); Assert.state(false, "公司：{}，货品：{},SKU编码：{}，无内部转移价，请维护！", ofsTranseferOrder.getHeader().getCompanyCode(), ofsDetail.getSkuName(), ofsDetail.getSkuCode()); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java index ec04ec46..a2d7987e 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java @@ -51,7 +51,7 @@ public class TransferTest { @Test public void t10(){ - transferOutPluginInitializer.start("LETS-SH2025020200017429"); + transferOutPluginInitializer.start("LETS-SH2025032100023260"); } @Test @@ -70,7 +70,7 @@ public class TransferTest { } @Test public void t21(){ - transferInPluginInitializer.start("LETS-RE2025010600000520"); + transferInPluginInitializer.start("LETS-RE2025032100000881"); } @Test public void t22(){ diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/stock/StockoutOrderSearchResponse.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/stock/StockoutOrderSearchResponse.java index 0634c2ad..142d5f5a 100644 --- a/service/src/main/java/com/hzya/frame/ttxofs/dto/stock/StockoutOrderSearchResponse.java +++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/stock/StockoutOrderSearchResponse.java @@ -91,6 +91,7 @@ public class StockoutOrderSearchResponse extends ReturnMessageBasics { } @Data public static class StockoutB { + private String id; private String clientCode; private String companyCode; private String facilityCode;