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 | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 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 f1880bd..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
@@ -387,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())
@@ -414,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);
@@ -546,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
@@ -558,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");
@@ -635,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 鍚敤鍒欎粠鏀惰揣鍖烘煡鍙粍鎵樼墿鏂欙紝鏈惎鐢ㄥ垯浠庤鍗曟槑缁嗘煡
@@ -654,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<>();
@@ -691,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) {
--
Gitblit v1.9.1