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 @@ -- and sts='Y' - order by sorts asc - order by ${sort} ${order} + + 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 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;