From f21530d33ca23aeeba2ef073ac6b64422e4e26ca Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 12:17:55 +0800
Subject: [PATCH] 库位编号规则和和CTU保持一致
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 155 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 133 insertions(+), 22 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 3c5c591..602607c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -136,6 +136,8 @@
private OutStockService outStockService;
@Autowired
private BasContainerService basContainerService;
+ @Autowired
+ private CusBarcodeSyncViewQueryService cusBarcodeSyncViewQueryService;
/**
* @return
@@ -385,6 +387,7 @@
item.setTrackCode(dto.getBarcode())
.setAreaName(areasItem.getName())
.setAreaId(areasItem.getId())
+ .setPlatItemId(orderItem.getPlatItemId())
.setAsnItemId(orderItem.getId())
.setAsnCode(wkOrder.getCode())
.setAsnId(wkOrder.getId())
@@ -412,16 +415,8 @@
//TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
-// .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
- .eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
- .eq(!Cools.isEmpty(item.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
- .eq(WarehouseAreasItem::getAsnCode, item.getAsnCode())
- .eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch());
- if (Objects.isNull(orderItem.getIsptResult())) {
- queryWrapper.isNull(WarehouseAreasItem::getIsptResult);
- } else {
- queryWrapper.eq(WarehouseAreasItem::getIsptResult, orderItem.getIsptResult());
- }
+ .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
+ .eq(WarehouseAreasItem::getAsnId, wkOrder.getId());
WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper);
@@ -544,6 +539,27 @@
.eq(Fields::getStatus, 1).orderByAsc(Fields::getId));
}
+ @Override
+ public R getPdaPalletConfig() {
+ Map<String, Object> data = new HashMap<>(2);
+ data.put("pdaPakinAsnRequired", isPdaPakinAsnRequired());
+ return R.ok(data);
+ }
+
+ /** PDA 缁勭洏鏄惁寮哄埗浼� WMS 鍗曞彿锛堟棤閰嶇疆鎴栫己鐪佹椂鎸� true锛� */
+ private boolean isPdaPakinAsnRequired() {
+ Config c = configService.getOne(new LambdaQueryWrapper<Config>()
+ .eq(Config::getFlag, GlobalConfigCode.PDA_PAKIN_ASN_REQUIRED)
+ .eq(Config::getDeleted, 0)
+ .last("LIMIT 1"));
+ boolean required = true;
+ if (c != null && StringUtils.isNotBlank(c.getVal())) {
+ String v = c.getVal().trim();
+ required = Boolean.parseBoolean(v) || "1".equals(v);
+ }
+ return required;
+ }
+
/**
* @param
* @return
@@ -556,6 +572,15 @@
String code = params.get("code");
String matnrCode = params.get("matnrCode");
String asnCode = params.get("asnCode");
+ if (asnCode != null) {
+ asnCode = asnCode.trim();
+ if (asnCode.isEmpty()) {
+ asnCode = null;
+ }
+ }
+ if (isPdaPakinAsnRequired() && Cools.isEmpty(asnCode)) {
+ return R.error("璇峰厛鎵弿WMS鍗曞彿");
+ }
String crushNo = params.get("fieldsIndex");
String batch = params.get("batch");
// String barcode = params.get("barcode");
@@ -597,13 +622,14 @@
// 濡傛灉鎵弿鐗╂枡缂栫爜涓擜SN鍗曞彿涓虹┖锛岀洿鎺ヤ粠鐗╂枡淇℃伅琛ㄨ幏鍙栵紝涓嶆煡璇㈡敹璐у尯
if (!Cools.isEmpty(matnrCode) && Cools.isEmpty(asnCode) && Cools.isEmpty(code)
&& Cools.isEmpty(batch) && Objects.isNull(fieldIndex)) {
- logger.info("=== 浠庣墿鏂欎俊鎭〃鏌ヨ鐗╂枡淇℃伅锛堜笉鏌ヨ鏀惰揣鍖猴級 ===");
+// logger.info("=== 浠庣墿鏂欎俊鎭〃鏌ヨ鐗╂枡淇℃伅锛堜笉鏌ヨ鏀惰揣鍖猴級 ===");
logger.info("鏌ヨ鍙傛暟 - matnrCode: {}", matnrCode);
- Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
- .eq(Matnr::getCode, matnrCode)
- .eq(Matnr::getDeleted, 0)
- .last("LIMIT 1"));
+ // Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
+ // .eq(Matnr::getCode, matnrCode)
+ // .eq(Matnr::getDeleted, 0)
+ // .last("LIMIT 1"));
+ Matnr matnr = getMatnrByCodePreferView(matnrCode);
if (matnr == null) {
logger.warn("鐗╂枡淇℃伅琛ㄤ腑鏈壘鍒扮墿鏂欑紪鐮�: {}", matnrCode);
@@ -632,14 +658,15 @@
return R.ok(resultList);
}
- // 鏈堿SN鍗曞彿鏃讹細浠呭湪鍗曟嵁瀛樺湪鏃舵寜鍗曟嵁闄愬埗缁勬墭
+ // 鏈� WMS 鍗曞彿鏃讹細蹇呴』鑳界簿纭懡涓崟鎹紝鍚﹀垯鐩存帴杩斿洖绌猴紙閬垮厤钀藉叆鏃犲崟鍙峰垎鏀悗 queryWrapper 鏃犳潯浠舵煡鍏ㄨ〃鏀惰揣鍖猴級
WkOrder asnOrder = null;
if (!Cools.isEmpty(asnCode)) {
asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
if (asnOrder == null) {
- logger.info("鏈壘鍒癆SN鍗曞彿: {}锛屾寜鏃犲崟鎹粍鎵樻ā寮忚繑鍥炵墿鏂欎俊鎭�", asnCode);
- asnCode = null;
+ logger.info("鏈壘鍒癢MS鍗曞彿: {}锛岃繑鍥炵┖鍒楄〃", asnCode);
+ return R.ok(new ArrayList<>());
}
+ asnCode = asnOrder.getCode();
}
// 鏈堿SN鍗曞彿涓斿崟鎹瓨鍦ㄦ椂锛欴irectWaitPakin 鍚敤鍒欎粠鏀惰揣鍖烘煡鍙粍鎵樼墿鏂欙紝鏈惎鐢ㄥ垯浠庤鍗曟槑缁嗘煡
@@ -651,6 +678,7 @@
if (!Cools.isEmpty(batch)) receiptWrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
if (!Objects.isNull(fieldIndex)) receiptWrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
if (!Cools.isEmpty(code)) receiptWrapper.eq(WarehouseAreasItem::getTrackCode, code);
+ receiptWrapper.orderByAsc(WarehouseAreasItem::getPlatItemId).orderByAsc(WarehouseAreasItem::getAsnItemId);
List<WarehouseAreasItem> receiptList = warehouseAreasItemService.list(receiptWrapper);
// 缁勬墭閫氱煡妗ｏ紙WaitPakinItem锛夌殑宸茬粍鎵樻暟閲忎篃瑕佹墸鍑忥細鏀惰揣鍖� workQty 浠呭弽鏄犱粠鏀惰揣鍖虹粍鎵樼殑閮ㄥ垎锛屼粠璁㈠崟鐩存帴缁勬墭鐨勫湪姝ゆ眹鎬�
Map<Long, Double> waitPakinSumByItemId = new java.util.HashMap<>();
@@ -688,6 +716,7 @@
if (!Cools.isEmpty(batch)) itemWrapper.eq(WkOrderItem::getSplrBatch, batch);
if (!Objects.isNull(fieldIndex)) itemWrapper.eq(WkOrderItem::getFieldsIndex, fieldIndex);
if (!Cools.isEmpty(code)) itemWrapper.eq(WkOrderItem::getTrackCode, code);
+ itemWrapper.orderByAsc(WkOrderItem::getPlatItemId).orderByAsc(WkOrderItem::getId);
List<WkOrderItem> orderItems = asnOrderItemMapper.selectList(itemWrapper);
List<WarehouseAreasItem> list = new ArrayList<>();
for (WkOrderItem oi : orderItems) {
@@ -831,10 +860,11 @@
if (!matnrCodes.isEmpty()) {
Map<String, Matnr> matnrMap = new HashMap<>();
for (String matCode : matnrCodes) {
- Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
- .eq(Matnr::getCode, matCode)
- .eq(Matnr::getDeleted, 0)
- .last("LIMIT 1"));
+ // Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
+ // .eq(Matnr::getCode, matCode)
+ // .eq(Matnr::getDeleted, 0)
+ // .last("LIMIT 1"));
+ Matnr matnr = getMatnrByCodePreferView(matCode);
if (matnr != null) {
matnrMap.put(matCode, matnr);
}
@@ -873,6 +903,87 @@
return R.ok(list);
}
+ private Matnr findLocalMatnrByCode(String matnrCode) {
+ String t = StringUtils.trimToNull(matnrCode);
+ if (t == null) {
+ return null;
+ }
+ return matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
+ .eq(Matnr::getCode, t)
+ .eq(Matnr::getDeleted, 0)
+ .last("LIMIT 1"));
+ }
+
+ /** 缁勬墭锛氬厛鏌ヨ鍥� barcode锛堢墿鏂欏彿锛夛紝鍐� man_matnr.code 绛夊�� */
+ private Matnr getMatnrByCodePreferView(String matnrCode) {
+ String code = StringUtils.trimToNull(matnrCode);
+ if (code == null) {
+ return null;
+ }
+ List<Map<String, Object>> viewItems = null;
+ try {
+ viewItems = cusBarcodeSyncViewQueryService.listByItemNos(Collections.singletonList(code));
+ } catch (Exception ignore) {
+ }
+ Map<String, Object> row = null;
+ if (viewItems != null) {
+ row = viewItems.stream()
+ .filter(v -> CusBarcodeSyncViewQueryService.rowMatchesOrderMatnr(code, Objects.toString(v.get("barcode"), null)))
+ .findFirst()
+ .orElse(null);
+ }
+ if (row == null) {
+ return findLocalMatnrByCode(code);
+ }
+ String fullCode = CusBarcodeSyncViewQueryService.matnrCodeFromBarcode(Objects.toString(row.get("barcode"), null));
+ Matnr local = findLocalMatnrByCode(fullCode);
+ String viewSpec = StringUtils.trimToEmpty(Objects.toString(row.get("item_spec"), ""));
+ String viewUnit = StringUtils.trimToNull(Objects.toString(row.get("unit_no"), null));
+ String viewName = StringUtils.trimToNull(Objects.toString(row.get("item_name"), null));
+ if (local == null) {
+ Matnr matnr = new Matnr();
+ matnr.setCode(fullCode)
+ .setBatch("")
+ .setName(viewName != null ? viewName : fullCode)
+ .setSpec(viewSpec)
+ .setUnit(viewUnit)
+ .setStockUnit(viewUnit)
+ .setStatus(1)
+ .setDeleted(0)
+ .setCreateBy(1L)
+ .setUpdateBy(1L)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date());
+ if (matnrMapper.insert(matnr) <= 0) {
+ throw new CoolException("鐗╂枡淇℃伅淇濆瓨澶辫触");
+ }
+ return matnr;
+ }
+ 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 (specDiff || unitDiff) {
+ Matnr update = new Matnr();
+ update.setId(local.getId());
+ if (specDiff) {
+ update.setSpec(viewSpec);
+ local.setSpec(viewSpec);
+ }
+ if (unitDiff) {
+ update.setUnit(viewUnit);
+ update.setStockUnit(viewUnit);
+ local.setUnit(viewUnit);
+ local.setStockUnit(viewUnit);
+ }
+ update.setUpdateBy(1L).setUpdateTime(new Date());
+ if (matnrMapper.updateById(update) <= 0) {
+ throw new CoolException("鐗╂枡淇℃伅鏇存柊澶辫触");
+ }
+ }
+ return local;
+ }
+
/**
* @param
* @param userId
--
Gitblit v1.9.1