From 39a150df074efd7304385d65a579d8c99a816d01 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 01 十二月 2023 11:33:31 +0800
Subject: [PATCH] 平库二维码生成

---
 src/main/webapp/static/js/node/node.js                         |    4 ++--
 src/main/java/com/zy/asrs/controller/NodeController.java       |    5 +++--
 src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 2c87cdd..893a6d3 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -76,12 +76,13 @@
                       @RequestParam(required = false)String orderByType,
                       @RequestParam Map<String, Object> param){
         EntityWrapper<Node> wrapper = new EntityWrapper<>();
-        wrapper.ne("type",3);
+        //wrapper.ne("type",3);
         excludeTrash(param);
         convert(param, wrapper);
         hostEq(wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-        return R.parse("0-鎿嶄綔鎴愬姛").add(nodeService.selectList(wrapper));
+        List<Node> nodes = nodeService.selectList(wrapper);
+        return R.parse("0-鎿嶄綔鎴愬姛").add(nodes);
     }
 
     @RequestMapping(value = "/node/tree/auth")
diff --git a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
index 3c85552..6f0497a 100644
--- a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
@@ -72,7 +72,7 @@
                 //鏄惁鍚湁鍙ˉ璐у嚭搴撶殑搴撲綅
                 boolean flag = false;
                 for (String locNo : locNosSearch){
-                    log.info("闇�瑕佹嫞鏂欑殑璐т綅锛�" + locNo +"锛岄渶瑕佽ˉ璐х殑鐗╂枡锛�" + mat.getMatnr());
+                    //log.info("闇�瑕佹嫞鏂欑殑璐т綅锛�" + locNo +"锛岄渶瑕佽ˉ璐х殑鐗╂枡锛�" + mat.getMatnr());
                     if(Cools.isEmpty(locDetlService.selectByLocWithoutContainer(locNo))){
                         flag = true;
                         continue;
diff --git a/src/main/webapp/static/js/node/node.js b/src/main/webapp/static/js/node/node.js
index e53d167..ac5aaf8 100644
--- a/src/main/webapp/static/js/node/node.js
+++ b/src/main/webapp/static/js/node/node.js
@@ -206,9 +206,9 @@
             if (printMsgList[i] != null && printMsgList[i] !== '') {
                 var barcodeUrl;
                 if (type === 1) {
-                    barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"&param="+printMsgList[i]+"&width="+200+"&height="+70;
+                    barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"&param="+printMsgList[i]+"&width="+200+"&height="+70;
                 } else {
-                    barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"&param="+printMsgList[i]+"&width="+400+"&height="+180;
+                    barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"&param="+printMsgList[i]+"&width="+400+"&height="+180;
                 }
                 data.push({
                     item: printMsgList[i],

--
Gitblit v1.9.1