From 14616a0300c7378ac12cf353a94155e3fea6f7f0 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 14 四月 2026 23:07:41 +0800
Subject: [PATCH] 云仓模拟视图数据sql
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 189 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 182 insertions(+), 7 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 8a7d865..763f398 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,8 +23,8 @@
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.mapper.MatnrMapper;
import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -69,7 +69,7 @@
@Autowired
private MatnrGroupService matnrGroupService;
@Autowired
- private MatnrServiceImpl matnrService;
+ private MatnrService matnrService;
@Autowired
private AsnOrderService asnOrderService;
@Autowired
@@ -122,6 +122,8 @@
private TaskItemService taskItemService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private MatnrMapper matnrMapper;
/**
* 浜戜粨鏀瑰崟/鍙栨秷鍓嶏細浠诲姟鏄庣粏宸插叧鑱旇鍗曟嵁涓斾富浠诲姟鏈�昏緫鍒犻櫎鍒欎笉鍏佽
@@ -165,6 +167,158 @@
return;
}
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 = matnrMapper.selectByCusItemSyncView(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 = matnrMapper.selectByCusItemSyncView(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);
+ }
+ }
}
/**
@@ -260,16 +414,18 @@
public void syncMatnrs(List<BaseMatParms> matnrs) {
List<Matnr> syncMatnrs = new ArrayList<>();
if (!matnrs.isEmpty()) {
+ assertUniqueMatnrInSyncList(matnrs);
matnrs.forEach(matnr -> {
Matnr mat = new Matnr();
if (Objects.isNull(matnr.getMatnr())) {
throw new RuntimeException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
}
BeanUtils.copyProperties(matnr, mat);
- mat.setCode(matnr.getMatnr()).setName(matnr.getMaktx());
+ mat.setCode(matnr.getMatnr()).setName(matnr.getMaktx())
+ .setBatch(matnrService.normalizeMatnrBatchValue(matnr.getBatch()));
if (!Objects.isNull(matnr.getGroupName())) {
MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnr.getGroupName()), false);
- if (Objects.isNull(matnrGroup)) {
+ if (!Objects.isNull(matnrGroup)) {
mat.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
}
}
@@ -278,6 +434,21 @@
if (!matnrService.saveOrUpdateBatch(syncMatnrs)) {
throw new CoolException("鐗╂枡淇℃伅淇濆瓨鎴愬姛锛侊紒");
+ }
+ }
+ }
+
+ private void assertUniqueMatnrInSyncList(List<BaseMatParms> matnrs) {
+ Set<String> keys = new HashSet<>();
+ for (BaseMatParms p : matnrs) {
+ if (StringUtils.isBlank(p.getMatnr())) {
+ continue;
+ }
+ String key = p.getMatnr().trim() + "\u0000" + matnrService.normalizeMatnrBatchValue(p.getBatch());
+ if (!keys.add(key)) {
+ throw new CoolException("鍚屾鍒楄〃涓墿鏂欑紪鐮佷笌鎵规閲嶅锛�" + p.getMatnr().trim()
+ + (StringUtils.isNotBlank(matnrService.normalizeMatnrBatchValue(p.getBatch()))
+ ? " / " + matnrService.normalizeMatnrBatchValue(p.getBatch()) : ""));
}
}
}
@@ -499,6 +670,8 @@
}
}
}
+ // 鎸夐厤缃悓姝ョ墿鏂欎富鏁版嵁锛坣one 鏃朵笉褰卞搷閫氱煡妗ｅ啓鍏ヤ富娴佺▼锛�
+ syncMatnrFromCusItemSyncViewByConfig(syncOrder.getOrderItems(), loginUserId);
WkOrder wkOrder = new WkOrder();
String wkTypeInput = syncOrder.getWkType();
String typeCode = StringUtils.isBlank(wkTypeInput) ? null : orderWorkTypeService.getTypeByLabel(wkTypeInput);
@@ -1310,7 +1483,7 @@
Integer operateType = baseMatParms.getOperateType();
// 3 绂佺敤 / 4 鍚敤锛氫粎鏇存柊鐘舵�侊紙status 1 姝ｅ父 0 鍐荤粨锛�
if (Integer.valueOf(3).equals(operateType) || Integer.valueOf(4).equals(operateType)) {
- Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
+ Matnr matnr = matnrService.getOneByCodeAndBatch(baseMatParms.getMatnr(), baseMatParms.getBatch());
if (matnr == null) {
throw new CoolException("鐗╂枡涓嶅瓨鍦紝鏃犳硶鎵ц绂佺敤/鍚敤锛侊紒");
}
@@ -1322,12 +1495,13 @@
return R.ok();
}
// 1 鏂板 / 2 淇敼 / 涓嶄紶锛氭湁鍒欐洿鏂般�佹棤鍒欐柊澧�
- Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
+ Matnr matnr = matnrService.getOneByCodeAndBatch(baseMatParms.getMatnr(), baseMatParms.getBatch());
if (Objects.isNull(matnr)) {
Matnr matnr1 = new Matnr();
BeanUtils.copyProperties(baseMatParms, matnr1);
matnr1.setCode(baseMatParms.getMatnr());
matnr1.setName(baseMatParms.getMaktx());
+ matnr1.setBatch(matnrService.normalizeMatnrBatchValue(baseMatParms.getBatch()));
if (!Objects.isNull(baseMatParms.getGroupName())) {
MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
.eq(MatnrGroup::getName, baseMatParms.getGroupName()));
@@ -1349,7 +1523,8 @@
matnr.setName(baseMatParms.getMaktx())
.setColor(baseMatParms.getColor())
.setModel(baseMatParms.getModel())
- .setSpec(baseMatParms.getSpec());
+ .setSpec(baseMatParms.getSpec())
+ .setBatch(matnrService.normalizeMatnrBatchValue(baseMatParms.getBatch()));
if (!matnrService.updateById(matnr)) {
throw new CoolException("鐗╂枡鏇存柊澶辫触锛侊紒");
--
Gitblit v1.9.1