新增销售出库和退货单据的红字标识

在销售出库和退货单据中添加红字标识自定义项，区分正常单据和红字单据。新增代码包括在销售出库和退货单据的初始化方法中设置红字标识，并在销售发票头部DTO中添加相关字段。同时，在常量类OverallConstant中新增红字标识的键值对。

buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java

@@ -97,6 +97,12 @@ public class OverallConstant {
         devOverAll.put("u8c自定义项档案-平台主键", "0001A110000000000EEU");
         devOverAll.put("u8c自定义项档案-存货分类对应收支项目主键", "0001A210000000008FBN");
 
+        devOverAll.put("u8c自定义项档案-单据红字标识-Y主键", "0001A1100000000027LP");
+        devOverAll.put("u8c自定义项档案-单据红字标识-Y名称", "Y");
+
+        devOverAll.put("u8c自定义项档案-单据红字标识-N主键", "0001A1100000000027LQ");
+        devOverAll.put("u8c自定义项档案-单据红字标识-N名称", "N");
+
         //中台地址
         devOverAll.put("u8c_url", "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface");
     }
@@ -124,6 +130,12 @@ public class OverallConstant {
         prodOverAll.put("u8c自定义项档案-平台主键", "0001A110000000000EEU");
         prodOverAll.put("u8c自定义项档案-存货分类对应收支项目主键", "0001A210000000008FBN");
 
+        prodOverAll.put("u8c自定义项档案-单据红字标识-Y主键", "0001A1100000000027LP");
+        prodOverAll.put("u8c自定义项档案-单据红字标识-Y名称", "Y");
+
+        prodOverAll.put("u8c自定义项档案-单据红字标识-N主键", "0001A1100000000027LQ");
+        prodOverAll.put("u8c自定义项档案-单据红字标识-N名称", "N");
+
         //中台地址
 //        prodOverAll.put("u8c_url", "http://127.0.0.1:8081/kangarooDataCenterV3/entranceController/externalCallInterface");
         prodOverAll.put("u8c_url", "http://ufidahz.com.cn:9067/kangarooDataCenterV3/entranceController/externalCallInterface");

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

@@ -735,6 +735,10 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
                         saleorderRequestParentDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());
                         saleorderRequestParentDto.setVdef3(bdRdclEntity.getRdname());
 
+                        //单据红字标识
+                        saleorderRequestParentDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N主键"));
+                        saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称"));
+
                         saleorderRequestDto.setParentvo(saleorderRequestParentDto);
 
                         List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();
@@ -1828,7 +1832,10 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
                     //店铺
                     salesInvoiceHeadDto.setPk_defdoc1(shopArchives.getPkDefdoc());
                     salesInvoiceHeadDto.setVdef1(shopArchives.getDocname());
-
+                    //单据红字标识
+                    salesInvoiceHeadDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N主键"));
+                    salesInvoiceHeadDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称"));
+                    
                     List<SalesInvoiceBodyDto> salesInvoiceBodyDtoList = new ArrayList<>();
                     for (int j = 0; j < details.size(); j++) {
                         DetailsDto detailsDto = details.get(j);
@@ -1898,7 +1905,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
 
                     Map<String, List<SalesInvoiceDto>> stringListMap = new HashMap<>();
                     stringListMap.put("billvos", salesInvoiceDtoList);
-                    
+
                     //推送到U8C之前，再次验证，在U8C是否已经存在
                     synchronized (PUSH_LOCK2) {
                         Boolean aBoolean = checkTobSalesInvoice(header.getId(), header.getCode());

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

@@ -755,6 +755,10 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
                             saleorderRequestParentDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());
                             saleorderRequestParentDto.setVdef3(bdRdclEntity.getRdname());
 
+                            //单据红字标识
+                            saleorderRequestParentDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N主键"));
+                            saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称"));
+
                             saleorderRequestDto.setParentvo(saleorderRequestParentDto);
 
                             List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();
@@ -1559,6 +1563,8 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
                                 saleorderRequestParentDto.setVdef1(shopArchives.getDocname());//店铺
                                 saleorderRequestParentDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());//收发类别
                                 saleorderRequestParentDto.setVdef3(bdRdclEntity.getRdname());
+                                saleorderRequestParentDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N主键"));
+                                saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称"));
                                 saleorderRequestDto.setParentvo(saleorderRequestParentDto);
 
                                 List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();

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

@@ -726,6 +726,10 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
                         saleorderRequestParentDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());
                         saleorderRequestParentDto.setVdef3(bdRdclEntity.getRdname());
 
+                        //单据红字标识
+                        saleorderRequestParentDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y主键"));
+                        saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y名称"));
+
                         saleorderRequestDto.setParentvo(saleorderRequestParentDto);
 
                         List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();
@@ -1772,6 +1776,9 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
                         //店铺
                         salesInvoiceHeadDto.setPk_defdoc1(shopArchives.getPkDefdoc());
                         salesInvoiceHeadDto.setVdef1(shopArchives.getDocname());
+                        //单据红字标识
+                        salesInvoiceHeadDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y主键"));
+                        salesInvoiceHeadDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y名称"));
 
                         List<SalesInvoiceBodyDto> salesInvoiceBodyDtoList = new ArrayList<>();
                         for (int j = 0; j < details.size(); j++) {

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

@@ -612,6 +612,10 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                             saleorderRequestParentDto.setPk_defdoc1(shopArchives.getPkDefdoc());
                             saleorderRequestParentDto.setVdef1(shopArchives.getDocname());
 
+                            //单据红字标识
+                            saleorderRequestParentDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y主键"));
+                            saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y名称"));
+
                             saleorderRequestDto.setParentvo(saleorderRequestParentDto);
 
                             List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();
@@ -794,6 +798,10 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                             saleorderRequestParentDto.setPk_defdoc1(shopArchives.getPkDefdoc());
                             saleorderRequestParentDto.setVdef1(shopArchives.getDocname());
 
+                            //单据红字标识
+                            saleorderRequestParentDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y主键"));
+                            saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y名称"));
+
                             saleorderRequestDto.setParentvo(saleorderRequestParentDto);
 
                             List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();

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

@@ -39,4 +39,6 @@ public class SalesInvoiceHeadDto {
     private String creceipttype;
     private String dmakedate;
     private String dapprovedate;
+    private String pk_defdoc16;
+    private String vdef16;
 }