From 79c126e08127450dfd3001e333915813984afc8a Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:05:08 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sales):=20=E8=B0=83=E6=95=B4=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=87=BA=E5=BA=93=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E4=BC=A0=E8=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉 TocofsSaleoutEntity.xml 中的排序逻辑
- 在 SoSaleOutPluginInitializerToC 中添加 ID复制操作
- 修改 SoSaleOutPluginInitializerToCTest 中的测试参数
- 在 HeaderDto 中添加新的字段用于存储出库信息
---
 .../frame/plugin/lets/ofs/entity/TocofsSaleoutEntity.xml    | 4 ++--
 .../lets/plugin/sales/SoSaleOutPluginInitializerToC.java    | 2 ++
 .../plugin/sales/SoSaleOutPluginInitializerToCTest.java     | 2 +-
 .../frame/ttxofs/dto/ofssaleorderoutsearch/HeaderDto.java   | 6 ++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutEntity.xml
index c4c03c7f..c52ea4d3 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutEntity.xml
@@ -372,8 +372,8 @@
             </if>
             -- and sts='Y'
         </trim>
-        <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+<!--        <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
+<!--        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
     </select>
 
     <!-- 查询符合条件的数量 -->
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java
index 51f4280b..6febb1f4 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java
@@ -4060,6 +4060,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
                 TocofsSaleoutEntity tocofsSaleoutEntity = allTocofsSaleoutEntityList.get(i);
                 HeaderDto headerDto = new HeaderDto();
                 BeanUtil.copyPropertiesV2(tocofsSaleoutEntity, headerDto);
+                headerDto.setId(tocofsSaleoutEntity.getId());
                 headerDetailsDto.setHeader(headerDto);
 
                 List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntityList1 = tocofsSaleoutEntity.getTocofsSaleoutDetailedEntityList();
@@ -4070,6 +4071,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
 
                     DetailsDto detailsDto = new DetailsDto();
                     BeanUtil.copyPropertiesV2(tocofsSaleoutDetailedEntity1, detailsDto);
+                    detailsDto.setId(tocofsSaleoutDetailedEntity1.getId());
                     detailsDtoList.add(detailsDto);
                 }
             }
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java
index b11e5d8b..60f9f1dd 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java
@@ -120,7 +120,7 @@ class SoSaleOutPluginInitializerToCTest {
 //            String aaa = "LETS-SH2024102800021196";
 //            soSaleOutPluginInitializerToC.startImplementStockByTime("2024-12-06 09:25:39", "2024-12-06 09:25:39");
 
-            soSaleOutPluginInitializerToC.startImplementStockByTime("2024-11-02 17:09:02", "2024-11-02 17:09:02", "0");
+            soSaleOutPluginInitializerToC.startImplementStockByTime("2024-11-02 17:09:02", "2024-11-02 17:09:02", "1");
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/HeaderDto.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/HeaderDto.java
index ebd7bd28..90d89d08 100755
--- a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/HeaderDto.java
+++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/HeaderDto.java
@@ -82,6 +82,12 @@ public class HeaderDto {
     //出库类型
     private String shipmentType;
 
+    private String shipToPostalCode;
+
+    private String shipToEmail;
+
+    private String modified;
+
     //O单据名称
 //    private String subOrderType;