From 6d67e37ab96516f127e1635e92518109fd1c926c Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 21 四月 2026 14:06:11 +0800
Subject: [PATCH] 料箱码查询优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 188 +++++++----------------------------------------
1 files changed, 28 insertions(+), 160 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 3340c13..da205ba 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -23,7 +23,6 @@
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
-import com.vincent.rsf.server.manager.service.CusItemSyncViewQueryService;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
@@ -123,7 +122,7 @@
@Autowired
private TaskService taskService;
@Autowired
- private CusItemSyncViewQueryService cusItemSyncViewQueryService;
+ private CusBarcodeSyncMatnrService cusBarcodeSyncMatnrService;
/**
* 浜戜粨鏀瑰崟/鍙栨秷鍓嶏細浠诲姟鏄庣粏宸插叧鑱旇鍗曟嵁涓斾富浠诲姟鏈�昏緫鍒犻櫎鍒欎笉鍏佽
@@ -169,156 +168,8 @@
assertWkOrderExceStatusUnexecuted(order, "鍙栨秷");
}
- private CusItemSyncMode resolveCusItemSyncMode() {
- Config c = configService.getOne(new LambdaQueryWrapper<Config>()
- .eq(Config::getFlag, GlobalConfigCode.CUS_ITEM_SYNC_MODE)
- .eq(Config::getDeleted, 0), false);
- if (c == null) {
- return CusItemSyncMode.NONE;
- }
- return CusItemSyncMode.fromConfig(c.getVal());
- }
-
- private static Map<String, SyncOrdersItem> buildOrderItemByMatnrCode(List<SyncOrdersItem> orderItems) {
- Map<String, SyncOrdersItem> map = new LinkedHashMap<>();
- if (orderItems == null) {
- return map;
- }
- for (SyncOrdersItem item : orderItems) {
- if (StringUtils.isBlank(item.getMatnr())) {
- continue;
- }
- map.putIfAbsent(item.getMatnr().trim(), item);
- }
- return map;
- }
-
- /**
- * 鎸夎鍥捐鏇存柊/鎻掑叆鐗╂枡涓绘暟鎹紙涓庨�氱煡妗ｆ棤鍏筹級銆�
- */
- private void applyCusItemViewRowsToMatnr(List<Map<String, Object>> viewItems, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
- if (viewItems == null || viewItems.isEmpty()) {
- return;
- }
- for (Map<String, Object> row : viewItems) {
- String itemNo = StringUtils.trimToNull(Objects.toString(row.get("item_no"), null));
- if (itemNo == null) {
- continue;
- }
- SyncOrdersItem syncItem = orderItemByCode.get(itemNo);
- String viewSpec = StringUtils.trimToEmpty(Objects.toString(row.get("item_spec"), ""));
- String viewUnit = StringUtils.trimToNull(Objects.toString(row.get("unit_no"), null));
- String incomingName = syncItem == null ? null : StringUtils.trimToNull(syncItem.getMaktx());
- Matnr local = matnrService.getOneByCodeAndBatch(itemNo, "");
- if (local == null) {
- Matnr matnr = new Matnr();
- matnr.setCode(itemNo)
- .setBatch("")
- .setName(incomingName != null ? incomingName : itemNo)
- .setSpec(viewSpec)
- .setUnit(viewUnit)
- .setStockUnit(viewUnit)
- .setStatus(1)
- .setCreateBy(loginUserId)
- .setUpdateBy(loginUserId)
- .setCreateTime(new Date())
- .setUpdateTime(new Date());
- matnrService.save(matnr);
- continue;
- }
- boolean nameDiff = incomingName != null
- && !StringUtils.equals(StringUtils.trimToEmpty(local.getName()), incomingName);
- boolean specDiff = !StringUtils.equals(StringUtils.trimToEmpty(local.getSpec()), viewSpec);
- boolean unitDiff = viewUnit != null
- && (!StringUtils.equals(StringUtils.trimToEmpty(local.getUnit()), viewUnit)
- || !StringUtils.equals(StringUtils.trimToEmpty(local.getStockUnit()), viewUnit));
- if (!nameDiff && !specDiff && !unitDiff) {
- continue;
- }
- Matnr update = new Matnr();
- update.setId(local.getId());
- if (nameDiff) {
- update.setName(incomingName);
- }
- if (specDiff) {
- update.setSpec(viewSpec);
- }
- if (unitDiff) {
- update.setUnit(viewUnit).setStockUnit(viewUnit);
- }
- update.setUpdateBy(loginUserId).setUpdateTime(new Date());
- matnrService.updateById(update);
- }
- }
-
- /**
- * 鎸夐厤缃鐞嗚鍥句笌鐗╂枡琛ㄣ��
- */
private void syncMatnrFromCusItemSyncViewByConfig(List<SyncOrdersItem> orderItems, Long loginUserId) {
- if (orderItems == null || orderItems.isEmpty()) {
- return;
- }
- List<String> matnrCodes = orderItems.stream()
- .map(SyncOrdersItem::getMatnr)
- .filter(StringUtils::isNotBlank)
- .map(String::trim)
- .distinct()
- .collect(Collectors.toList());
- if (matnrCodes.isEmpty()) {
- return;
- }
- CusItemSyncMode mode = resolveCusItemSyncMode();
- Map<String, SyncOrdersItem> orderItemByCode = buildOrderItemByMatnrCode(orderItems);
-
- if (mode == CusItemSyncMode.NONE) {
- syncMatnrNonForceFromView(matnrCodes, orderItemByCode, loginUserId);
- return;
- }
-
- List<Map<String, Object>> viewItems = cusItemSyncViewQueryService.listByItemNos(matnrCodes);
- Set<String> inView = viewItems == null ? Collections.emptySet() : viewItems.stream()
- .map(r -> StringUtils.trimToNull(Objects.toString(r.get("item_no"), null)))
- .filter(Objects::nonNull)
- .collect(Collectors.toSet());
-
- for (String code : matnrCodes) {
- if (!inView.contains(code)) {
- throw new CoolException("鐗╂枡鏈湪瑙嗗浘 cus_item_sync_view 涓細" + code);
- }
- }
- applyCusItemViewRowsToMatnr(viewItems, orderItemByCode, loginUserId);
- }
-
- /**
- * 涓嶅己鍒讹細瑙嗗浘鑳芥煡鍒板垯鏂板/鏇存柊鐗╂枡琛紱鏌ヤ笉鍒扮殑缂栫爜鍐嶆煡鐗╂枡琛紝瀛樺湪鍒欐斁琛屻��
- */
- private void syncMatnrNonForceFromView(List<String> matnrCodes, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
- List<Map<String, Object>> viewItems = null;
- try {
- viewItems = cusItemSyncViewQueryService.listByItemNos(matnrCodes);
- } catch (Exception ex) {
- log.warn("鏌ヨ cus_item_sync_view 澶辫触锛屽皢浠呮寜鐗╂枡琛ㄦ牎楠岋細{}", ex.getMessage());
- }
- Set<String> inView = viewItems == null ? Collections.emptySet() : viewItems.stream()
- .map(r -> StringUtils.trimToNull(Objects.toString(r.get("item_no"), null)))
- .filter(Objects::nonNull)
- .collect(Collectors.toSet());
- if (viewItems != null && !viewItems.isEmpty()) {
- try {
- applyCusItemViewRowsToMatnr(viewItems, orderItemByCode, loginUserId);
- } catch (Exception ex) {
- log.warn("鎸夎鍥惧啓鍏ョ墿鏂欎富鏁版嵁澶辫触锛歿}", ex.getMessage());
- }
- }
- for (String code : matnrCodes) {
- if (inView.contains(code)) {
- continue;
- }
- Matnr m = matnrService.getOneByCodeAndBatch(code, "");
- if (m == null) {
- throw new CoolException("鐗╂枡涓嶅瓨鍦細" + code);
- }
- }
+ cusBarcodeSyncMatnrService.syncFromOrderItems(orderItems, loginUserId);
}
/**
@@ -494,7 +345,9 @@
public R syncLocsDetl(PageParam<Loc, BaseParam> pageParam, QueryWrapper<Loc> wrapper) {
Page<Object> page = new Page<>();
page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
- IPage<LocStockDto> locStocks = locService.getLocDetls(page);
+ BaseParam bp = pageParam.getWhere();
+ Map<String, Object> conds = bp != null && bp.getMap() != null ? bp.getMap() : Collections.emptyMap();
+ IPage<LocStockDto> locStocks = locService.getLocDetls(page, conds);
return R.ok().add(locStocks);
}
@@ -1553,18 +1406,32 @@
if (!Cools.isEmpty(param.getPlanNo())) {
wrapper.eq(LocItem::getPlatWorkCode, param.getPlanNo());
}
+ // 浠撳簱銆佹枡绠辩爜鎸夊簱浣� id 浜ら泦杩囨护
+ List<Long> allowedLocIds = null;
if (!Cools.isEmpty(param.getWareHouseId())) {
Warehouse wh = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, param.getWareHouseId()));
- if (wh != null) {
- List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
- if (!locs.isEmpty()) {
- wrapper.in(LocItem::getLocId, locs.stream().map(Loc::getId).collect(Collectors.toList()));
- } else {
- return R.ok().add(Collections.emptyList());
- }
- } else {
+ if (wh == null) {
return R.ok().add(Collections.emptyList());
}
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
+ if (locs.isEmpty()) {
+ return R.ok().add(Collections.emptyList());
+ }
+ allowedLocIds = locs.stream().map(Loc::getId).collect(Collectors.toList());
+ }
+ if (!Cools.isEmpty(param.getBarcode())) {
+ LambdaQueryWrapper<Loc> lw = new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, param.getBarcode());
+ if (allowedLocIds != null) {
+ lw.in(Loc::getId, allowedLocIds);
+ }
+ List<Loc> locs = locService.list(lw);
+ if (locs.isEmpty()) {
+ return R.ok().add(Collections.emptyList());
+ }
+ allowedLocIds = locs.stream().map(Loc::getId).collect(Collectors.toList());
+ }
+ if (allowedLocIds != null) {
+ wrapper.in(LocItem::getLocId, allowedLocIds);
}
List<LocItem> list = locItemService.list(wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -1580,6 +1447,7 @@
row.put("wareHouseId", null);
row.put("wareHouseName", null);
}
+ row.put("barcode", loc != null ? loc.getBarcode() : null);
row.put("palletId", item.getTrackCode());
row.put("matNr", item.getMatnrCode());
row.put("makTx", item.getMaktx());
--
Gitblit v1.9.1