From a984bb1ce259b35cc03549c842b09f5a3d4c96fb Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Fri, 16 Aug 2024 16:27:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/plugin/lets/constant/ProfilesActiveConstant.java | 4 ++++ .../lets/plugin/sales/SoSaleReturnPluginInitializerToB.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/ProfilesActiveConstant.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/ProfilesActiveConstant.java index 86f933a9..8ac51f6b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/ProfilesActiveConstant.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/ProfilesActiveConstant.java @@ -27,4 +27,8 @@ public class ProfilesActiveConstant { public static final String U8C_URL = "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface"; public static final String OFS_URL_TEST = "http://39.98.58.229/api/edi/ofs/in"; + public static final String SUPPLIER = "'1','3'"; + + public static final String CUSTOMER = "'0','2'"; + } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java index 0f54635b..b049160d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java @@ -569,6 +569,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { bdCumandocEntity1.setDr(0L); bdCumandocEntity1.setPkCorp(bdCorpEntityList.get(0).getPkCorp()); bdCumandocEntity1.setPkCubasdoc(bdCubasdocEntityList.get(0).getPkCubasdoc()); + bdCumandocEntity1.setCustflags(ProfilesActiveConstant.CUSTOMER); List bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1); //查找平台 @@ -732,7 +733,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { } else if (bdInvbasdocEntity2.size() >= 2) { Assert.state(false, "根据存货管理档案主键{}和公司档案主键{}没有查询到U8C基础档案", pkInvmandoc, pkCorp); } - return bdInvbasdocEntity; + return bdInvbasdocEntity2.get(0); } /** @@ -822,7 +823,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { if (tocofsReturngoodsDetailedEntity != null && returnGoodSearchHeaderDto != null) { tocofsReturngoodsDetailedEntity.setPrimaryKey(returnGoodSearchHeaderDto.getId());//主表主键 tocofsReturngoodsDetailedEntity.setBusinessDate(returnGoodSearchHeaderDto.getCheckInFrom());//业务日期 - tocofsReturngoodsDetailedEntity.setBusinessType("TOC_RETURN");//业务类型 + tocofsReturngoodsDetailedEntity.setBusinessType("TOB_RETURN");//业务类型 } } } \ No newline at end of file