Browse Source

2026-11-12

标签变动记录页面下方页签增加上级标签号
master
fengyuan_yang 4 days ago
parent
commit
770dd97604
  1. 5
      src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java
  2. 61
      src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java
  3. 17
      src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml

5
src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java

@ -28,6 +28,11 @@ public interface LabelTransactionLogMapper {
*/ */
BigDecimal queryTotalRollQty(@Param("query") Map<String, Object> params); BigDecimal queryTotalRollQty(@Param("query") Map<String, Object> params);
/**
* 按标签批量查询实时库存上级标签号
*/
List<Map<String, Object>> listParentRollNo(Map<String, Object> params);
/** /**
* 调用单据回冲存储过程 * 调用单据回冲存储过程
*/ */

61
src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java

@ -14,8 +14,11 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* 标签变动记录Service实现类 * 标签变动记录Service实现类
@ -39,7 +42,63 @@ public class LabelTransactionLogServiceImpl implements LabelTransactionLogServic
@Override @Override
public List<Map<String, Object>> queryList(Map<String, Object> params) { public List<Map<String, Object>> queryList(Map<String, Object> params) {
return labelTransactionLogMapper.queryList(params);
List<Map<String, Object>> list = labelTransactionLogMapper.queryList(params);
if (isNeedParentRollNo(params)) {
fillParentRollNo(list);
}
return list;
}
private boolean isNeedParentRollNo(Map<String, Object> params) {
Object flag = params == null ? null : params.get("needParentRollNo");
return Boolean.TRUE.equals(flag) || "true".equalsIgnoreCase(String.valueOf(flag));
}
private void fillParentRollNo(List<Map<String, Object>> list) {
if (list == null || list.isEmpty()) {
return;
}
Map<String, Set<String>> rollNoGroup = new LinkedHashMap<>();
for (Map<String, Object> row : list) {
String site = stringValue(row.get("site"));
String buNo = stringValue(row.get("buNo"));
String rollNo = stringValue(row.get("rollNo"));
if (site.isEmpty() || buNo.isEmpty() || rollNo.isEmpty()) {
continue;
}
rollNoGroup.computeIfAbsent(site + "\u0001" + buNo, key -> new HashSet<>()).add(rollNo);
}
Map<String, String> parentRollMap = new HashMap<>();
for (Map.Entry<String, Set<String>> entry : rollNoGroup.entrySet()) {
String[] key = entry.getKey().split("\u0001", 2);
List<String> rollNoList = new ArrayList<>(entry.getValue());
int batchSize = 500;
for (int start = 0; start < rollNoList.size(); start += batchSize) {
List<String> batch = rollNoList.subList(start, Math.min(start + batchSize, rollNoList.size()));
Map<String, Object> query = new HashMap<>();
query.put("site", key[0]);
query.put("buNo", key[1]);
query.put("rollNoList", batch);
List<Map<String, Object>> parentList = labelTransactionLogMapper.listParentRollNo(query);
if (parentList == null) {
continue;
}
for (Map<String, Object> parentRow : parentList) {
parentRollMap.put(
stringValue(parentRow.get("site")) + "\u0001" + stringValue(parentRow.get("buNo")) + "\u0001" + stringValue(parentRow.get("rollNo")),
stringValue(parentRow.get("parentRollNo"))
);
}
}
}
for (Map<String, Object> row : list) {
String mapKey = stringValue(row.get("site")) + "\u0001" + stringValue(row.get("buNo")) + "\u0001" + stringValue(row.get("rollNo"));
row.put("parentRollNo", parentRollMap.getOrDefault(mapKey, ""));
}
}
private String stringValue(Object value) {
return value == null ? "" : String.valueOf(value).trim();
} }
@Override @Override

17
src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml

@ -236,6 +236,23 @@
</if> </if>
</select> </select>
<!-- 按当前页标签批量取实时库存的上级标签号 -->
<select id="listParentRollNo" resultType="java.util.Map">
SELECT
site,
bu_no AS buNo,
roll_no AS rollNo,
MAX(parent_roll_no) AS parentRollNo
FROM inventory_stock
WHERE site = #{site}
AND bu_no = #{buNo}
AND roll_no IN
<foreach collection="rollNoList" item="rollNo" open="(" separator="," close=")">
#{rollNo}
</foreach>
GROUP BY site, bu_no, roll_no
</select>
<!-- 调用变动记录回滚操作存储过程 --> <!-- 调用变动记录回滚操作存储过程 -->
<select id="reverseInboundByTransaction" statementType="CALLABLE" parameterType="java.util.Map" resultType="java.util.Map"> <select id="reverseInboundByTransaction" statementType="CALLABLE" parameterType="java.util.Map" resultType="java.util.Map">
{call UspReverseInboundByTransaction( {call UspReverseInboundByTransaction(

Loading…
Cancel
Save