feat(sales): 添加收发类别字段并优化相关逻辑

- 在 SalesInvoiceHeadDto 中添加 pk_defdoc3 和 vdef3 字段，用于存储收发类别信息- 在多个类中添加收发类别的设置逻辑
- 优化部分代码格式和注释

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToB.java

@@ -1295,7 +1295,7 @@ public class PassiveWarehouseReceiptToB extends PluginBaseEntity {
                 List<PassiveStorageResponse.Details> details = data.getDetails();
 
                 try {
-                    Assert.state(false, "测试");
+//                    Assert.state(false, "测试");
                     //查询OFS售后订单
                     Assert.notNull(header.getReturnOrderCode(), "header.getReturnOrderCode()不能为空！");
                     RerturnGoodsOrderSearchData ofsRertunOrder = afterSalesOrderUtil.getOfsRertunOrder(header.getReturnOrderCode().trim());
@@ -1329,7 +1329,8 @@ public class PassiveWarehouseReceiptToB extends PluginBaseEntity {
                     }
                     HeaderDto header1 = saleOrderMessageDto.getData().get(0).getHeader();
                     String memberId = header1.getMemberId();
-//                    memberId = "GYS00002";
+                    //TODO 测试
+                    memberId = "GYS00002";
                     Assert.notNull(memberId, "TOB销售订单(OFS)表头会员id不能为空，否则无法匹配U8C客商档案！");
                     Assert.state(!"".equals(memberId.trim()), "TOB销售订单(OFS)表头会员id不能为空，否则无法匹配U8C客商档案！");
 
@@ -1936,6 +1937,9 @@ public class PassiveWarehouseReceiptToB extends PluginBaseEntity {
                         //单据红字标识
                         salesInvoiceHeadDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y主键"));
                         salesInvoiceHeadDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y名称"));
+                        //收发类别
+                        salesInvoiceHeadDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());
+                        salesInvoiceHeadDto.setVdef3(bdRdclEntity.getRdname());
 
                         //验证是否为指定的店铺，如果为true，则取结存价
                         Boolean isCheckShopChoose = balanceUnitPriceUtil.checkOfsShop(header.getStoreCode());

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java

@@ -1238,7 +1238,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
                 if ("tran".equals(sceneType)) {
                     passiveStorageResponseDataList = filterAfterSalesOrder(passiveStorageResponseDataList);
                 }
-                
+
                 //查询OFS售后订单对应的OFS销售订单
                 List<com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto> headerDetailsDtos = queryBatchOfsOrder(passiveStorageResponseDataList);
                 findOfsOrder(headerDetailsDtos, passiveStorageResponseDataList);

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java

@@ -1964,6 +1964,9 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
                     //店铺
                     salesInvoiceHeadDto.setPk_defdoc1(shopArchives.getPkDefdoc());
                     salesInvoiceHeadDto.setVdef1(shopArchives.getDocname());
+                    //收发类别
+                    salesInvoiceHeadDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());
+                    salesInvoiceHeadDto.setVdef3(bdRdclEntity.getRdname());
                     //单据红字标识
                     salesInvoiceHeadDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N主键"));
                     salesInvoiceHeadDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称"));
@@ -2846,9 +2849,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
     private void splicingPrintingOrderNumber(List<HeaderDetailsDto> headerDetailsDtoList, String sceneType, String startTime, String endTime, String code) {
         try {
             if (headerDetailsDtoList != null && headerDetailsDtoList.size() > 0) {
-                String codesJoined = headerDetailsDtoList.stream()
+                String codesJoined = headerDetailsDtoList.stream().map(HeaderDetailsDto::getHeader).map(HeaderDto::getCode).collect(Collectors.joining(","));
-                        .map(HeaderDetailsDto::getHeader)
-                        .map(HeaderDto::getCode).collect(Collectors.joining(","));
                 logger.info("{} 销售出库单号：{} 查询条件：{} ～ {} code：{}", sceneType, codesJoined, startTime, endTime, code);
             } else {
                 logger.info("{} 销售出库单号：{} 查询条件：{} ～ {} code：{}", sceneType, "无", startTime, endTime, code);

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java

@@ -1889,6 +1889,9 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
                         //平台
                         salesInvoiceHeadDto.setPk_defdoc2(platformArchives.getPkDefdoc());
                         salesInvoiceHeadDto.setVdef2(platformArchives.getDocname());
+                        //收发类别
+                        salesInvoiceHeadDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());
+                        salesInvoiceHeadDto.setVdef3(bdRdclEntity.getRdname());
                         //店铺
                         salesInvoiceHeadDto.setPk_defdoc1(shopArchives.getPkDefdoc());
                         salesInvoiceHeadDto.setVdef1(shopArchives.getDocname());

buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/SalesInvoiceHeadDto.java

@@ -40,5 +40,7 @@ public class SalesInvoiceHeadDto {
     private String dmakedate;
     private String dapprovedate;
     private String pk_defdoc16;
+    private String pk_defdoc3;
     private String vdef16;
+    private String vdef3;
 }