From 6162f31a3145d875ea2187a9c8c1476ae053dad0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 17 四月 2025 10:49:38 +0800
Subject: [PATCH] 获取最新冻结状态修复
---
src/main/java/com/zy/asrs/controller/PlaController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index c66a577..72e4036 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -68,6 +68,11 @@
wrapper.eq("brand", param.get("brand"));
param.remove("brand");
}
+ // 浠撳簱绮剧‘鍖归厤
+ if (!Cools.isEmpty(param.get("stash"))) {
+ wrapper.eq("stash", param.get("stash"));
+ param.remove("stash");
+ }
// 娌℃湁閫夋嫨鐨勬椂鍊欓粯璁や笉鏄剧ず宸插嚭搴撶殑鐗╂枡
if (Cools.isEmpty(param.get("status"))) {
wrapper.ne("status", "鍏ㄩ儴鍑哄簱");
@@ -145,7 +150,7 @@
}
@RequestMapping(value = "/pla/sellout/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "sellout")
@Transactional
@Synchronized
public R sellout(@RequestBody List<Pla> plas) {
@@ -157,7 +162,11 @@
OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMaktx(orderNo, maktx);
for (Pla pla : plas) {
-
+ // 鑾峰彇鏈�鏂板喕缁撶姸鎬�
+ Pla pla1 = plaService.selectOne(new EntityWrapper<Pla>().setSqlSelect("stock_freeze as stockFreeze,stock_freeze_by as stockFreezeBy,stock_freeze_date as stockFreezeDate").eq("id", pla.getId()));
+ pla.setStockFreeze(pla1.getStockFreeze());
+ pla.setStockFreezeBy(pla1.getStockFreezeBy());
+ pla.setStockFreezeDate(pla1.getStockFreezeDate());
if (pla.getStockFreeze() == 0) {
// throw new CoolException("搴撳瓨宸茶鍐荤粨锛岃閲嶆柊閫夋嫨搴撳瓨");
log.info("璇ュ簱瀛樺凡琚叾浠栫敤鎴峰喕缁擄紝璇烽噸鏂伴�夋嫨;{},{}", pla.getStockFreezeBy(), getUser().getUsername());
@@ -171,6 +180,9 @@
if (pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0) {
throw new CoolException("鎵瑰彿:" + pla.getBatch() + "锛屽寘鍙�:" + pla.getPackageNo() + " 鍓╀綑鍙嚭搴撻噸閲忎笉瓒筹紝璇疯皟鏁村嚭搴撻噸閲�");
}
+ if (Cools.isEmpty(pla.getMassState())){
+ throw new CoolException("璐ㄩ噺鎸囨爣涓轰笂浼�");
+ }
pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
pla.setHandlerBy(getUser().getUsername());
pla.setStatus(GlobleParameter.PLA_STATUS_2);
--
Gitblit v1.9.1