From cfff3b7b94db272b2f5cf60deeef50b22f218bcd Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 8 Apr 2025 23:04:58 +0800 Subject: [PATCH] 4/8 youahu 1.6 --- .../res/collect/CollectOrderBizResponse.java | 1 + .../collect/IoCollectOrderBackupService.java | 22 ------------------- .../collect/IoCollectOrderBizBackupMapper.xml | 1 + 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index 78a375f7b..e62e01acd 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -207,6 +207,7 @@ public class CollectOrderBizResponse { private Integer isSplit; + private Integer notCodeType; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 3677e8f92..a53fe4071 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -792,30 +792,8 @@ public class IoCollectOrderBackupService extends ServiceImpl filterorderStatsList(CollectOrderRequest collectOrderRequest) { List data = ioCollectOrderBackupMapper.filterorderStatsList(collectOrderRequest); -// for (IoCollectOrderResponse ioCollectOrderResponse : data){ -// Integer newScanCount = 0; -// Integer shouldCount = 0; -// List orderBizBackups = ioCollectOrderBizBackupService.listByBillNo(ioCollectOrderResponse.getBillNo()); -// // 遍历集合进行累加 -// for (IoCollectOrderBizBackup collectOrderBizResponse : orderBizBackups) { -// newScanCount += (collectOrderBizResponse.getScanCount() != null) ? collectOrderBizResponse.getScanCount() : 0; -// shouldCount += getCount(collectOrderBizResponse); -// } -// ioCollectOrderResponse.setScanCount(newScanCount); -// ioCollectOrderResponse.setShouldCount(shouldCount); -// ioCollectOrderResponse.setScanRate(getScanRate(shouldCount,newScanCount)); -// if (newScanCount == shouldCount){ -// ioCollectOrderResponse.setStorard(1); -// }else { -// ioCollectOrderResponse.setStorard(0); -// } -// } - - // 筛选 setStorard 为 1 的数据 List filteredData = new ArrayList<>(); - List filteredData1 = new ArrayList<>(); - List filteredData2 = new ArrayList<>(); for (IoCollectOrderResponse ioCollectOrderResponse : data) { Integer newScanCount = 0; Integer shouldCount = 0; diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml index d56bea6e3..dec688fe6 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml @@ -10,6 +10,7 @@ bp.packUnit, bp.prepnSpec, bp.manufactory, + bu.notCodeType, COALESCE(bp.bzgg,bp.ggxh) AS spec FROM io_collect_order_biz_backup icobb left join basic_udirel bu on icobb.relId = bu.id