From 2a865ce08ad71501542b0a512d7868e5a6622df4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 17 一月 2024 08:55:31 +0800
Subject: [PATCH] # 配置属性修改

---
 src/main/java/com/zy/asrs/controller/PlaController.java |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 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..4b7c317 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -9,6 +9,7 @@
 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 +55,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 +76,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();
     }
@@ -111,7 +138,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 +177,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) {

--
Gitblit v1.9.1