From bbfb525c87ab208f123f8f5a4c7c6a87df4a3a23 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 九月 2023 15:08:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

---
 src/main/webapp/static/js/report/workCountOut.js           |    1 +
 src/main/webapp/static/js/adjDetl/adjDetl.js               |    1 -
 src/main/java/com/zy/asrs/controller/MobileController.java |   11 +++++++++++
 src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java  |    1 +
 src/main/webapp/static/js/report/workCountIn.js            |    1 +
 5 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 9f3ebe1..01c6d20 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.controller;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.core.annotations.ManagerAuth;
 import com.core.common.Cools;
 import com.core.common.R;
@@ -402,4 +403,14 @@
         mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
         return R.ok("琛ヨ揣鎴愬姛");
     }
+
+    @RequestMapping("/pick/auth")
+    @ManagerAuth(memo = "鎷f枡")
+    public synchronized R pickAuth(@RequestBody String barcode){
+        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+        //WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+        //List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+        return R.ok().add(wrkDetls);
+    }
 }
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java b/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java
index 8a8fd87..ef71169 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java
@@ -7,5 +7,6 @@
     private String oneday;
     private String matnr;
     private String maktx;
+    private String specs;
     private String anfme;
 }
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index 54aadbf..cf9a816 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -44,7 +44,6 @@
             pageSize: 'limit'
         },
         parseData: function (res) {
-            console.log(res)
             return {
                 'code': res.code,
                 'msg': res.msg,
diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js
index 0edc32b..a41c54a 100644
--- a/src/main/webapp/static/js/report/workCountIn.js
+++ b/src/main/webapp/static/js/report/workCountIn.js
@@ -3,6 +3,7 @@
     var cols = [
         {field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
         ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+        ,{field: 'specs', align: 'center',title: '瑙勬牸'}
         ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
     ];
diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js
index 6534f00..b4859b8 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -3,6 +3,7 @@
     var cols = [
         {field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
         ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+        ,{field: 'specs', align: 'center',title: '瑙勬牸'}
         ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
     ];

--
Gitblit v1.9.1