From 68ad4cf704c0a7c575936455d07e3e2f53fefbc4 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 26 三月 2021 14:29:26 +0800
Subject: [PATCH] 1.0.5 1.小太阳需求改动

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

diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 275454e..cb1c130 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -10,6 +10,7 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.zy.asrs.entity.LocNormal;
 import com.zy.asrs.entity.param.LocNormalParam;
 import com.zy.asrs.service.LocNormalService;
@@ -27,6 +28,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -53,7 +55,9 @@
         if (!Cools.isEmpty(orderByField)) {
             wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
         }
-        wrapper.eq("state", "1").or().eq("state", "2");
+        if (Cools.isEmpty(param.get("state"))) {
+            wrapper.in("state", "1,2");
+        }
         return R.ok(locNormalService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
@@ -99,7 +103,7 @@
     public void updateLocNormal(LocNormal param) {
         Long modiUser = getUserId();
         Date modiTime = new Date();
-        locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime);
+        locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime, param.getId());
     }
 
     @RequestMapping(value = "/locNormal/outLoc/auth")
@@ -107,7 +111,7 @@
     public void outLocNormal(LocNormal param) {
         Long modiUser = getUserId();
         Date modiTime = new Date();
-        locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime);
+        locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
     }
 
     @RequestMapping(value = "/locNormal/removeLoc/auth")
@@ -115,7 +119,7 @@
     public void removeLoc(LocNormal param) {
         Long modiUser = getUserId();
         Date modiTime = new Date();
-        locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime);
+        locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
     }
 
     /* 瀵煎叆 */
@@ -126,6 +130,21 @@
         LocNormalExcelListener listener = new LocNormalExcelListener(getUserId());
         EasyExcel.read(file.getInputStream(), LocNormalExcel.class, listener).sheet().doRead();
         return R.ok("鎴愬姛瀵煎叆" + listener.getTotal() + "鏉＄墿鏂欎俊鎭�");
+    }
+
+    /* 骞充粨鍏ュ簱 */
+    @RequestMapping(value = "/locNormal/in")
+    @ManagerAuth(memo = "骞充粨鍏ュ簱")
+    @Transactional
+    public R locNormalIn(@RequestBody LocNormalParam param) {
+        Long userId = getUserId();
+        Date timeNow = new Date();
+        for (Integer i = 0; i < param.getNormalList().size(); i++) {
+            param.getNormalList().get(i).setAppeUser(userId);
+            param.getNormalList().get(i).setAppeTime(timeNow);
+        }
+        locNormalService.locNormalIn(param.getNormalList());
+        return R.ok();
     }
 
     /* pda鍏ュ簱 */
@@ -142,4 +161,52 @@
         locNormalService.pdaLocNormalIn(param.getNormalList());
         return R.ok();
     }
+
+    /* pda鍑哄簱鏌ヨ */
+    @RequestMapping(value = "/locNormal/pda/out/query")
+    @ManagerAuth(memo = "pda鍑哄簱鏌ヨ")
+    @Transactional
+    public R locNormalPdaOutQuery(String matnr, String warehouse, String billNo) {
+        List<LocNormal> list = new ArrayList<>();
+        list  = locNormalService.pdaLocNormalQuery(matnr, warehouse, billNo);
+        return R.ok(list);
+    }
+
+    @RequestMapping(value = "/locNormal/pda/out")
+    @ManagerAuth(memo = "pda鍑哄簱")
+    @Transactional
+    public R locNormalPdaOut(@RequestBody LocNormalParam param) {
+        Long userId = getUserId();
+        Date timeNow = new Date();
+        List<LocNormal> list = param.getNormalList();
+        for (Integer i = 0; i < list.size(); i++) {
+            list.get(i).setModiUser(userId);
+            list.get(i).setModiTime(timeNow);
+        }
+        locNormalService.pdaLocNormalOut(list);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/locNormal/pda/warehouseQuery")
+    @ManagerAuth(memo = "pda鏍规嵁搴撳尯鏌ヨ鐗╂枡娓呭崟")
+    @Transactional
+    public R locNormalPdaWarehouseQuery(String warehouse, String matnr) {
+        List<LocNormal> list = locNormalService.pdaLocNormalWarehouseQuery(warehouse, matnr);
+        return R.ok(list);
+    }
+
+    @RequestMapping(value = "/locNormal/pda/move")
+    @ManagerAuth(memo = "pda绉诲簱")
+    @Transactional
+    public R LocNormalPdaMove(@RequestBody LocNormalParam param) {
+        Long userId = getUserId();
+        Date timeNow = new Date();
+        List<LocNormal> list = param.getNormalList();
+        for (Integer i = 0; i < list.size(); i++) {
+            list.get(i).setModiUser(userId);
+            list.get(i).setModiTime(timeNow);
+        }
+        locNormalService.pdaLocNormalMove(list);
+        return R.ok();
+    }
 }

--
Gitblit v1.9.1