refactor(sales): 重构公司档案对照逻辑

- 注释掉 OfsPassiveorderDetailEntity.xml 中的排序逻辑 - 移除 PassiveWarehouseReceiptToC、SoSaleOutPluginInitializerToC 和 SoSaleReturnPluginInitializerToC 中的公司档案对照代码 - 注释掉 QueryU8CEntityUtil 中的 queryBdDefDocByPkDefDocList 方法 - 修改 PassiveWarehouseReceiptToC 中的退款时间设置逻辑，增加空值判断
2025-03-13 17:18:46 +08:00 · 2025-03-13 17:18:46 +08:00 · 7b9083b699
parent 3c5c54a5f7
commit 7b9083b699
6 changed files with 46 additions and 43 deletions
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderDetailEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderDetailEntity.xml
@ -85,8 +85,8 @@
            <if test="newsystemprimary2 != null and newsystemprimary2 != ''"> and newsystemprimary2 = #{newsystemprimary2} </if>
            <if test="ids!=null and ids!=''">and id in (${ids})</if>
    </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>
    
 <!-- 查询符合条件的数量 -->
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java
@ -479,9 +479,9 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
                    Assert.notNull(details1.getId(), "O明细主键不能为空！");
                    Assert.state(!"".equals(details1.getId()), "O明细主键不能为空！");

-                    idStr.append("'");
+//                    idStr.append("'");
                    idStr.append(details1.getId());
-                    idStr.append("'");
+//                    idStr.append("'");
                    idStr.append(",");
                }
            }
@ -1238,7 +1238,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
                CacheTocMapVoV2 cacheTocMapVoV2 = passiveComponentsArchivesCacheUtil.initCache(passiveStorageResponseDataList);

                //初始化公司档案对照关系
-                Map<String, String> comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll();
+//                Map<String, String> comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll();

                for (int i = 0; i < passiveStorageResponseDataList.size(); i++) {
                    PassiveStorageResponse.Data data = passiveStorageResponseDataList.get(i);
@ -1271,10 +1271,10 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
                        String companyCode = header.getCompanyCode();
                        Assert.notNull(companyCode, "O货主编码不能为空");
                        //查找是否替换公司
-                        String targetCorp = comparisonCompanyArchives.get(companyCode);
-                        if (targetCorp != null) {
-                            companyCode = targetCorp;
-                        }
+//                        String targetCorp = comparisonCompanyArchives.get(companyCode);
+//                        if (targetCorp != null) {
+//                            companyCode = targetCorp;
+//                        }
                        BdCorpEntity bdCorpEntity = cacheTocMapVoV2.getStringBdCorpEntityMap().get(companyCode.trim());
                        Assert.notNull(bdCorpEntity, "根据O公司编码(货主编码)({})没有匹配到U8C公司档案", header.getCompanyCode());

@ -1987,8 +1987,10 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
                            List<RerturnGoodsOrderSearchDetails> details1 = rerturnGoodsOrderSearchData.getDetails();

                            String refundedAt = header1.getRefundedAt();
-                            for (PassiveStorageResponse.Details passiveStorage : details) {
-                                passiveStorage.setRefundedAt(refundedAt);
+                            if (refundedAt != null) {
+                                for (PassiveStorageResponse.Details passiveStorage : details) {
+                                    passiveStorage.setRefundedAt(refundedAt);
+                                }
                            }
                        }
                    }
--- 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
@ -1445,7 +1445,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
                //计算OFS销售订单邮费分摊
                ofsOrderSalePostageFeeAllocationUtil.batchTocSalesPostageFeeAllocation(headerDetailsDtos);
                //初始化公司档案对照关系
-                Map<String, String> comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll();
+//                Map<String, String> comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll();

                for (int i = 0; i < headerDetailsDtoList.size(); i++) {
                    HeaderDetailsDto headerDetailsDto = headerDetailsDtoList.get(i);
@ -1473,10 +1473,10 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
                        Assert.notNull(companyCode, "O出库单表头货主不能为空！");

                        //查找是否替换公司
-                        String targetCorp = comparisonCompanyArchives.get(companyCode);
-                        if (targetCorp != null) {
-                            companyCode = targetCorp;
-                        }
+//                        String targetCorp = comparisonCompanyArchives.get(companyCode);
+//                        if (targetCorp != null) {
+//                            companyCode = targetCorp;
+//                        }

                        BdCorpEntity bdCorpEntity = cacheTocMapVo.getStringBdCorpEntityMap().get(companyCode.trim());
                        Assert.notNull(bdCorpEntity, "根据公司编码({})没有匹配到U8C公司档案(公司编码=O货主)", companyCode);
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
@ -1387,7 +1387,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                //计算OFS销售订单优惠金额分摊到明细行
 //                ofsOrderAfterSalesAmountAllocationUtil.batchTocSalesAmountAllocation(rerturnGoodsOrderSearchData);
                //初始化公司档案对照关系
-                Map<String, String> comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll();
+//                Map<String, String> comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll();

                //测试
 //                StockinOrderSearchResponse.StockinOrder stockinOrder1 = returnGoodHeaderDetailsDataDtoList1.get(0);
@ -1423,10 +1423,10 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                        String companyCode = header.getCompanyCode();
                        Assert.notNull(companyCode, "O货主编码不能为空");
                        //查找是否替换公司
-                        String targetCorp = comparisonCompanyArchives.get(companyCode);
-                        if (targetCorp != null) {
-                            companyCode = targetCorp;
-                        }
+//                        String targetCorp = comparisonCompanyArchives.get(companyCode);
+//                        if (targetCorp != null) {
+//                            companyCode = targetCorp;
+//                        }
                        BdCorpEntity bdCorpEntity = cacheTocMapVoV2.getStringBdCorpEntityMap().get(companyCode.trim());
                        Assert.notNull(bdCorpEntity, "根据O公司编码(货主编码)({})没有匹配到U8C公司档案", header.getCompanyCode());

--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java
@ -368,28 +368,29 @@ public class QueryU8CEntityUtil {
     * @return corpCode 如果时需要转换的会自动转换，如果不需要返回原始公司编码
     */
    public String queryBdDefDocByPkDefDocList(String corpCode) {
-        Assert.notNull(corpCode, "公司三对一,入参公司不能为空！！！");
-
-        BdDefdocEntity bdDefdocEntity = new BdDefdocEntity();
-        bdDefdocEntity.setPkDefdoclist(OverallConstant.getOverAllValue("u8c自定义项档案-公司对照"));
-//        bdDefdocEntity.setDr(0);
-        bdDefdocEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
-        bdDefdocEntity.setDoccode(corpCode.trim());
-        List<BdDefdocEntity> bdDefdocEntityList = iBdDefdocDao.query(bdDefdocEntity);
-        if (bdDefdocEntityList != null && bdDefdocEntityList.size() == 1) {
-//            Assert.state(false, "根据：自定义档案列表编码：GSDY，主键：[{}]，未查询到自定义档案", OverallConstant.getOverAllValue("u8c自定义项档案-公司对照"));
-            BdDefdocEntity bdDefdocEntity1 = bdDefdocEntityList.get(0);
-            String memo = bdDefdocEntity1.getMemo();
-            if (memo != null && !"".equals(memo)) {
-                String[] split = memo.split(",");
-                if (split.length > 0) {
-                    return split[0];
-                }
-            }
-        } else if (bdDefdocEntityList != null && bdDefdocEntityList.size() >= 2) {
-            Assert.state(false, "存在歧义的匹配关系 公司编码：{}存在{}行对照关系！", corpCode);
-        }
        return corpCode;
+//        Assert.notNull(corpCode, "公司三对一,入参公司不能为空！！！");
+//
+//        BdDefdocEntity bdDefdocEntity = new BdDefdocEntity();
+//        bdDefdocEntity.setPkDefdoclist(OverallConstant.getOverAllValue("u8c自定义项档案-公司对照"));
+////        bdDefdocEntity.setDr(0);
+//        bdDefdocEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
+//        bdDefdocEntity.setDoccode(corpCode.trim());
+//        List<BdDefdocEntity> bdDefdocEntityList = iBdDefdocDao.query(bdDefdocEntity);
+//        if (bdDefdocEntityList != null && bdDefdocEntityList.size() == 1) {
+////            Assert.state(false, "根据：自定义档案列表编码：GSDY，主键：[{}]，未查询到自定义档案", OverallConstant.getOverAllValue("u8c自定义项档案-公司对照"));
+//            BdDefdocEntity bdDefdocEntity1 = bdDefdocEntityList.get(0);
+//            String memo = bdDefdocEntity1.getMemo();
+//            if (memo != null && !"".equals(memo)) {
+//                String[] split = memo.split(",");
+//                if (split.length > 0) {
+//                    return split[0];
+//                }
+//            }
+//        } else if (bdDefdocEntityList != null && bdDefdocEntityList.size() >= 2) {
+//            Assert.state(false, "存在歧义的匹配关系 公司编码：{}存在{}行对照关系！", corpCode);
+//        }
+//        return corpCode;
 //        List<String> corpCollect = bdDefdocEntityList.stream().map(BdDefdocEntity::getDoccode).collect(Collectors.toList());
 //        if (corpCollect.contains(corpCode)) {
 //            String memo = bdDefdocEntityList.get(0).getMemo();
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToCTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToCTest.java
@ -27,7 +27,7 @@ public class PassiveWarehouseReceiptToCTest {
    @Test
    public void startImplementStockByTime() {
        try {
-//            passiveWarehouseReceiptToC.startImplementStockByTime("2025-03-11 00:00:00", "2025-03-11 23:59:59");
+            passiveWarehouseReceiptToC.startImplementStockByTime("2025-03-11 22:27:02", "2025-03-11 22:27:02");
        } catch (Exception e) {
            e.printStackTrace();
        }