From dcd7fcf596005d0c7cf66558bee97edf6c3b03a0 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期四, 10 三月 2022 18:12:09 +0800
Subject: [PATCH] #物料状态维护

---
 src/main/java/com/zy/asrs/controller/LocNormalController.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 548b811..e359b57 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -12,6 +12,7 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.sun.org.apache.bcel.internal.generic.NEW;
+import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.LocNormal;
 import com.zy.asrs.entity.LocNormalLog;
 import com.zy.asrs.entity.LocNormalReport;
@@ -73,6 +74,8 @@
         allLike(LocNormal.class, param.keySet(), wrapper, condition);
         if (!Cools.isEmpty(orderByField)) {
             wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+        } else {
+            wrapper.orderBy("appe_time", false);
         }
         if (Cools.isEmpty(param.get("state"))) {
             wrapper.in("state", "1,2");
@@ -156,6 +159,18 @@
         locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
     }
 
+    /**
+     * 鎵归噺淇敼鐗╂枡鐘舵��
+     * @return
+     */
+    @RequestMapping(value = "/locNormal/getAllLocDetlData")
+    @ManagerAuth(memo = "鎵归噺淇敼鐗╂枡鐘舵��")
+    public R getAllLocDetlData(@RequestBody JSONObject param) {
+        List<LocNormal> list = JSONObject.parseArray(param.getJSONArray("list").toJSONString(), LocNormal.class);
+        Integer result = locNormalService.getAllLocDetlData(list);
+        return R.ok().add(result);
+    }
+
     @RequestMapping(value = "/locNormal/removeLoc/auth")
     @ManagerAuth
     public void removeLoc(LocNormal param) {

--
Gitblit v1.9.1