From 7e89ad620db9e97b6bb389269e003a262f828be1 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:30:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(outsourc):=20=E4=BF=AE=E5=A4=8D=E7=BA=A2?=
=?UTF-8?q?=E5=AD=97=E5=A7=94=E5=A4=96=E5=85=A5=E5=BA=93=E5=8D=95=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 更新 SQL 查询语句，使用 CONCAT 替代 concat 函数
- 添加公司代码替换逻辑，确保正确匹配公司档案
- 修改插件名称和标签，使其更加准确
- 更新测试用例，使用新的订单编号
---
.../plugin/lets/entity/BdCubasdocEntity.java | 4 +--
.../plugin/lets/entity/BdCubasdocEntity.xml | 2 +-
.../outsourc/ConsignmachiningInReturn.java | 29 +++++++++++++++----
.../src/main/resources/application.yml | 2 +-
.../ConsignmachiningInReturnTest.java | 20 ++++++-------
5 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.java
index a518e5ec..265e189f 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.java
@@ -83,8 +83,8 @@ public class BdCubasdocEntity extends BaseEntity {
private String ts;
private String url;
private String zipcode;
-
-
+// private String def1like;
+
/**
* 客商管理档案主键
*/
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.xml
index ed2d767e..650cb283 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.xml
@@ -169,7 +169,7 @@
and custname = #{custname}
and custprop = #{custprop}
and custshortname = #{custshortname}
- and def1 like concat('%',#{def1},'%')
+ and def1 LIKE CONCAT(CONCAT('%', #{def1}), '%')
and def10 = #{def10}
and def11 = #{def11}
and def12 = #{def12}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
index efbc3eac..92b862c5 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
@@ -61,6 +61,9 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
@Autowired
private IBdInvmandocDao iBdInvmandocDao;
+ @Autowired
+ private QueryU8CEntityUtil queryU8CEntityUtil;
+
@Autowired
private IBdCalbodyDao iBdCalbodyDao;
@@ -125,12 +128,12 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
@Override
public String getPluginName() {
- return "OFS采退出库单生成U8C红字委外订单(关联原委外订单)";
+ return "OFS采退出库单生成U8C红字委外入库单(关联原委外订单)";
}
@Override
public String getPluginLabel() {
- return "OFS采退出库单生成U8C红字委外订单(关联原委外订单)";
+ return "OFS采退出库单生成U8C红字委外入库单(关联原委外订单)";
}
@Override
@@ -568,11 +571,27 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
bdCorpEntity.setDr(0);
bdCorpEntity.setDataSourceCode("lets_u8c");
bdCorpEntity.setPkCorp(scOrderEntity.getPkCorp());
- List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity);
+ List oldBdCorpEntityList = iBdCorpDao.query(bdCorpEntity);
+ if (oldBdCorpEntityList.size() == 0) {
+ Assert.state(false, "(原始公司没有替换之前)根据委外订单公司主键:{}，无法匹配到对应的公司", scOrderEntity.getPkCorp());
+ } else if (oldBdCorpEntityList.size() >= 2) {
+ Assert.state(false, "(原始公司没有替换之前)根据委外订单公司主键:{}，匹配到{}个公司档案", scOrderEntity.getPkCorp(), oldBdCorpEntityList.size());
+ }
+ //得到原始的公司编码
+ BdCorpEntity bdCorpEntity1 = oldBdCorpEntityList.get(0);
+ String unitcode = bdCorpEntity1.getUnitcode();
+ String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(unitcode.trim());
+ Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！");
+
+ BdCorpEntity bdCorpEntity2 = new BdCorpEntity();
+ bdCorpEntity2.setDr(0);
+ bdCorpEntity2.setDataSourceCode("lets_u8c");
+ bdCorpEntity2.setUnitcode(replaceCompanyCode);
+ List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity2);
if (bdCorpEntityList.size() == 0) {
- Assert.state(false, "根据委外订单公司主键:{}，无法匹配到委外入库单", scOrderEntity.getPkCorp());
+ Assert.state(false, "(原始公司替换之后)根据委外订单公司主键:{}，无法匹配到对应的公司", scOrderEntity.getPkCorp());
} else if (bdCorpEntityList.size() >= 2) {
- Assert.state(false, "根据委外订单公司主键:{}，匹配到{}个委外入库单", scOrderEntity.getPkCorp(), bdCorpEntityList.size());
+ Assert.state(false, "(原始公司替换之后)根据委外订单公司主键:{}，匹配到{}个公司档案", scOrderEntity.getPkCorp(), bdCorpEntityList.size());
}
// 2024年8月27日 17:15:09 收货库存组织，应该是通过收货公司查询得出收货库存组织，目前收货公司和采购公司保持一致，那么就以采购公司带出！这个逻辑已经和佳妮确认
diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml
index bab6e286..cd510979 100644
--- a/buildpackage/src/main/resources/application.yml
+++ b/buildpackage/src/main/resources/application.yml
@@ -36,7 +36,7 @@ spring:
# use-suffix-pattern: true
profiles:
# active: @profileActive@
- active: lets
+ active: letsprod
# active: @profile.active@
# active: dev
servlet:
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturnTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturnTest.java
index 5d90441e..dfed72ba 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturnTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturnTest.java
@@ -21,17 +21,17 @@ import static org.junit.Assert.*;
@SpringBootTest(classes = WebappApplication.class)
public class ConsignmachiningInReturnTest {
-// @Autowired
-// private ConsignmachiningInReturn consignmachiningInReturn;
+ @Autowired
+ private ConsignmachiningInReturn consignmachiningInReturn;
-// @Test
-// public void startImplement() {
-// try {
-// consignmachiningInReturn.startImplement("LETS-SH2024082700000006");
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
+ @Test
+ public void startImplement() {
+ try {
+ consignmachiningInReturn.startImplement("LETS-SH2024082300017733");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
// @Test
// public void testStartImplement() {