From 08ba24466d017583c63540228c8e1f622c579eed Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 14 四月 2026 22:07:36 +0800
Subject: [PATCH] 云仓模拟视图数据
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrMapper.java | 15 +++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java | 7 ++
3 files changed, 179 insertions(+), 0 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 db3b68b..2b0cb04 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,6 +23,7 @@
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.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
@@ -121,6 +122,8 @@
private TaskItemService taskItemService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private MatnrMapper matnrMapper;
/**
* 浜戜粨鏀瑰崟/鍙栨秷鍓嶏細浠诲姟鏄庣粏宸插叧鑱旇鍗曟嵁涓斾富浠诲姟鏈�昏緫鍒犻櫎鍒欎笉鍏佽
@@ -164,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);
+ }
+ }
}
/**
@@ -515,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);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrMapper.java
index bfc59f1..4c8a435 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrMapper.java
@@ -9,8 +9,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
+import java.util.Collection;
+import java.util.List;
import java.util.Map;
@Mapper
@@ -18,4 +21,16 @@
public interface MatnrMapper extends BaseMapper<Matnr> {
IPage<Map<String, Object>> selectMatnrs(PageParam<Matnr, BaseParam> pages, @Param(Constants.WRAPPER) QueryWrapper<Matnr> matnrQueryWrapper);
+
+ @Select({
+ "<script>",
+ "SELECT item_no, item_spec, unit_no",
+ "FROM cus_item_sync_view",
+ "WHERE item_no IN",
+ "<foreach collection='itemNos' item='itemNo' open='(' separator=',' close=')'>",
+ "#{itemNo}",
+ "</foreach>",
+ "</script>"
+ })
+ List<Map<String, Object>> selectByCusItemSyncView(@Param("itemNos") Collection<String> itemNos);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
index efed840..65d4564 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
@@ -56,4 +56,11 @@
/** 鏄惁鍚敤锛氬畾鏃惰嚜鍔ㄧ敓鎴愮┖鏉垮嚭搴撲换鍔″苟涓嬪彂 RCS锛堟瘡 2 鍒嗛挓鎵弿 D 绌烘澘搴撲綅锛� */
public final static String AUTO_EMPTY_OUT_ENABLED = "AUTO_EMPTY_OUT_ENABLED";
+ /**
+ * 浜戜粨鍗曟嵁涓� cus_item_sync_view 鐗╂枡鍚屾绛栫暐锛坰ys_config.val锛宼ype=3 瀛楃涓诧級锛�
+ * none / false / 0 鈥� 涓嶅己鍒讹細瑙嗗浘鍛戒腑鍒欐柊澧�/鏇存柊鐗╂枡琛紱鏈懡涓啀鏌ョ墿鏂欒〃锛屽瓨鍦ㄥ垯鏀捐锛�
+ * force_view / true / 1 鈥� 寮哄埗锛氱墿鏂欓』鍦ㄨ鍥句腑瀛樺湪锛屽懡涓垯鏂板/鏇存柊鐗╂枡琛ㄣ��
+ */
+ public final static String CUS_ITEM_SYNC_MODE = "CUS_ITEM_SYNC_MODE";
+
}
--
Gitblit v1.9.1