From b003a49794f49a329e2702918ecfc8d14b371d0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 04 三月 2026 14:51:25 +0800
Subject: [PATCH] 云仓WMS接口流程
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 142 ++++++++++++++++++++++++++++-------------------
1 files changed, 85 insertions(+), 57 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 5054fa3..1b89038 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
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.common.security.JwtSubject;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.common.utils.JwtUtil;
+import com.vincent.rsf.server.common.utils.QuantityUtils;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
@@ -258,8 +259,9 @@
throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
}
//TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
- Double rcptedQty = Math.round((wkOrder.getQty() + receiptQty) * 1000000) / 1000000.0;
- wkOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
+ Double rcptedQty = QuantityUtils.add(wkOrder.getQty(), receiptQty);
+ // 鏂伴『搴忥細鏈墽琛�(缁勬墭)鈫掍换鍔℃墽琛屼腑鈫掑凡瀹屾垚锛屼笉鍐嶈缃墽琛屼腑/鏀惰揣瀹屾垚
+ wkOrder.setQty(rcptedQty); // .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val)
if (!asnOrderMapper.updateById(wkOrder)) {
throw new CoolException("宸叉敹璐ф暟閲忎慨鏀瑰け璐ワ紒锛�");
}
@@ -306,14 +308,14 @@
throw new CoolException("璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛侊紒");
}
- Double itemRcptQty = Math.round((dto.getReceiptQty() + orderItem.getQty()) * 1000000) / 1000000.0;
+ Double itemRcptQty = QuantityUtils.add(dto.getReceiptQty(), orderItem.getQty());
Boolean allowOver = false;
if (!Objects.isNull(config)) {
if (Boolean.parseBoolean(config.getVal())) {
allowOver = true;
}
}
- if (itemRcptQty.compareTo(orderItem.getAnfme()) > 0 && !allowOver) {
+ if (QuantityUtils.compare(itemRcptQty, orderItem.getAnfme()) > 0 && !allowOver) {
throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
}
@@ -350,18 +352,18 @@
if (asnOrderItemMapper.updateById(orderItem) < 1) {
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
- /**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
- extracted(loginUserId, dto, areasItem, orderItem, wkOrder, matnr);
-
+ // 鏀惰揣鍖哄凡鍋滅敤锛屼笉鍐嶄繚瀛樿嚦鏀惰揣鍖�
+ // extracted(loginUserId, dto, areasItem, orderItem, wkOrder, matnr);
}
- WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
- if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
- order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
- if (!asnOrderMapper.updateById(order)) {
- throw new CoolException("璁㈠崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- }
+ // 鏂伴『搴忥細鏈墽琛�(缁勬墭)鈫掍换鍔℃墽琛屼腑鈫掑凡瀹屾垚锛屼笉鍐嶈缃敹璐у畬鎴�
+ // WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
+ // if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
+ // order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
+ // if (!asnOrderMapper.updateById(order)) {
+ // throw new CoolException("璁㈠崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ // }
+ // }
return R.ok("鏀惰揣鎴愬姛锛侊紒");
}
@@ -390,7 +392,7 @@
.setUnit(orderItem.getStockUnit())
.setStockUnit(orderItem.getStockUnit())
.setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
- .setAnfme(dto.getReceiptQty())
+ .setAnfme(QuantityUtils.roundToScale(dto.getReceiptQty()))
.setSplrBatch(dto.getSplrBatch())
.setMatnrCode(matnr.getCode())
.setUpdateBy(loginUserId)
@@ -419,8 +421,7 @@
if (!Objects.isNull(serviceOne)) {
item.setId(serviceOne.getId());
- Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 1000000) / 1000000.0;
- item.setAnfme(anfme);
+ item.setAnfme(QuantityUtils.add(item.getAnfme(), serviceOne.getAnfme()));
}
//鏈川妫�
@@ -511,11 +512,13 @@
* @description 鑾峰彇鏀惰揣鍖�
* @time 2025/3/11 10:12
*/
+ /** 鏀惰揣鍖哄凡鍋滅敤锛岃繑鍥炵┖鍒楄〃 */
@Override
public R getReceiptAreas() {
- List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
- .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
- return R.ok(areas);
+ // List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ // .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
+ // return R.ok(areas);
+ return R.ok(Collections.emptyList());
}
/**
@@ -552,7 +555,7 @@
// throw new CoolException("绁ㄥ彿涓嶈兘涓虹┖锛侊紒");
// }
// if (Objects.isNull(code)) {
-// throw new CoolException("瀹瑰櫒鍙蜂笉鑳戒负绌猴紒锛�");
+// throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
// }
// BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getCode, barcode));
// if (Objects.isNull(container)) {
@@ -579,7 +582,7 @@
|| !Objects.isNull(fieldIndex) || !Cools.isEmpty(matnrCode) || !Cools.isEmpty(asnCode);
if (!hasValidCondition) {
- throw new CoolException("璇疯嚦灏戣緭鍏ヤ竴涓煡璇㈡潯浠讹細鐗╂枡缂栫爜銆丄SN鍗曞彿銆佽窡韪爜銆佹壒娆℃垨绁ㄥ彿");
+ throw new CoolException("璇疯嚦灏戣緭鍏ヤ竴涓煡璇㈡潯浠讹細鐗╂枡缂栫爜銆乄MS鍗曞彿銆佹壒鍙�");/*銆佽窡韪爜銆佹壒娆℃垨绁ㄥ彿*/
}
// 濡傛灉鎵弿鐗╂枡缂栫爜涓擜SN鍗曞彿涓虹┖锛岀洿鎺ヤ粠鐗╂枡淇℃伅琛ㄨ幏鍙栵紝涓嶆煡璇㈡敹璐у尯
@@ -620,34 +623,59 @@
return R.ok(resultList);
}
- //TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<>();
-
- // 濡傛灉鏈堿SN鍗曞彿锛屽垯鍙煡璇㈣鍗曞彿涓嬬殑鐗╂枡锛圓SN鍗曞彿浣滀负蹇呴』鏉′欢锛�
+ // 鏀惰揣鍖哄凡鍋滅敤锛氭湁ASN鍗曞彿鏃朵粠璁㈠崟鏄庣粏鏌ュ彲缁勬墭鐗╂枡锛涘彲缁勭洏鏁伴噺 = 璁″垝鏁伴噺 - 宸茬粍鎵樻暟閲� - 宸蹭笂鏋舵暟閲�
if (!Cools.isEmpty(asnCode)) {
- // ASN鍗曞彿浣滀负蹇呴』鏉′欢
- queryWrapper.eq(WarehouseAreasItem::getAsnCode, asnCode);
-
- // 濡傛灉鍚屾椂鏈夌墿鏂欑紪鐮侊紝鍒欐煡璇㈣ASN鍗曞彿涓嬬殑璇ョ墿鏂�
- if (!Cools.isEmpty(matnrCode)) {
- queryWrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
+ if (order == null) {
+ logger.info("鏈壘鍒癆SN鍗曞彿: {}", asnCode);
+ return R.ok(Collections.emptyList());
}
-
- // 濡傛灉鍚屾椂鏈夋壒娆★紝鍒欐煡璇㈣ASN鍗曞彿涓嬬殑璇ユ壒娆�
- if (!Cools.isEmpty(batch)) {
- queryWrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
+ // 鎸夋槑缁嗘眹鎬诲凡缁勬墭鏁伴噺锛堢粍鎵樻暟閲忎笉浼氬洜鏀瑰崟鑰屽彉锛�
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnId, order.getId()));
+ Map<Long, Double> palletizedByItemId = pakinItems.stream()
+ .collect(Collectors.groupingBy(WaitPakinItem::getAsnItemId, Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
+ palletizedByItemId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
+ LambdaQueryWrapper<WkOrderItem> itemWrapper = new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId());
+ if (!Cools.isEmpty(matnrCode)) itemWrapper.eq(WkOrderItem::getMatnrCode, matnrCode);
+ 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);
+ List<WkOrderItem> orderItems = asnOrderItemMapper.selectList(itemWrapper);
+ List<WarehouseAreasItem> list = new ArrayList<>();
+ for (WkOrderItem oi : orderItems) {
+ Double anfme = QuantityUtils.roundToScale(oi.getAnfme() != null ? oi.getAnfme() : 0.0);
+ Double qty = QuantityUtils.roundToScale(oi.getQty() != null ? oi.getQty() : 0.0);
+ Double workQty = palletizedByItemId.getOrDefault(oi.getId(), 0.0); // 宸茬粍鎵樻暟閲�
+ if (QuantityUtils.compare(QuantityUtils.subtract(QuantityUtils.subtract(anfme, workQty), qty), 0.0) <= 0) continue; // 鍙粍鐩樻暟閲�<=0 涓嶈繑鍥�
+ WarehouseAreasItem v = new WarehouseAreasItem();
+ v.setId(oi.getId());
+ v.setAsnItemId(oi.getId());
+ v.setAsnId(order.getId());
+ v.setAsnCode(order.getCode());
+ v.setAnfme(anfme);
+ v.setQty(qty);
+ v.setWorkQty(QuantityUtils.roundToScale(workQty));
+ v.setMatnrCode(oi.getMatnrCode());
+ v.setMaktx(oi.getMaktx());
+ v.setSplrBatch(oi.getSplrBatch());
+ v.setPlatItemId(oi.getPlatItemId());
+ v.setStockUnit(oi.getStockUnit());
+ v.setUnit(oi.getStockUnit());
+ v.setMatnrId(oi.getMatnrId());
+ v.setFieldsIndex(oi.getFieldsIndex());
+ v.setTrackCode(oi.getTrackCode());
+ if (oi.getFieldsIndex() != null) {
+ v.setExtendFields(FieldsUtils.getFields(oi.getFieldsIndex()));
+ }
+ list.add(v);
}
-
- // 濡傛灉鍚屾椂鏈夌エ鍙凤紝鍒欐煡璇㈣ASN鍗曞彿涓嬬殑璇ョエ鍙�
- if (!Objects.isNull(fieldIndex)) {
- queryWrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
- }
-
- // 濡傛灉鍚屾椂鏈夎窡韪爜锛屽垯鏌ヨ璇SN鍗曞彿涓嬬殑璇ヨ窡韪爜
- if (!Cools.isEmpty(code)) {
- queryWrapper.eq(WarehouseAreasItem::getTrackCode, code);
- }
- } else {
+ logger.info("=== 浠庤鍗曟槑缁嗘煡璇㈠彲缁勬墭鐗╂枡锛堟敹璐у尯宸插仠鐢級asnCode: {} 杩斿洖 {} 鏉�", asnCode, list.size());
+ return R.ok(list);
+ }
+
+ // 鏃燗SN鍗曞彿鏃舵寜鍏朵粬鏉′欢鏌ワ紙鏀惰揣鍖哄凡鍋滅敤锛屾澶勪粎淇濈暀鍏煎锛岄�氬父鏃犳暟鎹級
+ LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<>();
+ {
// 娌℃湁ASN鍗曞彿鏃讹紝鍙互鎵弿浠绘剰鐗╂枡缁勬墭锛屼娇鐢∣R杩炴帴澶氫釜鏉′欢
// 缁熻鏈夋晥鏉′欢鏁伴噺
int conditionCount = 0;
@@ -962,7 +990,7 @@
@Override
public R operateToStock(OpStockParams params) {
if (org.apache.commons.lang3.StringUtils.isBlank(params.getBarcode())) {
- throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, params.getBarcode())
@@ -1017,7 +1045,7 @@
throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
List<WkOrderItem> itemList = params.getItemList();
- double sum = itemList.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+ Double sum = QuantityUtils.roundToScale(itemList.stream().mapToDouble(WkOrderItem::getAnfme).sum());
stock.setAnfme(sum)
.setSourceId(order.getId())
.setType(order.getType())
@@ -1171,15 +1199,15 @@
.eq(WaitPakin::getFlagDefect, flagDefect)
.in(WaitPakin::getIoStatus, asList));
// if (!Cools.isEmpty(waitPakin)) {
-// throw new CoolException("鎵樼洏涓嶅彲鐢�,鍦ㄧ粍鎵樹腑宸插瓨鍦�");
+// throw new CoolException("鏂欑涓嶅彲鐢�,鍦ㄧ粍鎵樹腑宸插瓨鍦�");
// }
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.get("barcode").toString()));
if (!tasks.isEmpty()) {
- throw new CoolException("鎵樼洏鐮佸凡鍦ㄤ换鍔℃。鎵ц锛侊紒");
+ throw new CoolException("鏂欑鐮佸凡鍦ㄤ换鍔℃。鎵ц锛侊紒");
}
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.get("barcode").toString()));
if (!Cools.isEmpty(locs)) {
- throw new CoolException("鎵樼洏涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
+ throw new CoolException("鏂欑涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
}
// List<WaitPakinItem> items = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
// items.forEach(item -> {
@@ -1202,14 +1230,14 @@
@Override
public R getUnItemByContainer(Map<String, Object> params) {
if (Cools.isEmpty(params.get("barcode")) && Cools.isEmpty(params.get("code"))) {
- throw new CoolException("瀹瑰櫒鍙蜂笌缁勬墭妗ｇ紪鐮佷笉鑳藉叏涓虹┖");
+ throw new CoolException("鏂欑鐮佷笌缁勬墭妗ｇ紪鐮佷笉鑳藉叏涓虹┖");
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(!Cools.isEmpty(params.get("barcode")), WaitPakin::getBarcode, params.get("barcode"))
.eq(!Cools.isEmpty(params.get("code")), WaitPakin::getCode, params.get("code"))
.eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (Objects.isNull(waitPakin)) {
- return R.error("鏈壘鍒拌瀹瑰櫒鐮佺殑缁勬墭鏄庣粏锛岃妫�鏌ョ粍鎵樼姸鎬�");
+ return R.error("鏈壘鍒拌鏂欑鐮佺殑缁勬墭鏄庣粏锛岃妫�鏌ョ粍鎵樼姸鎬�");
}
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
.eq(WaitPakinItem::getPakinId, waitPakin.getId()));
@@ -1325,11 +1353,11 @@
.setMaktx(asnOrderItem.getMaktx())
.setFieldsIndex(asnOrderItem.getFieldsIndex())
.setBarcode(asnOrderItem.getTrackCode())
- .setQty(asnOrderItem.getQty())
+ .setQty(QuantityUtils.roundToScale(asnOrderItem.getQty()))
.setStockUnit(asnOrderItem.getStockUnit())
.setPurUnit(asnOrderItem.getPurUnit())
.setPoCode(asnOrderItem.getPoCode())
- .setAnfme(asnOrderItem.getAnfme())
+ .setAnfme(QuantityUtils.roundToScale(asnOrderItem.getAnfme()))
.setPurQty(asnOrderItem.getPurQty())
.setSplrBatch(asnOrderItem.getSplrBatch())
.setExtendFields(asnOrderItem.getExtendFields())
@@ -1360,7 +1388,7 @@
if (Objects.isNull(stockItem)) {
detlsDto.setStockQty(0.0);
} else {
- Double anfme = Math.round((stockItem.getAnfme() + stockItem.getWorkQty()) * 1000000) / 1000000.0;
+ Double anfme = QuantityUtils.add(stockItem.getAnfme(), stockItem.getWorkQty());
detlsDto.setStockQty(anfme);
}
--
Gitblit v1.9.1