From b6bf5c99a551f042616c184313a9abb9cab1008a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 15:04:18 +0800
Subject: [PATCH] 导入聚乳酸明细时 牌号为161,171,181并且物资类别为改性树脂时指定主体为海正生物，生产车间为一车间
---
src/main/java/com/zy/asrs/controller/PlaController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..8e6279c 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) {
@@ -160,7 +165,7 @@
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,6 +176,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