fix(buildpackage): 修复 TOC 冲发出商品红蓝单据标识错误

- 修改 u8cOperationFlowV2 方法，将红字标识从 N 改为 Y
- 更新销售订单父对象的红字标识设置
- 注释掉销售订单子对象的红字标识设置
- 优化采购订单类型的判断逻辑
- 删除测试代码中的无用注释

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

@@ -1833,7 +1833,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
      *
      * @author liuyang
      */
-    private BdBusitypeEntity u8cOperationFlowV2() throws Exception {
+    public BdBusitypeEntity u8cOperationFlowV2() throws Exception {
         String processName = "TOC冲发出商品";
         BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName);
         Assert.notNull(bdBusitypeEntity, "根据业务流程名称({})没有查询到业务流程", processName);
@@ -2272,8 +2272,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.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y主键"));
-                                saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称"));
+                                saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y名称"));
                                 saleorderRequestDto.setParentvo(saleorderRequestParentDto);
 
                                 List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();
@@ -2336,6 +2336,8 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
 
 //                                saleorderRequestChildrenDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目
 //                                saleorderRequestChildrenDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj());
+//                                saleorderRequestChildrenDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N主键"));
+//                                saleorderRequestChildrenDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称"));
                                 //如果优惠金额为0，则传0
                                 if (sonDetailsDto.getVdef4() != null) {
                                     saleorderRequestChildrenDto.setVdef4("-" + new BigDecimal(sonDetailsDto.getVdef4()).stripTrailingZeros().toPlainString());
@@ -2559,6 +2561,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主键"));//单据红字标识=N
+                                saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称"));
                                 saleorderRequestDto.setParentvo(saleorderRequestParentDto);
 
                                 List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();
@@ -2609,7 +2613,6 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
 //                            saleorderRequestChildrenDto.setNoriginalcurprice(noriginalcurprice.stripTrailingZeros().toPlainString());//无税单价
 //                                saleorderRequestChildrenDto.setNoriginalcursummny(noriginalcursummny.stripTrailingZeros().toPlainString());//价税合计
                                 saleorderRequestChildrenDto.setNoriginalcursummny(sonDetailsDto.getGroupTotalPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString());//价税合计 新逻辑
-
 //                                saleorderRequestChildrenDto.setNoriginalcurtaxmny(noriginalcurtaxmny.stripTrailingZeros().toPlainString());//税额
 //                                saleorderRequestChildrenDto.setNoriginalcurtaxnetprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税净价
 //                                saleorderRequestChildrenDto.setNoriginalcurtaxprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税单价

buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java

@@ -700,10 +700,10 @@ public class QueryU8CEntityUtil {
 
         String busicode = null;
         if ("DLCG".equals(purchaseOrderType)) {
-            //O 代理采购 -> 渠道品牌采购
+            //O 代理采购 -> U渠道品牌采购
             busicode = "DLCG";
         } else if ("CPCG".equals(purchaseOrderType)) {
-            //O 成品采购 -> 自主品牌采购
+            //O 成品采购 -> U自主品牌采购
             busicode = "ZZCG";
         } else {
             Assert.state(false, "无法识别的O采购类型{}", purchaseOrderType);

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java

@@ -111,7 +111,7 @@ class SoSaleOutPluginInitializerToCTest {
 //        soSaleOutPluginInitializerToC.startImplementStockByCode(s, "tran");
 
         try {
-            soSaleOutPluginInitializerToC.startImplementStockByTime("2025-02-18 11:54:18", "2025-02-18 11:54:18", "0");
+//            soSaleOutPluginInitializerToC.startImplementStockByTime("2025-02-18 11:54:18", "2025-02-18 11:54:18", "0");
 //            String code = "LETS-SH2024052100015139";
 //            soSaleOutPluginInitializerToC.startImplementStockByCode(code, "tran");
 
@@ -139,9 +139,9 @@ class SoSaleOutPluginInitializerToCTest {
 
 //            soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2025012300026949", "tran");
 
-//            String processName = "TOC确认收入";
+            String processName = "TOC确认收入";
-//            BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName);
+            BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName);
-//            System.out.println(bdBusitypeEntity.getPkBusitype());
+            System.out.println(bdBusitypeEntity.getPkBusitype());
         } catch (Exception e) {
             e.printStackTrace();
         }