UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、单据上传页面逻辑优化

Browse Source
dev_2.5_optimize_250306
qiuyt 4 months ago
parent 32eac9ebf5
commit ec71663650
2 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File

52
src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
Unescape Escape View File

@ -674,46 +674,38 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
Integer codeCount = 0; Integer codeCount = 0;
Integer fifoSplitOneCount = 0; Integer fifoSplitOneCount = 0;
Integer fifoSplitTwoCount = 0; Integer fifoSplitTwoCount = 0;
String sum = "sum"; String sum = "_sum";
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
BaseResponse<Map<String, String[]>> baseResponse = erpBasicClient.getBuyType("thirdId"); BaseResponse<Map<String, String[]>> baseResponse = erpBasicClient.getBuyType("thirdId");
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {
buyTypeMap = baseResponse.getData(); buyTypeMap = baseResponse.getData();
} }
Map<String, Integer> map = new HashMap(); Map<String, Integer> map = new HashMap();
for (IoCollectOrderResponse collectOrderResponse : list) { for (Map.Entry<String, String[]> entry : buyTypeMap.entrySet()) {
for (Map.Entry<String, String[]> entry : buyTypeMap.entrySet()) { String key = entry.getKey();
String key = entry.getKey(); if (ArrayUtil.isEmpty(entry.getValue())) {
if(ArrayUtil.isEmpty(entry.getValue())){ continue;
continue; }
} String result = String.join(", ", entry.getValue());
String result = String.join(", ", entry.getValue()); int sumCount = 0;
if (result.contains(collectOrderResponse.getBusType())) { int okCount = 0;
int count = 0;
if (collectOrderResponse.getRelCodeCount() != null && collectOrderResponse.getRelCodeCount() > 0) {
count += collectOrderResponse.getRelCodeCount();
} else {
count++;
} for (IoCollectOrderResponse collectOrderResponse : list) {
if (result.contains(collectOrderResponse.getBusType())) {
if (collectOrderResponse.getRelCodeCount() != null) {
if (2 == collectOrderResponse.getUploadStatus()) { if (2 == collectOrderResponse.getUploadStatus()) {
okCount += collectOrderResponse.getRelCodeCount();
map.put(key, count);
} }
map.put(key+sum, count); sumCount += collectOrderResponse.getRelCodeCount();
} }
}
} }
if (collectOrderResponse.getRelCodeCount() != null && collectOrderResponse.getRelCodeCount() > 0) { map.put(key , okCount);
codeCount += collectOrderResponse.getRelCodeCount(); map.put(key + sum, sumCount);
} else {
codeCount++;
}
} }
// 数据做处理 // 数据做处理
@ -736,17 +728,17 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
} }
if (key.equals("buyType_3502"+sum)) { if (key.equals("buyType_3502" + sum)) {
buyerScanSumCount += value; buyerScanSumCount += value;
} else if (key.equals("buyType_3504"+sum)) { } else if (key.equals("buyType_3504" + sum)) {
buyerScanSumCountReturn += value; buyerScanSumCountReturn += value;
} else if (key.equals("buyType_3505"+sum)) { } else if (key.equals("buyType_3505" + sum)) {
salesScanSumCount += value; salesScanSumCount += value;
} else if (key.equals("buyType_35051"+sum)) { } else if (key.equals("buyType_35051" + sum)) {
salesScanSumCount += value; salesScanSumCount += value;
} else if (key.equals("buyType_3506"+sum)) { } else if (key.equals("buyType_3506" + sum)) {
salesScanSumCountReturn += value; salesScanSumCountReturn += value;
} }

5
src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
Unescape Escape View File

@ -151,9 +151,8 @@
<select id="getList" resultType="com.glxp.api.res.collect.IoCollectOrderResponse"> <select id="getList" resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
SELECT SELECT
bac.*,(SELECT bac.*,(SELECT sum(IF( relCodeCount > 0, relCodeCount, 1 )) FROM
sum(IF( relCodeCount > 0, relCodeCount, 1 )) FROM io_collect_code_backup code_ba io_collect_code_backup code_ba where code_ba.billNo = bac.billNo ) as relCodeCount
LEFT JOIN io_collect_order_backup bac ON code_ba.billNo = bac.billNo ) as relCodeCount
FROM FROM
io_collect_order_backup bac io_collect_order_backup bac
<where> <where>

Write Preview
Loading…
Cancel
Save