From 7ec37083b96e0e48948e86263f6038fd2cb249cb Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 24 一月 2024 15:49:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/PlaController.java |   89 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 815f418..de93414 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -5,10 +5,12 @@
 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;
 import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.GlobleParameter;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.PlaExcelListener;
 import com.zy.asrs.utils.SaasUtils;
@@ -54,7 +56,7 @@
         excludeTrash(param);
         EntityWrapper<Pla> wrapper = new EntityWrapper<>();
         convert(param, wrapper);
-        wrapper.orderBy("pakin_time",false);
+        wrapper.orderBy("modify_time",false);
         allLike(Pla.class, param.keySet(), wrapper, condition);
         return R.ok(plaService.selectPage(new Page<>(curr, limit), wrapper));
     }
@@ -75,11 +77,37 @@
         System.out.println(plas.toString());
         plas.forEach(pla -> {
             Pla plaSave = plaService.selectById(pla.getId());
+            pla.setModifyTime(new Date());
+            plaService.updateById(pla);
+
             PlaLog plaLog = new PlaLog();
             BeanUtils.copyProperties(plaSave,plaLog);
             plaLog.setId(null);
+            plaLog.setCreateTime(new Date());
             plaLogService.insert(plaLog);
-            plaService.updateById(pla);
+
+        });
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/pla/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestBody List<Pla> plas) {
+        System.out.println(plas.toString());
+        plas.forEach(pla -> {
+            if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) || pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+                throw new CoolException("闈炲緟鍏ュ簱鐨勬暟鎹棤娉曡鍒犻櫎");
+            }
+            Pla plaSave = plaService.selectById(pla.getId());
+            pla.setModifyTime(new Date());
+            plaService.deleteById(pla.getId());
+
+            PlaLog plaLog = new PlaLog();
+            BeanUtils.copyProperties(plaSave,plaLog);
+            plaLog.setId(null);
+            plaLog.setCreateTime(new Date());
+            plaLogService.insert(plaLog);
+
         });
         return R.ok();
     }
@@ -104,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){
@@ -111,7 +143,8 @@
             }
             pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
             pla.setHandlerBy(getUser().getUsername());
-            pla.setStatus("寰呭嚭搴�");
+            pla.setStatus(GlobleParameter.PLA_STATUS_2);
+            pla.setModifyTime(new Date());
             pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
             //鐢熸垚姝ゆ浣滀笟淇℃伅
             PlaQty plaQty = new PlaQty();
@@ -149,6 +182,13 @@
         return R.ok();
     }
 
+    @RequestMapping(value = "/pla/viladate/auth")
+    @ManagerAuth
+    public R viladate(@RequestBody List<Pla> plas) {
+        plaService.viladate(plas,getUser());
+        return R.ok();
+    }
+
     @RequestMapping(value = "/pla/rework/auth")
     @ManagerAuth
     public R rework(@RequestBody List<Pla> plas) {
@@ -164,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瀵煎叆妯℃澘涓嬭浇
      */

--
Gitblit v1.9.1