From 6853c9181d307f41be0a46ddcc46ec83bd815501 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 03 六月 2025 10:03:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PlaController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 56d4df1..f9d4513 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", "鍏ㄩ儴鍑哄簱");
@@ -88,7 +93,7 @@
@RequestMapping(value = "/pla/add/auth")
@ManagerAuth
public R add(@RequestBody List<Pla> plas) {
- System.out.println(plas.toString());
+ log.info(plas.toString());
plas.forEach(pla -> {
plaService.insert(pla);
});
@@ -98,7 +103,7 @@
@RequestMapping(value = "/pla/update/auth")
@ManagerAuth
public R update(@RequestBody List<Pla> plas) {
- System.out.println(plas.toString());
+ log.info(plas.toString());
plas.forEach(pla -> {
Pla plaSave = plaService.selectById(pla.getId());
pla.setModifyTime(new Date());
@@ -118,7 +123,7 @@
@RequestMapping(value = "/pla/delete/auth")
@ManagerAuth
public R delete(@RequestBody List<Pla> plas) {
- System.out.println(plas.toString());
+ log.info(plas.toString());
plas.forEach(pla -> {
if (!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_1)) {
throw new CoolException("宸插叆搴撶殑鏁版嵁鏃犳硶琚垹闄�");
@@ -145,7 +150,7 @@
}
@RequestMapping(value = "/pla/sellout/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "sellout")
@Transactional
@Synchronized
public R sellout(@RequestBody List<Pla> plas) {
@@ -157,10 +162,14 @@
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("搴撳瓨宸茶鍐荤粨锛岃閲嶆柊閫夋嫨搴撳瓨");
- System.out.println(pla.getStockFreezeBy() + "," + getUser().getUsername());
+ log.info("璇ュ簱瀛樺凡琚叾浠栫敤鎴峰喕缁擄紝璇烽噸鏂伴�夋嫨;{},{}", pla.getStockFreezeBy(), getUser().getUsername());
if (!Cools.eq(pla.getStockFreezeBy(), getUser().getUsername())) {
throw new CoolException("璇ュ簱瀛樺凡琚叾浠栫敤鎴峰喕缁擄紝璇烽噸鏂伴�夋嫨");
}
@@ -171,9 +180,13 @@
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);
+ log.info("淇敼涓哄緟鍑哄簱锛屽湴鍧�锛歿},鏁版嵁:{}","/pla/sellout/auth", pla);
pla.setModifyTime(new Date());
pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
//鐢熸垚姝ゆ浣滀笟淇℃伅
--
Gitblit v1.9.1