From 4762743d4d408ea2316a36d78b32078d1f21a880 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Tue, 19 Aug 2025 15:31:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(buildpackage):=20=E6=B7=BB=E5=8A=A0=20TOC?=
=?UTF-8?q?=E5=94=AE=E5=90=8E=E7=B1=BB=E5=9E=8B=E6=A0=87=E8=AF=86=E5=B9=B6?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 OverallConstant 中添加 TOC 售后类型标识编码
- 在 PassiveWarehouseReceiptToC 和 SoSaleReturnPluginInitializerToC 中使用新的售后类型标识- 修改 OfsPassiveorderDetailEntity.xml 中的 def11 字段类型
- 优化 SoSaleReturnPluginInitializerToC 的实施逻辑
---
.../com/hzya/frame/plugin/lets/constant/OverallConstant.java | 1 +
.../plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java | 1 +
.../lets/plugin/sales/SoSaleReturnPluginInitializerToC.java | 2 +-
.../plugin/sales/SoSaleReturnPluginInitializerToCTest.java | 4 ++--
.../frame/report/lets/entity/OfsPassiveorderDetailEntity.xml | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java
index 508f5ab9..5d102715 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java
@@ -160,6 +160,7 @@ public class OverallConstant {
//售后类型标识-TOC无源件-编码
prodOverAll.put("售后类型标识-TOC无源件-编码", "02");
+ prodOverAll.put("售后类型标识-TOC售后-编码", "01");
prodOverAll.put("售后类型标识-TOB售后-主键", "0001A110000000AFFT7M");
prodOverAll.put("售后类型标识-TOB售后-名称", "TOB售后");
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java
index 5ef49ff3..7cd06620 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java
@@ -1078,6 +1078,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
PassiveStorageSonDetailsDto2 passiveStorageSonDetailsDto2 = groupMergeDetailedRows2(value, isCheckShopChoose);
BigDecimal groupTotalPayAmount1 = passiveStorageSonDetailsDto2.getGroupTotalPayAmount();
BigDecimal groupShipQty = passiveStorageSonDetailsDto2.getGroupShipQty();
+
//当金额>0，但数量为0时，推送红字应收单
if (groupTotalPayAmount1 != null && groupShipQty != null && groupTotalPayAmount1.compareTo(BigDecimal.ZERO) > 0 && groupShipQty.compareTo(BigDecimal.ZERO) == 0) {
try {
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
index f5fb7932..801bec73 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
@@ -1126,6 +1126,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
parentVo.setZyx1(shopArchives.getDoccode());//店铺档案
parentVo.setZyx2(platformArchives.getDoccode());//来源平台
parentVo.setZyx3(bdRdclEntity.getRdcode());//收发类别
+ parentVo.setZyx8(OverallConstant.getOverAllValue("售后类型标识-TOC售后-编码"));
parentVo.setZyx16("1");//单据红字标识
parentVo.setZyx17(ProfilesActiveConstant.sourceSystem1);//来源系统
parentVo.setZyx18(keyGroup);//汇总维度
@@ -1814,7 +1815,6 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
// StockinOrderSearchResponse.StockinOrder.StockinB stockinB = details2.get(i);
// stockinB.setReceivedQty(stockinB.getRequestQty());
// }
-// headerDetailsDtos.get(0).getHeader().setTradeSuccessAt("2025-08-18 17:20:00");
markTimeInMorningEvening(returnGoodHeaderDetailsDataDtoList1);
if ("stock".equals(sceneType)) {
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
index f7f8deb3..36d10c44 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
@@ -70,9 +70,9 @@ public class SoSaleReturnPluginInitializerToCTest {
// soSaleReturnPluginInitializerToC.startImplementByTradeTime("2025-04-28 00:00:00", "2025-04-28 23:59:59", "0");
//满足红字应收单
-// soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072200001324", "tran");
+ soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072200001324", "tran");
//情况一
- soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072900000460", "stock");
+// soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072900000460", "stock");
//情况二
// soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072800000594", "tran");
//情况三
diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.xml
index 9a0ab23c..f4053c73 100644
--- a/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.xml
+++ b/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.xml
@@ -68,7 +68,7 @@
-
+