From 5c63bc8e882563f4ac7fab61bdcb0c31109229ac Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 27 一月 2024 08:32:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PlaController.java | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 4b7c317..982f65a 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
@@ -131,6 +132,10 @@
for (Pla pla : plas){
+ if(pla.getStockFreeze() == 0){
+ throw new CoolException("搴撳瓨宸茶鍐荤粨锛岃閲嶆柊閫夋嫨搴撳瓨");
+ }
+
allOrderWeight += pla.getOrderWeight();
if(pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0){
@@ -199,6 +204,49 @@
return R.ok();
}
+ @RequestMapping(value = "/pla/updateStockFreeze")
+ @Transactional
+ @ManagerAuth(memo = "搴撲綅鍐荤粨")
+ public R updateStockFreeze(@RequestBody List<Pla> plas){
+ if (Cools.isEmpty(plas)){
+ return R.error("鏃犳暟鎹�");
+ }
+ for (Pla pla : plas){
+ if (pla.getStockFreeze() == 0){
+ throw new CoolException("搴撳瓨宸茶鍐荤粨锛�");
+ }
+ pla.setStockFreeze(0);
+ pla.setStockFreezeBy(getUser().getUsername());
+ pla.setStockFreezeDate(new Date());
+ pla.setModifyTime(new Date());
+ plaService.updateById(pla);
+ }
+ return R.ok("鍐荤粨鎴愬姛");
+ }
+
+ @RequestMapping(value = "/pla/updateStockDisFreeze")
+ @ManagerAuth(memo = "搴撲綅瑙ｅ喕")
+ public R updateStockDisFreeze(@RequestBody List<Pla> plas){
+ if (Cools.isEmpty(plas)){
+ return R.error("鏃犳暟鎹�");
+ }
+ for (Pla pla : plas){
+ if (pla.getStockFreeze() == 1){
+ throw new CoolException("搴撲綅鏈喕缁擄紝鏃犻渶瑙ｅ喕");
+ }
+ if(!Cools.eq(pla.getStockFreezeBy(),getUser().getUsername())){
+ throw new CoolException("鏃犳硶瑙ｅ喕鍏朵粬鐢ㄦ埛鍐荤粨鐨勫簱浣�");
+ }
+ pla.setStockFreeze(1);
+ pla.setStockFreezeBy(getUser().getUsername());
+ pla.setStockFreezeDate(new Date());
+ pla.setModifyTime(new Date());
+ plaService.updateById(pla);
+
+ }
+ return R.ok("瑙ｉ櫎鍐荤粨鎴愬姛");
+ }
+
/**
* excel瀵煎叆妯℃澘涓嬭浇
*/
@@ -229,6 +277,29 @@
return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉la鐗╂枡鏁版嵁");
}
+// // 鎵撳嵃
+// @RequestMapping(value = "/pla/print/auth")
+// @ManagerAuth(memo = "pla缂栫爜鎵撳嵃")
+// public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
+// if(Cools.isEmpty(param)) {
+// return R.parse(CodeRes.EMPTY);
+// }
+// List<MatPrint> res = new ArrayList<>();
+// for (String matnr : param){
+// Mat mat = matService.selectByMatnr(matnr);
+// // 鎵撳嵃鏁版嵁娉ㄥ叆
+// MatPrint print = new MatPrint();
+// print.setMatnr(mat.getMatnr());
+// print.setBarcode(mat.getBarcode());
+// print.setMaktx(mat.getMaktx());
+// print.setSpecs(mat.getSpecs());
+// print.setUnit(mat.getUnit());
+// print.setMemo(mat.getMemo());
+// res.add(print);
+// }
+// return R.ok().add(res);
+// }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
--
Gitblit v1.9.1