From c560649e37ab5a5bc29c47a3fa7309dc912b48cb Mon Sep 17 00:00:00 2001
From: 李天宇 <876263681@qq.com>
Date: 星期五, 25 十月 2024 09:33:08 +0800
Subject: [PATCH] #update 修复wms库存明细统计bug,实现客户导出需求

---
 src/main/webapp/views/locDetl/locDetl.html                     |    4 
 src/main/webapp/views/pda/stockIn.html                         |    4 
 src/main/webapp/views/locDetl/locDetl1.html                    |    8 
 src/main/java/com/zy/asrs/entity/DocLog.java                   |    6 
 src/main/webapp/views/locDetlStatis/locDetlStatis.html         |    4 
 src/main/resources/mapper/LocDetlMapper.xml                    |   38 +++-
 src/main/webapp/static/js/saas/locDetl.js                      |    4 
 src/main/java/com/zy/asrs/entity/param/MatSyncParam.java       |    4 
 src/main/webapp/views/saas/matQuery.html                       |    4 
 src/main/webapp/views/report/viewStayTime.html                 |    2 
 src/main/webapp/static/js/matV2/matV2.js                       |    4 
 src/main/webapp/views/report/viewWorkOut.html                  |    2 
 src/main/java/com/zy/asrs/service/OrderDetlService.java        |    4 
 src/main/webapp/views/pda/stockOut.html                        |    2 
 src/main/webapp/h5/static/js/pages-index-index.3bd687c2.js     |    2 
 src/main/java/com/zy/asrs/entity/Mat.java                      |   22 +-
 src/main/java/com/zy/asrs/entity/WrkDetl.java                  |    4 
 src/main/webapp/static/js/picking/pickingOrder.js              |    8 
 src/main/java/com/zy/asrs/controller/MatController.java        |    2 
 src/main/webapp/static/js/common.js                            |    8 
 src/main/java/com/zy/common/service/CommonService.java         |    6 
 src/main/webapp/static/js/report/workCountIn.js                |    4 
 src/main/java/com/zy/asrs/entity/result/Pakin.java             |   18 +-
 src/main/webapp/views/pack/pack.html                           |    4 
 src/main/webapp/static/js/picking/picking.js                   |    4 
 src/main/java/com/zy/asrs/entity/OrderDetl.java                |   12 
 src/main/java/com/zy/asrs/service/LocDetlService.java          |    2 
 src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java          |    8 
 src/main/webapp/views/locCheck/locCheck.html                   |    4 
 src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java         |    4 
 src/main/webapp/static/js/manLocDetl/manLocDetl.js             |    4 
 src/main/webapp/views/report/viewWorkIn.html                   |    2 
 src/main/webapp/views/pakStore/matQuery.html                   |    4 
 src/main/webapp/views/pda/locDetlIframe.html                   |    4 
 src/main/webapp/views/report/viewWorkCountIn.html              |    2 
 src/main/webapp/views/pda/matQuery.html                        |    6 
 src/main/webapp/views/saas/locDetl.html                        |    2 
 src/main/webapp/views/waitPakinLog/waitPakinLog.html           |    2 
 src/main/webapp/views/ioWorks/matQuery.html                    |    4 
 src/main/webapp/views/manLocDetl/manLocDetl.html               |    8 
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java             |    4 
 src/main/java/com/zy/asrs/entity/LocDetl.java                  |   16 +
 src/main/webapp/static/js/order/order.js                       |    8 
 src/main/webapp/views/order/out.html                           |    8 
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java    |    8 
 src/main/java/com/zy/asrs/entity/AdjDetl.java                  |    4 
 src/main/webapp/static/js/pakStore/pakComb.js                  |    6 
 src/main/webapp/static/js/pack/pack.js                         |    2 
 src/main/java/com/zy/asrs/utils/MatExcelListener.java          |    2 
 src/main/webapp/static/js/mat/mat.js                           |    2 
 src/main/webapp/views/mat/mat.html                             |   32 +-
 src/main/webapp/views/pakStore/locDetlQuery.html               |    2 
 src/main/webapp/views/pda/comb.html                            |    4 
 src/main/webapp/static/js/orderDetl/orderDetl.js               |    4 
 src/main/java/com/zy/asrs/entity/LocCheck.java                 |    6 
 src/main/webapp/views/wrkDetlLog/wrkDetlLog.html               |    2 
 src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java   |    2 
 src/main/java/com/zy/asrs/utils/MatV2ExcelListener.java        |    4 
 src/main/java/com/zy/asrs/entity/param/CheckBom.java           |    2 
 src/main/webapp/static/js/locCheck/locCheck.js                 |    2 
 src/main/webapp/static/js/order/out.js                         |    4 
 src/main/webapp/views/ioWorks/locDetlQuery.html                |    4 
 src/main/java/com/zy/asrs/task/CheckDeepScheduler.java         |    2 
 src/main/java/com/zy/asrs/entity/param/StockOutParam.java      |    2 
 src/main/webapp/static/js/adjDetl/adjDetl.js                   |    2 
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java           |    4 
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java  |    4 
 src/main/webapp/views/order/view.html                          |    2 
 src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html    |    2 
 src/main/java/com/zy/asrs/entity/Pack.java                     |    6 
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java               |    4 
 src/main/webapp/static/js/report/workCountOut.js               |    4 
 src/main/java/com/zy/asrs/controller/OrderController.java      |    8 
 src/main/java/com/zy/asrs/entity/MatV2.java                    |    4 
 src/main/webapp/static/js/saasLog/saasLog.js                   |    2 
 src/main/java/com/zy/asrs/entity/ManPakOut.java                |   12 
 src/main/java/com/zy/asrs/controller/OrderDetlController.java  |    2 
 src/main/java/com/zy/common/web/FileController.java            |    2 
 src/main/java/com/zy/asrs/entity/ManLocDetl.java               |   20 +-
 src/main/webapp/static/js/locDetl/locDetl.js                   |    4 
 src/main/webapp/views/waitPakin/waitPakin_detail.html          |    2 
 src/main/webapp/views/report/viewWorkCountOut.html             |    2 
 src/main/java/com/zy/asrs/entity/MatCodePrint.java             |    4 
 src/main/java/com/zy/asrs/entity/WaitPakin.java                |    4 
 src/main/webapp/views/matV2/matV2.html                         |    4 
 src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java |    2 
 src/main/webapp/views/pakStore/locDetlCheckQuery.html          |    2 
 src/main/webapp/views/orderDetl/orderDetl.html                 |    8 
 src/main/webapp/views/waitPakin/waitPakin.html                 |    2 
 src/main/java/com/zy/asrs/service/ManLocDetlService.java       |    2 
 90 files changed, 252 insertions(+), 234 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 42a1f5a..a3f5928 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -315,7 +315,7 @@
 
     // 鎵撳嵃
     @RequestMapping(value = "/mat/print/auth")
-    @ManagerAuth(memo = "鐗╂枡鍙锋墦鍗�")
+    @ManagerAuth(memo = "鍝佸彿鎵撳嵃")
     public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
         if(Cools.isEmpty(param)) {
             return R.parse(CodeRes.EMPTY);
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 26ecf96..778663d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -391,11 +391,11 @@
             Row row = sheet.getRow(i);
             // 璁㈠崟缂栧彿
             String uuid = dataFormatter.formatCellValue(row.getCell(0));
-            // 鍝佸彿
+            // 鍝佸悕
             String maktx = dataFormatter.formatCellValue(row.getCell(1));
-            // 鐗╂枡鍙�
+            // 鍝佸彿
             String matnr = dataFormatter.formatCellValue(row.getCell(2));
-            // 鐗╂枡鍙�
+            // 鍝佸彿
             String batch = dataFormatter.formatCellValue(row.getCell(3));
             // 鏁伴噺
             Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(4)));
@@ -420,7 +420,7 @@
 
             Mat mat = matService.selectByMatnr(matnr);
             if (null == mat) {
-                throw new CoolException(matnr + "鐗╂枡鍙风殑鍟嗗搧涓嶅瓨鍦紝璇烽噸鏂板鍏ワ紒");
+                throw new CoolException(matnr + "鍝佸彿鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
             }
 
             Order order = orderService.selectByNo(uuid);
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 1a860eb..969d593 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -48,7 +48,7 @@
         }
         wrapper.eq("status", 1);
         Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
-        // 鏍规嵁鐗╂枡鍙峰拰鎵瑰彿锛屽垎鍒湪绔嬪簱鍜屽钩搴撳簱瀛樿〃涓煡璇㈠叾瀛橀噺锛屽苟瀛樺叆涓や釜涓存椂灞炴�т腑
+        // 鏍规嵁鍝佸彿鍜屾壒鍙凤紝鍒嗗埆鍦ㄧ珛搴撳拰骞冲簱搴撳瓨琛ㄤ腑鏌ヨ鍏跺瓨閲忥紝骞跺瓨鍏ヤ袱涓复鏃跺睘鎬т腑
         orderDetlPage.getRecords().forEach(orderDetl -> {
             Map<String, Long> map = orderDetlService.selectCountByMatnr(orderDetl.getMatnr(), orderDetl.getBatch());
             orderDetl.setSupp(String.valueOf(map.get("asrCount")));
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index 6a81ec0..514b906 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -38,9 +38,9 @@
     private String locNo;
 
     /**
-     * 鐗╂枡鍙�
+     * 鍝佸彿
      */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
+    @ApiModelProperty(value= "鍝佸彿")
     private String matnr;
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/DocLog.java b/src/main/java/com/zy/asrs/entity/DocLog.java
index e29608d..5773953 100644
--- a/src/main/java/com/zy/asrs/entity/DocLog.java
+++ b/src/main/java/com/zy/asrs/entity/DocLog.java
@@ -46,9 +46,9 @@
     private String docName;
 
     /**
-     * 鐗╂枡鍙�
+     * 鍝佸彿
      */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
+    @ApiModelProperty(value= "鍝佸彿")
     private String matnr;
 
     /**
@@ -94,7 +94,7 @@
 //            null,    // 鍗曟嵁缂栧彿
 //            null,    // 鍗曟嵁绫诲瀷
 //            null,    // 鍗曟嵁鍚嶇О
-//            null,    // 鐗╂枡鍙�
+//            null,    // 鍝佸彿
 //            null,    // 涓婃姤鏁伴噺
 //            null,    // 缁撴灉
 //            null,    // 涓婃姤鏃堕棿
diff --git a/src/main/java/com/zy/asrs/entity/LocCheck.java b/src/main/java/com/zy/asrs/entity/LocCheck.java
index aa7ba3e..9c3ac0e 100644
--- a/src/main/java/com/zy/asrs/entity/LocCheck.java
+++ b/src/main/java/com/zy/asrs/entity/LocCheck.java
@@ -41,9 +41,9 @@
     private String locNo;
 
     /**
-     * 鐗╂枡鍙�
+     * 鍝佸彿
      */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
+    @ApiModelProperty(value= "鍝佸彿")
     private String matnr;
 
     /**
@@ -114,7 +114,7 @@
 //    LocCheck locCheck = new LocCheck(
 //            null,    // 鐘舵��
 //            null,    // 搴撲綅鍙�
-//            null,    // 鐗╂枡鍙�
+//            null,    // 鍝佸彿
 //            null,    // 鐩樼偣鍓嶆暟閲�
 //            null,    // 鐪熷疄鏁伴噺
 //            null,    // 鍒涘缓浜�
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 332cf44..b330cb9 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -35,20 +35,20 @@
     @ExcelProperty("鏁伴噺")
     private Double anfme;
 
-    @ApiModelProperty(value= "鐗╂枡鍙�")
-    @ExcelProperty("鐗╂枡鍙�")
-    private String matnr;
-
     @ApiModelProperty(value= "鍝佸彿")
     @ExcelProperty("鍝佸彿")
+    private String matnr;
+
+    @ApiModelProperty(value= "鍝佸悕")
+    @ExcelProperty("鍝佸悕")
     private String maktx;
 
     @ApiModelProperty(value= "鎵瑰彿")
-    @ExcelProperty("鎵瑰彿")
+//    @ExcelProperty("鎵瑰彿")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
-    @ExcelProperty("鍗曟嵁缂栧彿")
+//    @ExcelProperty("鍗曟嵁缂栧彿")
     @TableField("order_no")
     private String orderNo;
 
@@ -62,10 +62,11 @@
     private String color;
 
     @ApiModelProperty(value= "绫诲瀷")
-//    @ApiModelProperty(value= "鍝佺墝")
+    @ExcelProperty("绫诲瀷")
     private String brand;
 
     @ApiModelProperty(value= "鍗曚綅")
+    @ExcelProperty("鍗曚綅")
     private String unit;
 
     @ApiModelProperty(value= "鍗曚环")
@@ -112,6 +113,7 @@
     private String threeCode;
 
     @ApiModelProperty(value= "渚涘簲鍟�")
+    @ExcelProperty("渚涘簲鍟�")
     private String supp;
 
     @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index 937923e..c98d1bb 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -61,18 +61,18 @@
     private Double anfme;
 
     /**
-     * 鐗╂枡鍙�
-     */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
-    @TableId(value = "matnr", type = IdType.INPUT)
-    @ExcelProperty(value = "鐗╂枡鍙�")
-    private String matnr;
-
-    /**
      * 鍝佸彿
      */
     @ApiModelProperty(value= "鍝佸彿")
+    @TableId(value = "matnr", type = IdType.INPUT)
     @ExcelProperty(value = "鍝佸彿")
+    private String matnr;
+
+    /**
+     * 鍝佸悕
+     */
+    @ApiModelProperty(value= "鍝佸悕")
+    @ExcelProperty(value = "鍝佸悕")
     private String maktx;
 
     /**
@@ -235,8 +235,8 @@
 //            null,    // 鎵�灞炶揣浣�
 //            null,    // 鎵樼洏鐮�
 //            null,    // 搴撳瓨浣欓噺[闈炵┖]
-//            null,    // 鐗╂枡鍙穂闈炵┖]
-//            null,    // 鍝佸彿
+//            null,    // 鍝佸彿[闈炵┖]
+//            null,    // 鍝佸悕
 //            null,    // 鍚嶇О
 //            null,    // 瑙勬牸
 //            null,    // 鍨嬪彿
diff --git a/src/main/java/com/zy/asrs/entity/ManPakOut.java b/src/main/java/com/zy/asrs/entity/ManPakOut.java
index 899b2c5..d5a8994 100644
--- a/src/main/java/com/zy/asrs/entity/ManPakOut.java
+++ b/src/main/java/com/zy/asrs/entity/ManPakOut.java
@@ -59,15 +59,15 @@
     private String locNo;
 
     /**
-     * 鐗╂枡鍙�
-     */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
-    private String matnr;
-
-    /**
      * 鍝佸彿
      */
     @ApiModelProperty(value= "鍝佸彿")
+    private String matnr;
+
+    /**
+     * 鍝佸悕
+     */
+    @ApiModelProperty(value= "鍝佸悕")
     private String maktx;
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 71434c5..428d94c 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -63,18 +63,18 @@
     private Long tagId;
 
     /**
-     * 鐗╂枡鍙�
-     */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
-    @ExcelProperty(value = "鐗╂枡鍙�")
-    private String matnr;
-
-
-    /**
      * 鍝佸彿
      */
     @ApiModelProperty(value= "鍝佸彿")
     @ExcelProperty(value = "鍝佸彿")
+    private String matnr;
+
+
+    /**
+     * 鍝佸悕
+     */
+    @ApiModelProperty(value= "鍝佸悕")
+    @ExcelProperty(value = "鍝佸悕")
     private String maktx;
 
     /**
@@ -110,14 +110,14 @@
      */
     @ApiModelProperty(value= "绫诲瀷")
 //    @ApiModelProperty(value= "鍝佺墝")
-    @ExcelIgnore
+    @ExcelProperty(value = "绫诲瀷")
     private String brand;
 
     /**
      * 鍗曚綅
      */
     @ApiModelProperty(value= "鍗曚綅")
-    @ExcelIgnore
+    @ExcelProperty(value = "鍗曚綅")
     private String unit;
 
     /**
@@ -367,8 +367,8 @@
 //    Mat mat = new Mat(
 //            null,    // 缂栧彿
 //            null,    // 鎵�灞炲綊绫�
-//            null,    // 鐗╂枡鍙�
 //            null,    // 鍝佸彿
+//            null,    // 鍝佸悕
 //            null,    // 鍒悕
 //            null,    // 瑙勬牸
 //            null,    // 鍨嬪彿
diff --git a/src/main/java/com/zy/asrs/entity/MatCodePrint.java b/src/main/java/com/zy/asrs/entity/MatCodePrint.java
index ab3e9b4..5214dde 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodePrint.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodePrint.java
@@ -6,7 +6,7 @@
 public class MatCodePrint {
 
     /**
-     * 鐗╂枡鍙�
+     * 鍝佸彿
      */
     private String matNo;
 
@@ -16,7 +16,7 @@
     private String barcode;
 
     /**
-     * 鍝佸彿
+     * 鍝佸悕
      */
     private String matName;
 
diff --git a/src/main/java/com/zy/asrs/entity/MatV2.java b/src/main/java/com/zy/asrs/entity/MatV2.java
index 1e7faf6..4e8dd9a 100644
--- a/src/main/java/com/zy/asrs/entity/MatV2.java
+++ b/src/main/java/com/zy/asrs/entity/MatV2.java
@@ -36,11 +36,11 @@
     private String tagId;
 
     @ApiModelProperty(value= "")
-    @ExcelProperty(value = "鐗╂枡鍙�")
+    @ExcelProperty(value = "鍝佸彿")
     private String matnr;
 
     @ApiModelProperty(value= "")
-    @ExcelProperty(value = "鍝佸彿")
+    @ExcelProperty(value = "鍝佸悕")
     private String maktx;
 
     @ApiModelProperty(value= "")
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f1d8a22..ed6b619 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -72,15 +72,15 @@
     private Double qty;
 
     /**
-     * 鐗╂枡鍙�
-     */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
-    private String matnr;
-
-    /**
      * 鍝佸彿
      */
     @ApiModelProperty(value= "鍝佸彿")
+    private String matnr;
+
+    /**
+     * 鍝佸悕
+     */
+    @ApiModelProperty(value= "鍝佸悕")
     private String maktx;
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/Pack.java b/src/main/java/com/zy/asrs/entity/Pack.java
index cb1e682..d6e6d45 100644
--- a/src/main/java/com/zy/asrs/entity/Pack.java
+++ b/src/main/java/com/zy/asrs/entity/Pack.java
@@ -43,9 +43,9 @@
     private String barcode;
 
     /**
-     * 鐗╂枡鍙�
+     * 鍝佸彿
      */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
+    @ApiModelProperty(value= "鍝佸彿")
     private String matnr;
 
     /**
@@ -119,7 +119,7 @@
 
 //    Pack pack = new Pack(
 //            null,    // 鏉$爜[闈炵┖]
-//            null,    // 鐗╂枡鍙�
+//            null,    // 鍝佸彿
 //            null,    // 搴忓垪鐮�
 //            null,    // 璁㈠崟鐘舵��
 //            null,    // 鐘舵��
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 0d03e3e..f486a59 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -38,10 +38,10 @@
 	@ApiModelProperty(value= "鏁伴噺")
 	private Double anfme;
 
-	@ApiModelProperty(value= "鐗╂枡鍙�")
+	@ApiModelProperty(value= "鍝佸彿")
 	private String matnr;
 
-	@ApiModelProperty(value= "鍝佸彿")
+	@ApiModelProperty(value= "鍝佸悕")
 	private String maktx;
 
 	@ApiModelProperty(value= "鎵瑰彿")
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 78f739b..b42717d 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -49,10 +49,10 @@
 	@ApiModelProperty(value= "鏁伴噺")
 	private Double anfme;
 
-	@ApiModelProperty(value= "鐗╂枡鍙�")
+	@ApiModelProperty(value= "鍝佸彿")
 	private String matnr;
 
-	@ApiModelProperty(value= "鍝佸彿")
+	@ApiModelProperty(value= "鍝佸悕")
 	private String maktx;
 
 	@ApiModelProperty(value= "鎵瑰彿")
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index ed0a02e..5e8bcb3 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -33,10 +33,10 @@
     private String locNo;
 
     @TableId("matnr")
-    @ApiModelProperty(value= "鐗╂枡鍙�")
+    @ApiModelProperty(value= "鍝佸彿")
     private String matnr;
 
-    @ApiModelProperty(value= "鍝佸彿")
+    @ApiModelProperty(value= "鍝佸悕")
     private String maktx;
 
     @TableId("batch")
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index ac36192..b267c15 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -26,10 +26,10 @@
     @TableField("loc_no")
     private String locNo;
 
-    @ApiModelProperty(value= "鐗╂枡鍙�")
+    @ApiModelProperty(value= "鍝佸彿")
     private String matnr;
 
-    @ApiModelProperty(value= "鍝佸彿")
+    @ApiModelProperty(value= "鍝佸悕")
     private String maktx;
 
     @ApiModelProperty(value= "鎵瑰彿")
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 0826c64..04c8385 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -49,13 +49,13 @@
     /**
      * 鐗╂枡
      */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
+    @ApiModelProperty(value= "鍝佸彿")
     private String matnr;
 
     /**
      * 鐗╂枡鎻忚堪
      */
-    @ApiModelProperty(value= "鍝佸彿")
+    @ApiModelProperty(value= "鍝佸悕")
     private String maktx;
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index ea44a5d..0f4bd0c 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -50,13 +50,13 @@
     /**
      * 鐗╂枡
      */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
+    @ApiModelProperty(value= "鍝佸彿")
     private String matnr;
 
     /**
      * 鐗╂枡鎻忚堪
      */
-    @ApiModelProperty(value= "鍝佸彿")
+    @ApiModelProperty(value= "鍝佸悕")
     private String maktx;
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/param/CheckBom.java b/src/main/java/com/zy/asrs/entity/param/CheckBom.java
index 853fd9f..063be23 100644
--- a/src/main/java/com/zy/asrs/entity/param/CheckBom.java
+++ b/src/main/java/com/zy/asrs/entity/param/CheckBom.java
@@ -7,6 +7,6 @@
     // bom鍙�
     private String bomCode;
 
-    // 鐗╂枡鍙�
+    // 鍝佸彿
     private String matnr;
 }
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index c654988..8613e75 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -21,7 +21,7 @@
     @Data
     public static class LocDetlAdjust {
 
-        // 鐗╂枡鍙�
+        // 鍝佸彿
         private String matnr;
 
         // 搴忓垪鐮�
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
index 0d03a5d..a4a5f68 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -21,12 +21,12 @@
     @Data
     public static class MatParam{
         /**
-         * 鐗╂枡鍙�
+         * 鍝佸彿
          */
         private String matnr;
 
         /**
-         * 鍝佸彿
+         * 鍝佸悕
          */
         private String maktx;
 
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index e864f9b..691f6bc 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -22,7 +22,7 @@
         // 搴撲綅鍙�
         private String locNo;
 
-        // 鐗╂枡鍙�
+        // 鍝佸彿
         private String matnr;
 
         // 搴忓垪鐮�
diff --git a/src/main/java/com/zy/asrs/entity/result/Pakin.java b/src/main/java/com/zy/asrs/entity/result/Pakin.java
index 7b16dd6..1a3468e 100644
--- a/src/main/java/com/zy/asrs/entity/result/Pakin.java
+++ b/src/main/java/com/zy/asrs/entity/result/Pakin.java
@@ -74,17 +74,17 @@
     private String locNo;
 
     /**
-     * 鐗╂枡鍙�
-     */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
-    @ExcelProperty(value = "鐗╂枡鍙�")
-    private String matnr;
-
-    /**
      * 鍝佸彿
      */
     @ApiModelProperty(value= "鍝佸彿")
     @ExcelProperty(value = "鍝佸彿")
+    private String matnr;
+
+    /**
+     * 鍝佸悕
+     */
+    @ApiModelProperty(value= "鍝佸悕")
+    @ExcelProperty(value = "鍝佸悕")
     private String maktx;
 
     /**
@@ -251,8 +251,8 @@
 //            null,    // 鍏ュ簱鏁伴噺
 //            null,    // 鍏宠仈璐т綅[闈炵┖]
 //            null,    // 璐т綅[闈炵┖]
-//            null,    // 鐗╂枡鍙穂闈炵┖]
-//            null,    // 鍝佸彿
+//            null,    // 鍝佸彿[闈炵┖]
+//            null,    // 鍝佸悕
 //            null,    // 鍚嶇О
 //            null,    // 瑙勬牸
 //            null,    // 鍨嬪彿
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 4625f20..753122a 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -42,16 +42,16 @@
     int increaseAnfme(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
 
     /**
-     * 鏍规嵁鐗╂枡鍙峰拰鎵瑰彿鍒嗗埆鏌ヨ鍦ㄥ钩搴撹鐗╂枡搴撳瓨
-     * @param matnr 鐗╂枡鍙�
+     * 鏍规嵁鍝佸彿鍜屾壒鍙峰垎鍒煡璇㈠湪骞冲簱璇ョ墿鏂欏簱瀛�
+     * @param matnr 鍝佸彿
      * @param batch 鎵瑰彿
      * @return 搴撳瓨鏁伴噺
      */
     Long selectCountToAsrByMatnr(@Param("matnr") String matnr,@Param("batch") String batch);
 
     /**
-     * 鏍规嵁鐗╂枡鍙峰拰鎵瑰彿鍒嗗埆鏌ヨ鍦ㄧ珛搴撹鐗╂枡搴撳瓨
-     * @param matnr 鐗╂枡鍙�
+     * 鏍规嵁鍝佸彿鍜屾壒鍙峰垎鍒煡璇㈠湪绔嬪簱璇ョ墿鏂欏簱瀛�
+     * @param matnr 鍝佸彿
      * @param batch 鎵瑰彿
      * @return 搴撳瓨鏁伴噺
      */
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 6cda051..120451a 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -26,7 +26,7 @@
 
     /**
      * 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
-     * @param matnr 鐗╂枡鍙�
+     * @param matnr 鍝佸彿
      * @return locNo 搴撲綅鍙�
      */
     List<String> getSameDetlToday(String matnr, Integer start, Integer end);
diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
index c80190e..ca1cf82 100644
--- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
@@ -25,7 +25,7 @@
 
     /**
      * 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
-     * @param matnr 鐗╂枡鍙�
+     * @param matnr 鍝佸彿
      * @return locNo 搴撲綅鍙�
      */
     List<String> getSameDetlToday(String matnr, Integer start, Integer end);
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index d5865f9..836bd13 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -46,8 +46,8 @@
     boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty);
 
     /**
-     * 鏍规嵁鐗╂枡鍙峰拰鎵瑰彿鍒嗗埆鏌ヨ鍦ㄥ钩搴撳拰绔嬪簱璇ョ墿鏂欏簱瀛�
-     * @param matnr 鐗╂枡鍙�
+     * 鏍规嵁鍝佸彿鍜屾壒鍙峰垎鍒煡璇㈠湪骞冲簱鍜岀珛搴撹鐗╂枡搴撳瓨
+     * @param matnr 鍝佸彿
      * @param batch 鎵瑰彿
      * @return 杩斿洖涓や釜閿�煎锛宎srCount鍦ㄧ珛搴撳簱瀛橈紝manCount鍦ㄥ钩搴撳簱瀛�
      */
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 43b9ef0..162604f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -839,7 +839,7 @@
             if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getWorkQty()) < 0) {
                 return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
             }
-            //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
+            //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鍝佸彿锛屾湁鐨勮瘽鐩存帴澧炲姞鏁伴噺
             ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
             if (checkManLocDetl == null) {
                 ManLocDetl manLocDetl = new ManLocDetl();
@@ -913,7 +913,7 @@
             if (jsonOrderDetl.getAnfme() > (orderDetl.getAnfme() - orderDetl.getWorkQty())) {
                 return R.error("鍑哄簱鏁伴噺澶т簬鍗曟嵁鍙嚭鏁伴噺");
             }
-            //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙�
+            //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鍝佸彿
             ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),orderDetl.getBatch());
             if (checkManLocDetl == null) {
                 return R.error("璇ュ簱浣嶆病鏈夊嚭搴撶殑鐗╂枡淇℃伅");
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 9dd0080..37ff2a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -363,7 +363,7 @@
         Date now = new Date();
         pack = new Pack(
                 param.getBarcode(),    // 鏉$爜[闈炵┖]
-                analyse.getMatnr(),    // 鐗╂枡鍙�
+                analyse.getMatnr(),    // 鍝佸彿
                 analyse.getBarcode(),    // 搴忓垪鐮�
                 1L,    // 璁㈠崟鐘舵��
                 1,    // 鐘舵��
@@ -459,7 +459,7 @@
             if (!matService.insert(mat)) {
                 throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
             } else {
-                log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鐗╂枡鍙凤細{}]", mat.getMatnr());
+                log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍝佸彿锛歿}]", mat.getMatnr());
             }
         }
     }
@@ -473,7 +473,7 @@
 
         for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
             if (Cools.isEmpty(matParam.getMatnr())) {
-                throw new CoolException("鐗╂枡鍙蜂笉鑳戒负绌�");
+                throw new CoolException("鍝佸彿涓嶈兘涓虹┖");
             }
 
             Date now = new Date();
@@ -532,7 +532,7 @@
                 if (!matService.insert(mat)) {
                     throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
                 } else {
-                    log.info("鍚屾鏂扮墿鏂橻鐗╂枡鍙凤細{}]", mat.getMatnr());
+                    log.info("鍚屾鏂扮墿鏂橻鍝佸彿锛歿}]", mat.getMatnr());
                 }
             } else {
 //                mat.sync(param);
diff --git a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
index db1adb8..e0704ff 100644
--- a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
+++ b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
@@ -44,7 +44,7 @@
     private CheckDeepHandler checkDeepHandler;
 
     /**
-     * 灏嗕袱涓繁搴撲綅鍚堝苟涓烘繁娴呭簱浣�,鐗╂枡鍙风浉鍚岋紝婧愬簱浣嶅叆搴撴棩鏈熸棭浜庣洰鏍囧簱浣嶅搴旀繁搴撲綅鍏ュ簱鏃ユ湡锛屽簱浣嶇姸鎬侀兘涓篎
+     * 灏嗕袱涓繁搴撲綅鍚堝苟涓烘繁娴呭簱浣�,鍝佸彿鐩稿悓锛屾簮搴撲綅鍏ュ簱鏃ユ湡鏃╀簬鐩爣搴撲綅瀵瑰簲娣卞簱浣嶅叆搴撴棩鏈燂紝搴撲綅鐘舵�侀兘涓篎
      */
     @Scheduled(cron = "0/30 * * * * ?")
     private void execute() throws ParseException {
diff --git a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
index 9eb6b97..67da283 100644
--- a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
@@ -199,7 +199,7 @@
 //                            continue;
 //                        }
 //
-//                        //鐗╂枡鍙风浉鍚岋紝婧愬簱浣嶅叆搴撴棩鏈熸棭浜庣洰鏍囧簱浣嶅搴旀繁搴撲綅鍏ュ簱鏃ユ湡锛屽簱浣嶇姸鎬侀兘涓篎
+//                        //鍝佸彿鐩稿悓锛屾簮搴撲綅鍏ュ簱鏃ユ湡鏃╀簬鐩爣搴撲綅瀵瑰簲娣卞簱浣嶅叆搴撴棩鏈燂紝搴撲綅鐘舵�侀兘涓篎
 //                        if (sourceLoc.getMatNo().equals(targetLoc.getMatNo())
 //                                && sourceLoc.getItemBatch().equals(targetLoc.getItemBatch())
 //                                && sourceLoc.getSpecs().equals(targetLoc.getSpecs())
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index a16e06d..4e12793 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -132,7 +132,7 @@
             mat = excel;
             mat.setTagId(tagId);
             if (!matService.insert(mat)) {
-                throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛岀墿鏂欏彿锛�" + excel.getMatnr());
+                throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽搧鍙凤細" + excel.getMatnr());
             }
             total++;
         }
diff --git a/src/main/java/com/zy/asrs/utils/MatV2ExcelListener.java b/src/main/java/com/zy/asrs/utils/MatV2ExcelListener.java
index d20454e..22bf541 100644
--- a/src/main/java/com/zy/asrs/utils/MatV2ExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatV2ExcelListener.java
@@ -88,7 +88,7 @@
             matV2.setUuid(uuid);
             matV2.setTagId(tagId);
             if (!matV2Service.insert(matV2)) {
-                throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛岀墿鏂欏彿锛�" + excel.getMatnr());
+                throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽搧鍙凤細" + excel.getMatnr());
             }
             total++;
         } else {
@@ -96,7 +96,7 @@
             matV2.setUuid(uuid);
             matV2.setTagId(tagId);
             if (!matV2Service.update(matV2,new EntityWrapper<MatV2>().eq("matnr",matV2.getMatnr()))) {
-                throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛岀墿鏂欏彿锛�" + excel.getMatnr());
+                throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽搧鍙凤細" + excel.getMatnr());
             }
             total++;
         }
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a246285..32af254 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -92,7 +92,7 @@
      * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
      * @param staDescId 璺緞宸ヤ綔绫诲瀷
      * @param sourceStaNo 婧愮珯
-     * @param matNos 鐗╂枡鍙烽泦鍚�
+     * @param matNos 鍝佸彿闆嗗悎
      * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
      */
     @Transactional
@@ -360,12 +360,12 @@
      * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
      * @param staDescId 璺緞宸ヤ綔绫诲瀷
      * @param sourceStaNo 婧愮珯
-     * @param matnr 鐗╂枡鍙烽泦鍚�
+     * @param matnr 鍝佸彿闆嗗悎
      * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
      */
     @Transactional
     public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
-        if (Cools.isEmpty(matnr)) {  //鐗╂枡鍙�
+        if (Cools.isEmpty(matnr)) {  //鍝佸彿
             matnr = "";
         }
         if (Cools.isEmpty(batch)) {  //绠卞彿
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index f248f96..21fc7a9 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -25,7 +25,7 @@
 
   
     @RequestMapping(value = "/barcode/qrcode/auth")
-//    @ManagerAuth(memo = "鐗╂枡鍙锋潯褰㈢爜鑾峰彇(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
+//    @ManagerAuth(memo = "鍝佸彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
     public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
                             , @RequestParam String param
                             , @RequestParam(required = false) Integer width
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e88ab6f..dd66c92 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -138,29 +138,45 @@
     <select id="getStockStatis" resultType="com.zy.asrs.entity.LocDetl">
         select * from
         (
-            select
-            ROW_NUMBER() over (order by sum(a.anfme) desc) as row
-            , a.matnr
-            , sum(a.anfme) as anfme
-            from asr_loc_detl a
-            where 1=1
-            <include refid="stockOutCondition"></include>
-            group by a.matnr
-         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+        select
+        ROW_NUMBER() over (order by sum(a.anfme) desc) as row
+        , a.matnr
+        , sum(a.anfme) as anfme
+        from asr_loc_detl a
+        where 1=1
+        <!-- 鍔ㄦ�佹坊鍔犺鏍煎拰绫诲瀷鐨勬潯浠� -->
+        <if test="specs != null and specs != ''">
+            AND a.specs = #{specs}
+        </if>
+        <if test="brand != null and brand != ''">
+            AND a.brand = #{brand}
+        </if>
+        <include refid="stockOutCondition"></include>
+        group by a.matnr
+        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
+
     <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
-     select count(1) as count from
+        select count(1) as count from
         (
         select
         a.matnr
         from asr_loc_detl a
         where 1=1
+        <!-- 鍔ㄦ�佹坊鍔犺鏍煎拰绫诲瀷鐨勬潯浠� -->
+        <if test="specs != null and specs != ''">
+            AND a.specs = #{specs}
+        </if>
+        <if test="brand != null and brand != ''">
+            AND a.brand = #{brand}
+        </if>
         <include refid="stockOutCondition"></include>
         group by a.matnr
-     ) b
+        ) b
     </select>
 
+
     <select id="getStockStatisExcel" resultType="com.zy.asrs.entity.LocDetl">
         select
         ROW_NUMBER() over (order by sum(a.anfme) desc) as row
diff --git a/src/main/webapp/h5/static/js/pages-index-index.3bd687c2.js b/src/main/webapp/h5/static/js/pages-index-index.3bd687c2.js
index e6ce69b..8908867 100644
--- a/src/main/webapp/h5/static/js/pages-index-index.3bd687c2.js
+++ b/src/main/webapp/h5/static/js/pages-index-index.3bd687c2.js
@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-index"],{"05f6":function(t,n,e){"use strict";e.r(n);var i=e("1fec"),a=e("fac2");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("098b");var s=e("f0c5"),r=Object(s["a"])(a["default"],i["b"],i["c"],!1,null,"58e7869c",null,!1,i["a"],void 0);n["default"]=r.exports},"098b":function(t,n,e){"use strict";var i=e("45d8"),a=e.n(i);a.a},"1fec":function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return i}));var i={uniTransition:e("9b17").default},a=function(){var t=this,n=t.$createElement,e=t._self._c||n;return t.showPopup?e("v-uni-view",{staticClass:"uni-popup",class:[t.popupstyle,t.isDesktop?"fixforpc-z-index":""],on:{touchmove:function(n){n.stopPropagation(),n.preventDefault(),arguments[0]=n=t.$handleEvent(n),t.clear.apply(void 0,arguments)}}},[e("v-uni-view",{on:{touchstart:function(n){arguments[0]=n=t.$handleEvent(n),t.touchstart.apply(void 0,arguments)}}},[t.maskShow?e("uni-transition",{key:"1",attrs:{name:"mask","mode-class":"fade",styles:t.maskClass,duration:t.duration,show:t.showTrans},on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.onTap.apply(void 0,arguments)}}}):t._e(),e("uni-transition",{key:"2",attrs:{"mode-class":t.ani,name:"content",styles:t.transClass,duration:t.duration,show:t.showTrans},on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.onTap.apply(void 0,arguments)}}},[e("v-uni-view",{staticClass:"uni-popup__wrapper",class:[t.popupstyle],style:{backgroundColor:t.bg},on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.clear.apply(void 0,arguments)}}},[t._t("default")],2)],1)],1),t.maskShow?e("keypress",{on:{esc:function(n){arguments[0]=n=t.$handleEvent(n),t.onTap.apply(void 0,arguments)}}}):t._e()],1):t._e()},o=[]},"309e":function(t,n,e){"use strict";e("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={data:function(){return{}},created:function(){this.popup=this.getParent()},methods:{getParent:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"uniPopup",n=this.$parent,e=n.$options.name;while(e!==t){if(n=n.$parent,!n)return!1;e=n.$options.name}return n}}};n.default=i},"3e54":function(t,n,e){"use strict";e.r(n);var i=e("8b3f"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a},"3f77":function(t,n,e){var i=e("9b37");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=e("4f06").default;a("e26222a6",i,!0,{sourceMap:!1,shadowMode:!1})},"45d8":function(t,n,e){var i=e("5652");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=e("4f06").default;a("6f84f74c",i,!0,{sourceMap:!1,shadowMode:!1})},5652:function(t,n,e){var i=e("24fb");n=i(!1),n.push([t.i,'@charset "UTF-8";\r\n/**\r\n * 杩欓噷鏄痷ni-app鍐呯疆鐨勫父鐢ㄦ牱寮忓彉閲廫r\n *\r\n * uni-app 瀹樻柟鎵╁睍鎻掍欢鍙婃彃浠跺競鍦猴紙https://ext.dcloud.net.cn锛変笂寰堝涓夋柟鎻掍欢鍧囦娇鐢ㄤ簡杩欎簺鏍峰紡鍙橀噺\r\n * 濡傛灉浣犳槸鎻掍欢寮�鍙戣�咃紝寤鸿浣犱娇鐢╯css棰勫鐞嗭紝骞跺湪鎻掍欢浠g爜涓洿鎺ヤ娇鐢ㄨ繖浜涘彉閲忥紙鏃犻渶 import 杩欎釜鏂囦欢锛夛紝鏂逛究鐢ㄦ埛閫氳繃鎼Н鏈ㄧ殑鏂瑰紡寮�鍙戞暣浣撻鏍间竴鑷寸殑App\r\n *\r\n */\r\n/**\r\n * 濡傛灉浣犳槸App寮�鍙戣�咃紙鎻掍欢浣跨敤鑰咃級锛屼綘鍙互閫氳繃淇敼杩欎簺鍙橀噺鏉ュ畾鍒惰嚜宸辩殑鎻掍欢涓婚锛屽疄鐜拌嚜瀹氫箟涓婚鍔熻兘\r\n *\r\n * 濡傛灉浣犵殑椤圭洰鍚屾牱浣跨敤浜唖css棰勫鐞嗭紝浣犱篃鍙互鐩存帴鍦ㄤ綘鐨� scss 浠g爜涓娇鐢ㄥ涓嬪彉閲忥紝鍚屾椂鏃犻渶 import 杩欎釜鏂囦欢\r\n */\r\n/* 棰滆壊鍙橀噺 */\r\n/* 琛屼负鐩稿叧棰滆壊 */\r\n/* 鏂囧瓧鍩烘湰棰滆壊 */\r\n/* 鑳屾櫙棰滆壊 */\r\n/* 杈规棰滆壊 */\r\n/* 灏哄鍙橀噺 */\r\n/* 鏂囧瓧灏哄 */\r\n/* 鍥剧墖灏哄 */\r\n/* Border Radius */\r\n/* 姘村钩闂磋窛 */\r\n/* 鍨傜洿闂磋窛 */\r\n/* 閫忔槑搴� */\r\n/* 鏂囩珷鍦烘櫙鐩稿叧 */.uni-popup[data-v-58e7869c]{position:fixed;z-index:99}.uni-popup.top[data-v-58e7869c], .uni-popup.left[data-v-58e7869c], .uni-popup.right[data-v-58e7869c]{top:var(--window-top)}.uni-popup .uni-popup__wrapper[data-v-58e7869c]{display:block;position:relative\r\n  /* iphonex 绛夊畨鍏ㄥ尯璁剧疆锛屽簳閮ㄥ畨鍏ㄥ尯閫傞厤 */}.uni-popup .uni-popup__wrapper.left[data-v-58e7869c], .uni-popup .uni-popup__wrapper.right[data-v-58e7869c]{padding-top:var(--window-top);flex:1}.fixforpc-z-index[data-v-58e7869c]{z-index:999}.fixforpc-top[data-v-58e7869c]{top:0}',""]),t.exports=n},5691:function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return i}));var i={qiunDataCharts:e("1f58").default,uniPopup:e("05f6").default,uniPopupDialog:e("c6dc").default},a=function(){var t=this,n=t.$createElement,i=t._self._c||n;return i("v-uni-view",{staticClass:"container"},[i("v-uni-view",{staticClass:"floor-screen",class:t.floorMove},[i("v-uni-view",{staticClass:"head"},[i("v-uni-text",{on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.port()}}},[t._v("鑷姩浠撳簱WCS鐩戞帶骞冲彴")]),i("v-uni-view",{staticClass:"time-tools"},[t._v(t._s(t.year)+"-"+t._s(t.month)+"-"+t._s(t.day)+"聽"+t._s(t.hours)+":"+t._s(t.minutes)+":"+t._s(t.seconds)+"聽"+t._s(t.week))]),i("v-uni-view",{staticClass:"button-left",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ejected()}}}),i("v-uni-view",{staticClass:"button-right",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ledId()}}})],1),i("v-uni-view",{staticClass:"main"},[i("v-uni-view",{staticClass:"main-sides",staticStyle:{width:"100%"}},[i("v-uni-view",{staticClass:"box",staticStyle:{height:"90%"}},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{directives:[{name:"show",rawName:"v-show",value:!t.errorShow,expression:"!errorShow"}],staticStyle:{width:"100%",height:"100%"}},[i("v-uni-view",{class:t.width},[i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.title))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.staNo))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.maknx))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.specs))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.count))])],1),i("v-uni-view",{directives:[{name:"show",rawName:"v-show",value:t.orderShow,expression:"orderShow"}],staticStyle:{width:"50%",height:"100%",display:"inline-block",float:"left"}},[i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.orderNo))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.doneOfTray))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.totalOfTray))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.doneOfUnit))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.totalOfUnit))])],1)],1),i("v-uni-view",{directives:[{name:"show",rawName:"v-show",value:t.errorShow,expression:"errorShow"}],staticStyle:{width:"100%",height:"100%"}},[i("v-uni-view",{staticStyle:{"line-height":"700px","font-size":"175rpx"}},[t._v(t._s(t.errorMsg))])],1)],1)],1)],1)],1),i("v-uni-view",{staticClass:"top-screen",class:t.topMove},[i("v-uni-view",{staticClass:"head"},[i("v-uni-text",{on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.port()}}},[t._v("鑷姩浠撳簱WCS鐩戞帶骞冲彴")]),i("v-uni-view",{staticClass:"time-tools"},[t._v(t._s(t.year)+"-"+t._s(t.month)+"-"+t._s(t.day)+"聽"+t._s(t.hours)+":"+t._s(t.minutes)+":"+t._s(t.seconds)+"聽"+t._s(t.week))]),i("v-uni-view",{staticClass:"button-left",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ejected()}}}),i("v-uni-view",{staticClass:"button-right",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ledId()}}})],1),i("v-uni-view",{staticClass:"main"},[i("v-uni-view",{staticClass:"main-sides"},[i("v-uni-view",{staticClass:"box box-lg"},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{staticClass:"box-item introduce"},[i("h3",[t._v("鑷姩鍖栫珛浣撲粨搴�")]),i("p",{staticClass:"english"},[t._v("Automatic Storageand Retrieval System")]),i("p",{staticClass:"introduce-content"},[t._v("鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆俓n\t\t\t\t\t\t鑷姩鍖栫珛浣撲粨搴撶殑涓讳綋鐢辫揣鏋躲�佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆俓n\t\t\t\t\t\t璐ф灦鏄挗缁撴瀯鎴栭挗绛嬫贩鍑濆湡缁撴瀯鐨勫缓绛戠墿鎴栫粨鏋勪綋锛岃揣鏋跺唴鏄爣鍑嗗昂瀵哥殑璐т綅绌洪棿锛屽贩閬撳爢鍨涜捣閲嶆満绌胯浜庤揣鏋朵箣闂寸殑宸烽亾涓紝瀹屾垚瀛樸�佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��")])]),i("v-uni-view",{staticClass:"box-item charge-info"},[i("h3",[t._v("浠撳簱鏁版嵁")]),i("p",{staticClass:"english"},[t._v("warehouse data")]),i("v-uni-view",{staticClass:"charge-info-item"},[i("v-uni-image",{attrs:{src:e("7be7"),mode:"aspectFit"}}),i("v-uni-view",[i("v-uni-text",{staticClass:"count"},[t._v(t._s(t.xDistance))]),i("v-uni-text",{staticClass:"unit"},[t._v("m")])],1),i("v-uni-view",[t._v("绱璧拌璺濈(绫�)")])],1),i("v-uni-view",{staticClass:"charge-info-item"},[i("v-uni-image",{attrs:{src:e("feb8"),mode:"aspectFit"}}),i("v-uni-view",[i("v-uni-text",{staticClass:"count"},[t._v(t._s(t.yDistance))]),i("v-uni-text",{staticClass:"unit"},[t._v("m")])],1),i("v-uni-view",[t._v("绱鍗囬檷璺濈(绫�)")])],1),i("v-uni-view",{staticClass:"charge-info-item"},[i("v-uni-image",{attrs:{src:e("00ce"),mode:"aspectFit"}}),i("v-uni-view",[i("v-uni-text",{staticClass:"count"},[t._v(t._s(t.xDuration))]),i("v-uni-text",{staticClass:"unit"},[t._v("m")])],1),i("v-uni-view",[t._v("绱璧拌鏃堕暱(绉�)")])],1),i("v-uni-view",{staticClass:"charge-info-item"},[i("v-uni-image",{attrs:{src:e("05a1"),mode:"aspectFit"}}),i("v-uni-view",[i("v-uni-text",{staticClass:"count"},[t._v(t._s(t.yDuration))]),i("v-uni-text",{staticClass:"unit"},[t._v("m")])],1),i("v-uni-view",[t._v("绱鍗囬檷鏃堕暱(绉�)")])],1)],1),i("v-uni-view",{staticClass:"box-item use-info"},[i("v-uni-view",{staticClass:"use-left"},[i("h3",[t._v("搴撲綅浣跨敤鐜�")]),i("p",{staticClass:"english"},[t._v("EQUIPMENT USAGE THIS MONTH")])]),i("v-uni-view",{staticClass:"use-right"},[i("h3",[t._v(t._s(t.usedPr)+"%")]),i("p",{staticClass:"english"},[t._v("鍚屾瘮涓婃湀 + 5%")])]),i("v-uni-view",{staticClass:"use-main"},[i("v-uni-view",{staticClass:"left"},[i("v-uni-view",{staticClass:"progressBar"},[i("v-uni-view",{staticClass:"progress",style:"width:"+t.usedPr+"%"})],1)],1),i("v-uni-view",{staticClass:"right"},[t._v(t._s(t.used))])],1)],1)],1)],1),i("v-uni-view",{staticClass:"main-sides"},[i("v-uni-view",{staticClass:"box box-tp"},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{staticClass:"box-item right-item"},[i("v-uni-view",{staticClass:"sub-left"},[i("h3",[t._v("鍏ュ嚭搴撶粺璁�")]),i("p",{staticClass:"english"},[t._v("ORDER STATISTICS")])]),i("v-uni-view",{staticClass:"sub-right"},[i("h3",[t._v("31")]),i("p",{staticClass:"english"},[t._v("浠婃棩璁㈠崟鏁�")])]),i("v-uni-view",{staticClass:"sub-main"},[i("v-uni-view",{staticClass:"charts-box"},[i("qiun-data-charts",{attrs:{type:"line",chartData:t.chartsDataLine1,echartsH5:!0,echartsApp:!0}})],1)],1)],1)],1),i("v-uni-view",{staticClass:"box box-md"},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{staticClass:"box-item right-item"},[i("v-uni-view",{staticClass:"sub-left"},[i("h3",[t._v("搴撳瓨绫诲瀷")]),i("p",{staticClass:"english"},[t._v("INCOME DATE")])]),i("v-uni-view",{staticClass:"sub-right"},[i("h3",[t._v("浠婂ぉ")]),i("p",{staticClass:"english"},[t._v("Today")])]),i("v-uni-view",{staticClass:"sub-main"},[i("v-uni-view",{staticClass:"charts-box ring"},[i("qiun-data-charts",{attrs:{type:"ring",opts:{legend:{position:"bottom"}},eopts:t.ringOpts,chartData:t.chartsDataPie2,echartsH5:!0,echartsApp:!0}})],1),i("v-uni-view",{staticClass:"sub-main-right"},[i("v-uni-view",{staticClass:"sub-info"},[i("v-uni-image",{attrs:{src:e("82fe"),mode:"aspectFit"}}),i("v-uni-text",[t._v("鍦ㄥ簱")]),i("v-uni-text",[t._v(t._s(t.stockCount))])],1),i("v-uni-view",{staticClass:"sub-info"},[i("v-uni-image",{attrs:{src:e("1cd5"),mode:"aspectFit"}}),i("v-uni-text",[t._v("绌哄簱")]),i("v-uni-text",[t._v(t._s(t.emptyCount))])],1),i("v-uni-view",{staticClass:"sub-info"},[i("v-uni-image",{attrs:{src:e("b64b0"),mode:"aspectFit"}}),i("v-uni-text",[t._v("绂佺敤")]),i("v-uni-text",[t._v(t._s(t.noneCount))])],1)],1)],1)],1)],1),i("v-uni-view",{staticClass:"box box-bt"},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.crn()}}},[t._v("鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃")])],1)],1)],1)],1),i("v-uni-view",[i("uni-popup",{ref:"url",attrs:{type:"dialog"}},[i("uni-popup-dialog",{ref:"inputClose",attrs:{mode:"input",title:"閰嶇疆url",value:t.baseIP,placeholder:"绀轰緥:192.168.1.1"},on:{confirm:function(n){arguments[0]=n=t.$handleEvent(n),t.baseUrlConfirm.apply(void 0,arguments)}}})],1)],1),i("v-uni-view",[i("uni-popup",{ref:"ledId",attrs:{type:"dialog"}},[i("uni-popup-dialog",{ref:"inputClose",attrs:{mode:"input",title:"閰嶇疆ledId",value:t.baseLedId,placeholder:"绀轰緥:188"},on:{confirm:function(n){arguments[0]=n=t.$handleEvent(n),t.ledIdConfirm.apply(void 0,arguments)}}})],1)],1),i("v-uni-view",[i("uni-popup",{ref:"port",attrs:{type:"dialog"}},[i("uni-popup-dialog",{ref:"inputClose",attrs:{mode:"input",title:"閰嶇疆绔彛鍙�",value:t.basePort,placeholder:"绀轰緥:9090"},on:{confirm:function(n){arguments[0]=n=t.$handleEvent(n),t.portConfirm.apply(void 0,arguments)}}})],1)],1),i("v-uni-view",[i("uni-popup",{ref:"crnId",attrs:{type:"dialog"}},[i("uni-popup-dialog",{ref:"inputClose",attrs:{mode:"input",title:"閰嶇疆鍫嗗灈鏈�",value:t.crnId,placeholder:"绀轰緥:1"},on:{confirm:function(n){arguments[0]=n=t.$handleEvent(n),t.crnConfirm.apply(void 0,arguments)}}})],1)],1),i("v-uni-view",{directives:[{name:"show",rawName:"v-show",value:t.ejectShow,expression:"ejectShow"}],staticClass:"eject-mask"},[i("v-uni-view",{staticClass:"eject"},[i("v-uni-view",{staticClass:"eject-title"},[t._v("淇敼 / 閰嶇疆")]),i("v-uni-view",{staticClass:"eject-input"},[i("v-uni-view",{staticClass:"item"},[i("v-uni-view",{staticClass:"desc"},[t._v("ip锛�")]),i("v-uni-view",{staticClass:"input"},[i("v-uni-input",{attrs:{type:"text"},model:{value:t.baseIP,callback:function(n){t.baseIP=n},expression:"baseIP"}})],1)],1),i("v-uni-view",{staticClass:"item"},[i("v-uni-view",{staticClass:"desc"},[t._v("port锛�")]),i("v-uni-view",{staticClass:"input"},[i("v-uni-input",{attrs:{type:"text"},model:{value:t.basePort,callback:function(n){t.basePort=n},expression:"basePort"}})],1)],1),i("v-uni-view",{staticClass:"item"},[i("v-uni-view",{staticClass:"desc"},[t._v("ledId锛�")]),i("v-uni-view",{staticClass:"input"},[i("v-uni-input",{attrs:{type:"text"},model:{value:t.baseLedId,callback:function(n){t.baseLedId=n},expression:"baseLedId"}})],1)],1),i("v-uni-view",{staticClass:"item"},[i("v-uni-view",{staticClass:"desc"},[t._v("CrnId锛�")]),i("v-uni-view",{staticClass:"input"},[i("v-uni-input",{attrs:{type:"text"},model:{value:t.baseCrnId,callback:function(n){t.baseCrnId=n},expression:"baseCrnId"}})],1)],1)],1),i("v-uni-view",{staticClass:"eject-button"},[i("v-uni-view",{staticClass:"button-item",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ejectClose.apply(void 0,arguments)}}},[t._v("鍙� 娑�")]),i("v-uni-view",{staticClass:"button-item",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ejectConfirm.apply(void 0,arguments)}}},[t._v("纭� 璁�")])],1)],1)],1)],1)},o=[]},"608f":function(t){t.exports=JSON.parse('{"uni-popup.cancel":"鍙栨秷","uni-popup.ok":"纰哄畾","uni-popup.placeholder":"璜嬭几鍏�","uni-popup.title":"鎻愮ず","uni-popup.shareTitle":"鍒嗕韩鍒�"}')},"6b2c":function(t,n,e){"use strict";var i=e("3f77"),a=e.n(i);a.a},"75f2":function(t,n,e){var i=e("e64a");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=e("4f06").default;a("fb8ea27a",i,!0,{sourceMap:!1,shadowMode:!1})},7714:function(t,n,e){"use strict";e("7a82");var i=e("4ea4").default;Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,e("e9c4");var a=i(e("6bf8")),o=i(e("f887")),s={data:function(){return{commonUrl:null,show:!0,modeClass:"fade",styles:{},baseIP:"",baseLedId:"",basePort:"",crnId:"",value:"",xDistance:0,yDistance:0,xDuration:0,yDuration:0,used:317,usedPr:90,stockCount:0,emptyCount:0,noneCount:0,chartsData:{Line:{categories:[],series:[]},Pie:{series:[{data:[]}]}},chartsDataLine1:{},chartsDataPie2:{},ringOpts:{},year:2022,month:4,day:14,hours:13,minutes:38,seconds:13,week:"鏄熸湡鍥�",ani:"",move:!1,topMove:"topUp",floorMove:"",version:"",newspaper:"",errorPaper:"",title:"",staNo:"",matnr:"",maknx:"",specs:"",count:"",orderNo:null,doneOfTray:"",totalOfTray:"",doneOfUnit:"",totalOfUnit:"",errorMsg:null,width:"full-width",errorShow:"",pakinShow:"",pakinGun:"",orderShow:!1,swiper:"swiper-here",autoplay:!0,interval:1e3,duration:8e3,matList:[],ejectShow:!1}},mounted:function(){var t=uni.getStorageSync("BaseIp"),n=uni.getStorageSync("BaseLedId"),e=uni.getStorageSync("BasePort"),i=uni.getStorageSync("BaseCrnId");this.baseIP=t,this.baseLedId=n,this.basePort=e,this.baseCrnId=i,this.getUrl()},onLoad:function(){},onReady:function(){var t=this;setInterval((function(){t.initlineChart(),t.initPieChart(),t.getServerData(),t.getOther(),t.getDate(),t.getPakin(),t.getError(),t.animation(),t.getUrl()}),1e3)},methods:{getUrl:function(){this.commonUrl=this.baseHttp+this.baseIP+":"+this.basePort+this.baseUrl,this.chartsDataLine1=JSON.parse(JSON.stringify(o.default.Line))},getYYY:function(){var t=a.default.dataEEE,n=t.data;if(n.data&&""!==n.data)this.errorMsg=n.data,this.errorShow=!0,this.move=!1;else{if(this.errorPaper="",this.errorShow=!1,this.pakinShow)return;this.move=!0}},getEEE:function(){var t=a.default.dataYYY,n=t.data;if(n.data&&null!==n.data){if(101===n.data[0].ioType?this.title="鍏ㄦ澘鍑哄簱":103===n.data[0].ioType&&(this.title="妫�鏂欏嚭搴�"),this.staNo="鐩爣绔�:"+n.data[0].staNo,this.matnr="鐗╂枡鍙凤細"+n.data[0].matDtos[0].matnr,this.maknx="鍝佸彿锛�"+n.data[0].matDtos[0].maknx,this.count="鍑哄簱鏁伴噺锛�"+n.data[0].matDtos[0].count,n.data[0].orderNo?(this.orderNo="璁㈠崟鍙凤細"+n.data[0].orderNo,this.orderShow=!0,this.width="half-width"):(this.orderNo=null,this.orderShow=!1,this.width="full-width"),this.doneOfTray="宸插嚭鎵樼洏鏁�:"+n.data[0].doneOfTray,this.totalOfTray="鎵樼洏鎬绘暟閲忥細"+n.data[0].totalOfTray,this.doneOfUnit="宸插嚭绠辨暟锛�"+n.data[0].doneOfUnit,this.totalOfUnit="鎬荤鏁帮細"+n.data[0].totalOfUnit,this.errorShow)return;this.newspaper="",this.move=!1}else this.move=!0},getError:function(){var t,n=this;uni.request({url:n.commonUrl+"/monitor/led/error",data:{ledId:n.baseLedId},method:"GET",success:function(e){t=e.data,t.data&&""!==t.data?(n.errorMsg=t.data,n.errorShow=!0,n.move=!1):n.errorShow=!1}})},getPakin:function(){var t=this;t.matList=[];var n;uni.request({url:t.commonUrl+"/monitor/led",data:{ledId:t.baseLedId},method:"GET",success:function(e){n=e.data,t.errorShow||(n.data&&null!==n.data?(101===n.data[0].ioType?t.title="鍏ㄦ澘鍑哄簱":103===n.data[0].ioType?t.title="妫�鏂欏嚭搴�":t.title=n.data[0].title,t.staNo="鐩爣绔�:"+n.data[0].staNo,t.matnr="鐗╂枡鍙凤細"+n.data[0].matDtos[0].matnr,t.maknx="鍝佸彿锛�"+n.data[0].matDtos[0].maknx,t.specs="瑙勬牸锛�"+n.data[0].matDtos[0].specs,t.count="鍑哄簱鏁伴噺锛�"+n.data[0].matDtos[0].count,n.data[0].orderNo?(t.orderNo="璁㈠崟鍙凤細"+n.data[0].orderNo,t.orderShow=!0,t.width="half-width"):(t.orderNo=null,t.orderShow=!1,t.width="full-width"),t.doneOfTray="宸插嚭鎵樼洏鏁�:"+n.data[0].doneOfTray,t.totalOfTray="鎵樼洏鎬绘暟閲忥細"+n.data[0].totalOfTray,t.doneOfUnit="宸插嚭绠辨暟锛�"+n.data[0].doneOfUnit,t.totalOfUnit="鎬荤鏁帮細"+n.data[0].totalOfUnit,t.newspaper="",t.move=!1):t.move=!0)}})},animation:function(){this.move?(this.topMove="topUp",this.floorMove="floorUp"):(this.topMove="topDown",this.floorMove="floorDown")},getDateFormat:function(t){var n=new Date;n.setDate(n.getDate()+t);var e=n.getMonth()+1,i=n.getDate(),a=e+"-"+i;return a},initlineChart:function(){var t=this;uni.request({url:t.commonUrl+"/monitor/line/charts",method:"GET",success:function(n){var e=n.data;console.log(n),200===e.code&&(t.chartsData.Line.categories=[t.getDateFormat(-11),t.getDateFormat(-10),t.getDateFormat(-9),t.getDateFormat(-8),t.getDateFormat(-7),t.getDateFormat(-6),t.getDateFormat(-5),t.getDateFormat(-4),t.getDateFormat(-3),t.getDateFormat(-2),t.getDateFormat(-1),t.getDateFormat(0)],t.chartsData.Line.series=e.data.rows)}})},initPieChart:function(){var t=this;uni.request({url:t.commonUrl+"/monitor/loc/rep",method:"GET",success:function(n){var e=n.data;200===e.code&&(t.chartsData.Pie.series[0].data=e.data.pie,t.stockCount=e.data.stockCunt,t.emptyCount=e.data.emptyCount,t.noneCount=e.data.noneCount,t.used=e.data.used,t.usedPr=e.data.usedPr)}})},getOther:function(){var t=this;uni.request({url:t.commonUrl+"/monitor/other",data:{crnId:t.baseCrnId,ledId:1},success:function(n){console.log(n);var e=n.data;200===e.code?(t.xDistance=e.data.xDistance,t.yDistance=e.data.yDistance,t.xDuration=e.data.xDuration,t.yDuration=e.data.yDuration):e.code}})},ejected:function(){this.ejectShow=!0},ejectConfirm:function(){uni.setStorageSync("BaseIp",this.baseIP),uni.setStorageSync("BaseLedId",this.baseLedId),uni.setStorageSync("BasePort",this.basePort),uni.setStorageSync("BaseCrnId",this.baseCrnId),this.getUrl(),this.ejectShow=!1},ejectClose:function(){this.ejectShow=!1},getServerData:function(){this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line)),this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))},complete:function(t){console.log("娓叉煋瀹屾垚浜嬩欢",t)},getDate:function(){var t=new Date;switch(this.year=t.getFullYear(),this.month=t.getMonth()+1<10?"0"+(t.getMonth()+1):t.getMonth()+1,this.day=t.getDate()<10?"0"+t.getDate():t.getDate(),this.hours=t.getHours()<10?"0"+t.getHours():t.getHours(),this.minutes=t.getMinutes()<10?"0"+t.getMinutes():t.getMinutes(),this.seconds=t.getSeconds()<10?"0"+t.getSeconds():t.getSeconds(),this.weeks=t.getDay(),this.weeks){case 0:this.week="鏄熸湡鏃�";break;case 1:this.week="鏄熸湡涓�";break;case 2:this.week="鏄熸湡浜�";break;case 3:this.week="鏄熸湡涓�";break;case 4:this.week="鏄熸湡鍥�";break;case 5:this.week="鏄熸湡浜�";break;default:this.week="鏄熸湡鍏�"}}}};n.default=s},"8b3f":function(t,n,e){"use strict";e("7a82");var i=e("4ea4").default;Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,e("a9e3");var a=i(e("309e")),o=e("37dc"),s=i(e("db2a")),r=(0,o.initVueI18n)(s.default),l=r.t,c={name:"uniPopupDialog",mixins:[a.default],emits:["confirm","close"],props:{value:{type:[String,Number],default:""},placeholder:{type:[String,Number],default:""},type:{type:String,default:"error"},mode:{type:String,default:"base"},title:{type:String,default:""},content:{type:String,default:""},beforeClose:{type:Boolean,default:!1},cancelText:{type:String,default:""},confirmText:{type:String,default:""}},data:function(){return{dialogType:"error",focus:!1,val:""}},computed:{okText:function(){return this.confirmText||l("uni-popup.ok")},closeText:function(){return this.cancelText||l("uni-popup.cancel")},placeholderText:function(){return this.placeholder||l("uni-popup.placeholder")},titleText:function(){return this.title||l("uni-popup.title")}},watch:{type:function(t){this.dialogType=t},mode:function(t){"input"===t&&(this.dialogType="info")},value:function(t){this.val=t}},created:function(){this.popup.disableMask(),"input"===this.mode?(this.dialogType="info",this.val=this.value):this.dialogType=this.type},mounted:function(){this.focus=!0},methods:{onOk:function(){"input"===this.mode?this.$emit("confirm",this.val):this.$emit("confirm"),this.beforeClose||this.popup.close()},closeDialog:function(){this.$emit("close"),this.beforeClose||this.popup.close()},close:function(){this.popup.close()}}};n.default=c},"9ac9":function(t,n,e){"use strict";var i=e("75f2"),a=e.n(i);a.a},"9b37":function(t,n,e){var i=e("24fb");n=i(!1),n.push([t.i,'@charset "UTF-8";\r\n/**\r\n * 杩欓噷鏄痷ni-app鍐呯疆鐨勫父鐢ㄦ牱寮忓彉閲廫r\n *\r\n * uni-app 瀹樻柟鎵╁睍鎻掍欢鍙婃彃浠跺競鍦猴紙https://ext.dcloud.net.cn锛変笂寰堝涓夋柟鎻掍欢鍧囦娇鐢ㄤ簡杩欎簺鏍峰紡鍙橀噺\r\n * 濡傛灉浣犳槸鎻掍欢寮�鍙戣�咃紝寤鸿浣犱娇鐢╯css棰勫鐞嗭紝骞跺湪鎻掍欢浠g爜涓洿鎺ヤ娇鐢ㄨ繖浜涘彉閲忥紙鏃犻渶 import 杩欎釜鏂囦欢锛夛紝鏂逛究鐢ㄦ埛閫氳繃鎼Н鏈ㄧ殑鏂瑰紡寮�鍙戞暣浣撻鏍间竴鑷寸殑App\r\n *\r\n */\r\n/**\r\n * 濡傛灉浣犳槸App寮�鍙戣�咃紙鎻掍欢浣跨敤鑰咃級锛屼綘鍙互閫氳繃淇敼杩欎簺鍙橀噺鏉ュ畾鍒惰嚜宸辩殑鎻掍欢涓婚锛屽疄鐜拌嚜瀹氫箟涓婚鍔熻兘\r\n *\r\n * 濡傛灉浣犵殑椤圭洰鍚屾牱浣跨敤浜唖css棰勫鐞嗭紝浣犱篃鍙互鐩存帴鍦ㄤ綘鐨� scss 浠g爜涓娇鐢ㄥ涓嬪彉閲忥紝鍚屾椂鏃犻渶 import 杩欎釜鏂囦欢\r\n */\r\n/* 棰滆壊鍙橀噺 */\r\n/* 琛屼负鐩稿叧棰滆壊 */\r\n/* 鏂囧瓧鍩烘湰棰滆壊 */\r\n/* 鑳屾櫙棰滆壊 */\r\n/* 杈规棰滆壊 */\r\n/* 灏哄鍙橀噺 */\r\n/* 鏂囧瓧灏哄 */\r\n/* 鍥剧墖灏哄 */\r\n/* Border Radius */\r\n/* 姘村钩闂磋窛 */\r\n/* 鍨傜洿闂磋窛 */\r\n/* 閫忔槑搴� */\r\n/* 鏂囩珷鍦烘櫙鐩稿叧 */.uni-popup-dialog[data-v-99b3946c]{width:300px;border-radius:11px;background-color:#fff}.uni-dialog-title[data-v-99b3946c]{display:flex;flex-direction:row;justify-content:center;padding-top:25px}.uni-dialog-title-text[data-v-99b3946c]{font-size:16px;font-weight:500}.uni-dialog-content[data-v-99b3946c]{display:flex;flex-direction:row;justify-content:center;align-items:center;padding:20px}.uni-dialog-content-text[data-v-99b3946c]{font-size:14px;color:#6c6c6c}.uni-dialog-button-group[data-v-99b3946c]{display:flex;flex-direction:row;border-top-color:#f5f5f5;border-top-style:solid;border-top-width:1px}.uni-dialog-button[data-v-99b3946c]{display:flex;flex:1;flex-direction:row;justify-content:center;align-items:center;height:45px}.uni-border-left[data-v-99b3946c]{border-left-color:#f0f0f0;border-left-style:solid;border-left-width:1px}.uni-dialog-button-text[data-v-99b3946c]{font-size:16px;color:#333}.uni-button-color[data-v-99b3946c]{color:#007aff}.uni-dialog-input[data-v-99b3946c]{flex:1;font-size:14px;border:1px #eee solid;height:40px;padding:0 10px;border-radius:5px;color:#555}.uni-popup__success[data-v-99b3946c]{color:#4cd964}.uni-popup__warn[data-v-99b3946c]{color:#f0ad4e}.uni-popup__error[data-v-99b3946c]{color:#dd524d}.uni-popup__info[data-v-99b3946c]{color:#909399}',""]),t.exports=n},a65d:function(t,n,e){"use strict";e("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,e("7db0"),e("d3b7"),e("b64b"),e("caad"),e("2532");var i={name:"Keypress",props:{disable:{type:Boolean,default:!1}},mounted:function(){var t=this,n={esc:["Esc","Escape"],tab:"Tab",enter:"Enter",space:[" ","Spacebar"],up:["Up","ArrowUp"],left:["Left","ArrowLeft"],right:["Right","ArrowRight"],down:["Down","ArrowDown"],delete:["Backspace","Delete","Del"]};document.addEventListener("keyup",(function(e){if(!t.disable){var i=Object.keys(n).find((function(t){var i=e.key,a=n[t];return a===i||Array.isArray(a)&&a.includes(i)}));i&&setTimeout((function(){t.$emit(i,{})}),0)}}))},render:function(){}};n.default=i},a750:function(t,n,e){"use strict";e.r(n);var i=e("7714"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a},aad2:function(t,n,e){"use strict";e.r(n);var i=e("5691"),a=e("a750");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("9ac9");var s=e("f0c5"),r=Object(s["a"])(a["default"],i["b"],i["c"],!1,null,"f53b5424",null,!1,i["a"],void 0);n["default"]=r.exports},bac9:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",{staticClass:"uni-popup-dialog"},[e("v-uni-view",{staticClass:"uni-dialog-title"},[e("v-uni-text",{staticClass:"uni-dialog-title-text",class:["uni-popup__"+t.dialogType]},[t._v(t._s(t.titleText))])],1),"base"===t.mode?e("v-uni-view",{staticClass:"uni-dialog-content"},[t._t("default",[e("v-uni-text",{staticClass:"uni-dialog-content-text"},[t._v(t._s(t.content))])])],2):e("v-uni-view",{staticClass:"uni-dialog-content"},[t._t("default",[e("v-uni-input",{staticClass:"uni-dialog-input",attrs:{type:"text",placeholder:t.placeholderText,focus:t.focus},model:{value:t.val,callback:function(n){t.val=n},expression:"val"}})])],2),e("v-uni-view",{staticClass:"uni-dialog-button-group"},[e("v-uni-view",{staticClass:"uni-dialog-button",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.closeDialog.apply(void 0,arguments)}}},[e("v-uni-text",{staticClass:"uni-dialog-button-text"},[t._v(t._s(t.closeText))])],1),e("v-uni-view",{staticClass:"uni-dialog-button uni-border-left",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.onOk.apply(void 0,arguments)}}},[e("v-uni-text",{staticClass:"uni-dialog-button-text uni-button-color"},[t._v(t._s(t.okText))])],1)],1)],1)},a=[]},c3ae:function(t){t.exports=JSON.parse('{"uni-popup.cancel":"鍙栨秷","uni-popup.ok":"纭畾","uni-popup.placeholder":"璇疯緭鍏�","uni-popup.title":"鎻愮ず","uni-popup.shareTitle":"鍒嗕韩鍒�"}')},c6dc:function(t,n,e){"use strict";e.r(n);var i=e("bac9"),a=e("3e54");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("6b2c");var s=e("f0c5"),r=Object(s["a"])(a["default"],i["b"],i["c"],!1,null,"99b3946c",null,!1,i["a"],void 0);n["default"]=r.exports},db2a:function(t,n,e){"use strict";e("7a82");var i=e("4ea4").default;Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=i(e("fbad")),o=i(e("c3ae")),s=i(e("608f")),r={en:a.default,"zh-Hans":o.default,"zh-Hant":s.default};n.default=r},dbf0:function(t,n,e){"use strict";e("7a82");var i=e("4ea4").default;Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,e("c975");var a=i(e("a65d")),o={name:"uniPopup",components:{keypress:a.default},emits:["change","maskClick"],props:{animation:{type:Boolean,default:!0},type:{type:String,default:"center"},isMaskClick:{type:Boolean,default:null},maskClick:{type:Boolean,default:null},backgroundColor:{type:String,default:"none"},safeArea:{type:Boolean,default:!0},maskBackgroundColor:{type:String,default:"rgba(0, 0, 0, 0.4)"}},watch:{type:{handler:function(t){this.config[t]&&this[this.config[t]](!0)},immediate:!0},isDesktop:{handler:function(t){this.config[t]&&this[this.config[this.type]](!0)},immediate:!0},maskClick:{handler:function(t){this.mkclick=t},immediate:!0},isMaskClick:{handler:function(t){this.mkclick=t},immediate:!0},showPopup:function(t){document.getElementsByTagName("body")[0].style.overflow=t?"hidden":"visible"}},data:function(){return{duration:300,ani:[],showPopup:!1,showTrans:!1,popupWidth:0,popupHeight:0,config:{top:"top",bottom:"bottom",center:"center",left:"left",right:"right",message:"top",dialog:"center",share:"bottom"},maskClass:{position:"fixed",bottom:0,top:0,left:0,right:0,backgroundColor:"rgba(0, 0, 0, 0.4)"},transClass:{position:"fixed",left:0,right:0},maskShow:!0,mkclick:!0,popupstyle:this.isDesktop?"fixforpc-top":"top"}},computed:{isDesktop:function(){return this.popupWidth>=500&&this.popupHeight>=500},bg:function(){return""===this.backgroundColor||"none"===this.backgroundColor?"transparent":this.backgroundColor}},mounted:function(){var t=this;(function(){var n=uni.getSystemInfoSync(),e=n.windowWidth,i=n.windowHeight,a=n.windowTop,o=n.safeArea,s=(n.screenHeight,n.safeAreaInsets);t.popupWidth=e,t.popupHeight=i+a,t.safeAreaInsets=o?s.bottom:0})()},created:function(){null===this.isMaskClick&&null===this.maskClick?this.mkclick=!0:this.mkclick=null!==this.isMaskClick?this.isMaskClick:this.maskClick,this.animation?this.duration=300:this.duration=0,this.messageChild=null,this.clearPropagation=!1,this.maskClass.backgroundColor=this.maskBackgroundColor},methods:{closeMask:function(){this.maskShow=!1},disableMask:function(){this.mkclick=!1},clear:function(t){t.stopPropagation(),this.clearPropagation=!0},open:function(t){t&&-1!==["top","center","bottom","left","right","message","dialog","share"].indexOf(t)||(t=this.type),this.config[t]?(this[this.config[t]](),this.$emit("change",{show:!0,type:t})):console.error("缂哄皯绫诲瀷锛�",t)},close:function(t){var n=this;this.showTrans=!1,this.$emit("change",{show:!1,type:this.type}),clearTimeout(this.timer),this.timer=setTimeout((function(){n.showPopup=!1}),300)},touchstart:function(){this.clearPropagation=!1},onTap:function(){this.clearPropagation?this.clearPropagation=!1:(this.$emit("maskClick"),this.mkclick&&this.close())},top:function(t){var n=this;this.popupstyle=this.isDesktop?"fixforpc-top":"top",this.ani=["slide-top"],this.transClass={position:"fixed",left:0,right:0,backgroundColor:this.bg},t||(this.showPopup=!0,this.showTrans=!0,this.$nextTick((function(){n.messageChild&&"message"===n.type&&n.messageChild.timerClose()})))},bottom:function(t){this.popupstyle="bottom",this.ani=["slide-bottom"],this.transClass={position:"fixed",left:0,right:0,bottom:0,paddingBottom:this.safeAreaInsets+"px",backgroundColor:this.bg},t||(this.showPopup=!0,this.showTrans=!0)},center:function(t){this.popupstyle="center",this.ani=["zoom-out","fade"],this.transClass={position:"fixed",display:"flex",flexDirection:"column",bottom:0,left:0,right:0,top:0,justifyContent:"center",alignItems:"center"},t||(this.showPopup=!0,this.showTrans=!0)},left:function(t){this.popupstyle="left",this.ani=["slide-left"],this.transClass={position:"fixed",left:0,bottom:0,top:0,backgroundColor:this.bg,display:"flex",flexDirection:"column"},t||(this.showPopup=!0,this.showTrans=!0)},right:function(t){this.popupstyle="right",this.ani=["slide-right"],this.transClass={position:"fixed",bottom:0,right:0,top:0,backgroundColor:this.bg,display:"flex",flexDirection:"column"},t||(this.showPopup=!0,this.showTrans=!0)}}};n.default=o},e64a:function(t,n,e){var i=e("24fb"),a=e("1de5"),o=e("2617"),s=e("88ac");n=i(!1);var r=a(o),l=a(s);n.push([t.i,"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/* 寮瑰嚭:閰嶇疆鍖哄煙 */.eject-mask[data-v-f53b5424]{width:100%;height:100%;background-color:rgba(0,0,0,.5);position:fixed;top:0;left:0;z-index:999;display:flex;align-items:center;justify-content:center}.eject[data-v-f53b5424]{position:relative;width:600px;height:350px;background-color:#eaeaea;border-radius:%?25?%}.eject-title[data-v-f53b5424]{width:100%;height:100px;line-height:100px;font-size:20px;font-weight:700;color:#606266;text-align:center}.item[data-v-f53b5424]{display:flex;align-items:center;margin:10px 0 0 0}.desc[data-v-f53b5424]{display:inline-block;width:40%;text-align:right;color:#606266;font-size:18px}.input[data-v-f53b5424]{display:flex;align-items:center;padding-left:5px;padding-right:5px;width:100%;height:30px;border:1px solid #c0c4cc;margin-right:50px}.eject-input uni-input[data-v-f53b5424]{width:100%}.eject-button[data-v-f53b5424]{display:flex;align-items:center;position:absolute;bottom:0;height:60px;line-height:60px;width:100%;border-top:1px solid #ccc}.button-item[data-v-f53b5424]{width:50%;height:100%;font-size:20px;font-weight:700;text-align:center;color:#909399}.button-item[data-v-f53b5424]:last-child{color:#67c23a;border-left:1px solid #ccc}.full-width[data-v-f53b5424]{width:100%;height:100%;display:inline-block;float:left}.half-width[data-v-f53b5424]{width:50%;height:100%;display:inline-block;float:left}.box-items[data-v-f53b5424]{height:20%;width:100%;\n\t/* background-color: #233751; */line-height:%?300?%}\n/* 褰撳墠椤甸潰鏃� orderNo */.swiper-here[data-v-f53b5424]{display:inline-block;margin:0 auto;width:100%;height:100%}\n/* 褰撳墠椤甸潰鏈� orderNo */.swiper-here-oN[data-v-f53b5424]{display:inline-block;\n\t/* background-color: #063A7B; */margin:0 auto;width:100%;height:90%}\n/* 褰撳墠椤甸潰鏈� error鎻愮ず */.swiper-here-error[data-v-f53b5424]{display:inline-block;\n\t/* background-color: #063A7B; */\n\t/* margin: 0 auto; */margin-top:20%;width:100%;height:100%}.animate[data-v-f53b5424]{display:inline-block;\n            /* white-space: nowrap; */-webkit-animation:25s wordsLoop-data-v-f53b5424 linear infinite normal;animation:25s wordsLoop-data-v-f53b5424 linear infinite normal}@keyframes wordsLoop-data-v-f53b5424{0%{transform:translateY(100px);-webkit-transform:translateY(100px)}100%{transform:translateY(-100%);-webkit-transform:translateY(-100%)}}@-webkit-keyframes wordsLoop-data-v-f53b5424{0%{transform:translateY(100px);-webkit-transform:translateY(100px)}100%{transform:translateY(-100%);-webkit-transform:translateY(-100%)}}\n/* animation:upMove 1.5s 1; */\n/* downMove */\n/* 涓婂眰鍚戜笂 */.topUp[data-v-f53b5424]{-webkit-animation:topUp-data-v-f53b5424 1.5s 1;animation:topUp-data-v-f53b5424 1.5s 1;-webkit-animation-fill-mode:both;animation-fill-mode:both}@-webkit-keyframes topUp-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:-1080px}to{opacity:1;\n\t\t/* background-color:red; */top:0}}@keyframes topUp-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:-1080px}to{opacity:1;\n\t\t/* background-color:red; */top:0}}\n/* 涓婂眰鍚戜笅 */.topDown[data-v-f53b5424]{-webkit-animation:topDown-data-v-f53b5424 1.5s 1;animation:topDown-data-v-f53b5424 1.5s 1;-webkit-animation-fill-mode:both;animation-fill-mode:both}@-webkit-keyframes topDown-data-v-f53b5424{from{opacity:1;\n\t\t/* background-color:red; */top:0}to{opacity:.5;\n\t\t/* background-color:blue; */top:-1080px}}@keyframes topDown-data-v-f53b5424{from{opacity:1;\n\t\t/* background-color:red; */top:0}to{opacity:.5;\n\t\t/* background-color:blue; */top:-1080px}}\n/* 涓嬪眰鍚戜笂 */.floorUp[data-v-f53b5424]{-webkit-animation:floorUp-data-v-f53b5424 1.5s 1;animation:floorUp-data-v-f53b5424 1.5s 1;-webkit-animation-fill-mode:both;animation-fill-mode:both}@-webkit-keyframes floorUp-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:0}to{opacity:1;\n\t\t/* background-color:red; */top:1080px}}@keyframes floorUp-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:0}to{opacity:1;\n\t\t/* background-color:red; */top:1080px}}\n/* 涓嬪眰鍚戜笅 */.floorDown[data-v-f53b5424]{-webkit-animation:floorDown-data-v-f53b5424 1.5s 1;animation:floorDown-data-v-f53b5424 1.5s 1;-webkit-animation-fill-mode:both;animation-fill-mode:both}@-webkit-keyframes floorDown-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:1080px}to{opacity:1;\n\t\t/* background-color:red; */top:0}}@keyframes floorDown-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:1080px}to{opacity:1;\n\t\t/* background-color:red; */top:0}}.top-screen[data-v-f53b5424]{position:fixed;width:1920px;height:1080px;\n\t/* top: -1000px; */background-image:url("+r+");\n\t/* background:red; */\n\t/* animation:upMove 1.5s 1; */z-index:999}.floor-screen[data-v-f53b5424]{width:1920px;height:1080px;position:relative;color:#fff;text-align:center;font-size:%?120?%;letter-spacing:%?5?%;background-image:url("+r+")}.container[data-v-f53b5424]{width:1920px;height:1080px;position:relative\n\t/* background: #000428;  \n\tbackground: -webkit-linear-gradient(to right, #004e92, #000428);  \n\tbackground: linear-gradient(to right, #004e92, #000428); */}.head[data-v-f53b5424]{\n\t/* background-color: #55aaff; */width:100%;height:10%;text-align:center;line-height:110px;color:#fff;font-size:40px;font-weight:700;letter-spacing:5px}.head uni-text[data-v-f53b5424]{-webkit-transform:scaleY(.9);transform:scaleY(.9)}.time-tools[data-v-f53b5424]{height:5%;\n\t/* background-color: #007AFF; */position:absolute;top:0;float:right;right:50px;font-size:16px;font-weight:400;line-height:70px;letter-spacing:1px}.button-left[data-v-f53b5424]{position:absolute;background-image:url("+l+");background-size:100% 100%;top:1.8%;left:21.3%;width:13.5%;height:8.5%;-webkit-transform:scaleX(-1);transform:scaleX(-1)}.button-right[data-v-f53b5424]{position:absolute;background-image:url("+l+");background-size:100% 100%;top:1.8%;left:65%;width:13.5%;height:8.5%}.main[data-v-f53b5424]{\n\t/* background-color: #3F536E; */position:relative;width:100%;height:90%}.main-sides[data-v-f53b5424]{\n\t/* background-color: #004E92; */position:relative;display:inline-block;float:left;width:50%;height:100%\n\t/* margin: 2% auto 0 3.2%;\n\tborder: 1px solid rgba(20, 80, 136, 1); */}.box[data-v-f53b5424]{position:relative;\n\t/* background-color: #ffffff; */margin:3% 2% 0 2%;width:96%;height:30%;border:1px solid #145088;overflow:hidden}.box-lg[data-v-f53b5424]{height:94%}.box-border[data-v-f53b5424]{position:absolute;\n\t/* background-color: #4CD964; */width:10px;height:10px}.box-border1[data-v-f53b5424]{top:0;left:0;border-left:2px solid #31c4c4;border-top:2px solid #31c4c4}.box-border2[data-v-f53b5424]{top:0;right:0;border-right:2px solid #31c4c4;border-top:2px solid #31c4c4}.box-border3[data-v-f53b5424]{bottom:0;left:0;border-bottom:2px solid #31c4c4;border-left:2px solid #31c4c4}.box-border4[data-v-f53b5424]{bottom:0;right:0;border-right:2px solid #31c4c4;border-bottom:2px solid #31c4c4}.content[data-v-f53b5424]{display:flex;flex-direction:column;flex:1}.charts-box[data-v-f53b5424]{width:80%;height:230px;margin-left:10%\n  /* background-color: #fff; */}.ring[data-v-f53b5424]{display:inline-block;float:left;width:60%;height:300px;margin-left:-10%}.box-item[data-v-f53b5424]{\n\t/* background-color: #2C405A; */width:92%;height:20%;margin-left:4%;padding-top:1em;color:#fff}.introduce[data-v-f53b5424]{height:30%}.introduce h2[data-v-f53b5424]{letter-spacing:5px}.english[data-v-f53b5424]{font-size:14px}.introduce-content[data-v-f53b5424]{font-size:20px;padding-top:2em;text-indent:2em;line-height:2em}.charge-info[data-v-f53b5424]{\n\t/* background-color: #2C405A; */height:45%}.charge-info-item[data-v-f53b5424]{\n\t/* background-color: #EE6666; */display:inline-block;width:50%;height:40%}.charge-info-item uni-image[data-v-f53b5424]{display:inline-block;float:left;\n\t/* background-color: #4CD964; */height:100%;width:20%}.charge-info-item uni-view[data-v-f53b5424]{display:inline-block;position:relative;margin-left:10%;width:70%;height:49%\n\t/* background-color: #1890FF; */}.charge-info-item .count[data-v-f53b5424], .charge-info-item .unit[data-v-f53b5424]{position:absolute;display:inline-block;font-size:32px;bottom:0;padding-left:5%}.charge-info-item .unit[data-v-f53b5424]{font-size:16px;float:right;right:20%}.footer[data-v-f53b5424]{position:absolute;border:1px solid #145088;height:15%}.use-info[data-v-f53b5424]{\n\t/* background-color: #007AFF; */}.use-left[data-v-f53b5424]{display:inline-block;\n\t/* background-color: #2C405A; */width:40%}.use-right[data-v-f53b5424]{display:inline-block;\n\t/* background-color: #2C405A; */float:right;width:20%}.use-main[data-v-f53b5424]{width:100%;height:75%\n\t/* background-color: #4CD964; */}.use-main .left[data-v-f53b5424]{\n\t/* background-color: #ffaa7f; */display:inline-block;float:left;height:100%;width:70%;line-height:20px}.left .progressBar[data-v-f53b5424]{\n\t/* margin-left: ; */margin-top:9%;width:100%;height:20%;background-color:#233751;border-radius:20px}.left .progress[data-v-f53b5424]{\n\t/* width: 90%; */height:100%;background-color:#ff5722;border-radius:20px}.left uni-progress[data-v-f53b5424]{margin-left:10%;margin-top:10%;display:block}.use-main .right[data-v-f53b5424]{\n\t/* background-color: #ffaaff; */display:inline-block;float:right;height:100%;width:20%;font-size:40px;color:#ff5722;line-height:130px}.box-tp[data-v-f53b5424]{height:30%}.box-tp .sub-main[data-v-f53b5424]{\n\t/* background-color: #FFFFFF; */}.box-md[data-v-f53b5424]{height:43%}.sub-main-right[data-v-f53b5424]{display:inline-block;height:100%;width:50%}.sub-info[data-v-f53b5424]{width:100%;height:33%}.sub-info uni-image[data-v-f53b5424]{display:inline-block;float:left;height:100%;width:15%}.sub-info uni-text[data-v-f53b5424]{display:inline-block;width:40%;height:100%;text-align:center;line-height:120px;font-size:20px}.box-bt[data-v-f53b5424]{background-color:#063a7b;border:none;height:15%;color:#fff}.box-bt uni-image[data-v-f53b5424]{position:absolute;float:right;right:0;top:0;width:20%;height:100%}.box-bt[data-v-f53b5424]{font-size:36px;line-height:140px;text-indent:5em}.right-item[data-v-f53b5424]{height:94%}.sub-left[data-v-f53b5424]{display:inline-block;float:left;width:40%}.sub-right[data-v-f53b5424]{display:inline-block;float:right;width:20%}.sub-main[data-v-f53b5424]{position:absolute;\n\t/* background-color: #31C4C4; */width:92%;height:80%;bottom:0}",""]),t.exports=n},fac2:function(t,n,e){"use strict";e.r(n);var i=e("dbf0"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a},fbad:function(t){t.exports=JSON.parse('{"uni-popup.cancel":"cancel","uni-popup.ok":"ok","uni-popup.placeholder":"pleace enter","uni-popup.title":"Hint","uni-popup.shareTitle":"Share to"}')}}]);
\ No newline at end of file
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-index"],{"05f6":function(t,n,e){"use strict";e.r(n);var i=e("1fec"),a=e("fac2");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("098b");var s=e("f0c5"),r=Object(s["a"])(a["default"],i["b"],i["c"],!1,null,"58e7869c",null,!1,i["a"],void 0);n["default"]=r.exports},"098b":function(t,n,e){"use strict";var i=e("45d8"),a=e.n(i);a.a},"1fec":function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return i}));var i={uniTransition:e("9b17").default},a=function(){var t=this,n=t.$createElement,e=t._self._c||n;return t.showPopup?e("v-uni-view",{staticClass:"uni-popup",class:[t.popupstyle,t.isDesktop?"fixforpc-z-index":""],on:{touchmove:function(n){n.stopPropagation(),n.preventDefault(),arguments[0]=n=t.$handleEvent(n),t.clear.apply(void 0,arguments)}}},[e("v-uni-view",{on:{touchstart:function(n){arguments[0]=n=t.$handleEvent(n),t.touchstart.apply(void 0,arguments)}}},[t.maskShow?e("uni-transition",{key:"1",attrs:{name:"mask","mode-class":"fade",styles:t.maskClass,duration:t.duration,show:t.showTrans},on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.onTap.apply(void 0,arguments)}}}):t._e(),e("uni-transition",{key:"2",attrs:{"mode-class":t.ani,name:"content",styles:t.transClass,duration:t.duration,show:t.showTrans},on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.onTap.apply(void 0,arguments)}}},[e("v-uni-view",{staticClass:"uni-popup__wrapper",class:[t.popupstyle],style:{backgroundColor:t.bg},on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.clear.apply(void 0,arguments)}}},[t._t("default")],2)],1)],1),t.maskShow?e("keypress",{on:{esc:function(n){arguments[0]=n=t.$handleEvent(n),t.onTap.apply(void 0,arguments)}}}):t._e()],1):t._e()},o=[]},"309e":function(t,n,e){"use strict";e("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={data:function(){return{}},created:function(){this.popup=this.getParent()},methods:{getParent:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"uniPopup",n=this.$parent,e=n.$options.name;while(e!==t){if(n=n.$parent,!n)return!1;e=n.$options.name}return n}}};n.default=i},"3e54":function(t,n,e){"use strict";e.r(n);var i=e("8b3f"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a},"3f77":function(t,n,e){var i=e("9b37");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=e("4f06").default;a("e26222a6",i,!0,{sourceMap:!1,shadowMode:!1})},"45d8":function(t,n,e){var i=e("5652");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=e("4f06").default;a("6f84f74c",i,!0,{sourceMap:!1,shadowMode:!1})},5652:function(t,n,e){var i=e("24fb");n=i(!1),n.push([t.i,'@charset "UTF-8";\r\n/**\r\n * 杩欓噷鏄痷ni-app鍐呯疆鐨勫父鐢ㄦ牱寮忓彉閲廫r\n *\r\n * uni-app 瀹樻柟鎵╁睍鎻掍欢鍙婃彃浠跺競鍦猴紙https://ext.dcloud.net.cn锛変笂寰堝涓夋柟鎻掍欢鍧囦娇鐢ㄤ簡杩欎簺鏍峰紡鍙橀噺\r\n * 濡傛灉浣犳槸鎻掍欢寮�鍙戣�咃紝寤鸿浣犱娇鐢╯css棰勫鐞嗭紝骞跺湪鎻掍欢浠g爜涓洿鎺ヤ娇鐢ㄨ繖浜涘彉閲忥紙鏃犻渶 import 杩欎釜鏂囦欢锛夛紝鏂逛究鐢ㄦ埛閫氳繃鎼Н鏈ㄧ殑鏂瑰紡寮�鍙戞暣浣撻鏍间竴鑷寸殑App\r\n *\r\n */\r\n/**\r\n * 濡傛灉浣犳槸App寮�鍙戣�咃紙鎻掍欢浣跨敤鑰咃級锛屼綘鍙互閫氳繃淇敼杩欎簺鍙橀噺鏉ュ畾鍒惰嚜宸辩殑鎻掍欢涓婚锛屽疄鐜拌嚜瀹氫箟涓婚鍔熻兘\r\n *\r\n * 濡傛灉浣犵殑椤圭洰鍚屾牱浣跨敤浜唖css棰勫鐞嗭紝浣犱篃鍙互鐩存帴鍦ㄤ綘鐨� scss 浠g爜涓娇鐢ㄥ涓嬪彉閲忥紝鍚屾椂鏃犻渶 import 杩欎釜鏂囦欢\r\n */\r\n/* 棰滆壊鍙橀噺 */\r\n/* 琛屼负鐩稿叧棰滆壊 */\r\n/* 鏂囧瓧鍩烘湰棰滆壊 */\r\n/* 鑳屾櫙棰滆壊 */\r\n/* 杈规棰滆壊 */\r\n/* 灏哄鍙橀噺 */\r\n/* 鏂囧瓧灏哄 */\r\n/* 鍥剧墖灏哄 */\r\n/* Border Radius */\r\n/* 姘村钩闂磋窛 */\r\n/* 鍨傜洿闂磋窛 */\r\n/* 閫忔槑搴� */\r\n/* 鏂囩珷鍦烘櫙鐩稿叧 */.uni-popup[data-v-58e7869c]{position:fixed;z-index:99}.uni-popup.top[data-v-58e7869c], .uni-popup.left[data-v-58e7869c], .uni-popup.right[data-v-58e7869c]{top:var(--window-top)}.uni-popup .uni-popup__wrapper[data-v-58e7869c]{display:block;position:relative\r\n  /* iphonex 绛夊畨鍏ㄥ尯璁剧疆锛屽簳閮ㄥ畨鍏ㄥ尯閫傞厤 */}.uni-popup .uni-popup__wrapper.left[data-v-58e7869c], .uni-popup .uni-popup__wrapper.right[data-v-58e7869c]{padding-top:var(--window-top);flex:1}.fixforpc-z-index[data-v-58e7869c]{z-index:999}.fixforpc-top[data-v-58e7869c]{top:0}',""]),t.exports=n},5691:function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return i}));var i={qiunDataCharts:e("1f58").default,uniPopup:e("05f6").default,uniPopupDialog:e("c6dc").default},a=function(){var t=this,n=t.$createElement,i=t._self._c||n;return i("v-uni-view",{staticClass:"container"},[i("v-uni-view",{staticClass:"floor-screen",class:t.floorMove},[i("v-uni-view",{staticClass:"head"},[i("v-uni-text",{on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.port()}}},[t._v("鑷姩浠撳簱WCS鐩戞帶骞冲彴")]),i("v-uni-view",{staticClass:"time-tools"},[t._v(t._s(t.year)+"-"+t._s(t.month)+"-"+t._s(t.day)+"聽"+t._s(t.hours)+":"+t._s(t.minutes)+":"+t._s(t.seconds)+"聽"+t._s(t.week))]),i("v-uni-view",{staticClass:"button-left",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ejected()}}}),i("v-uni-view",{staticClass:"button-right",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ledId()}}})],1),i("v-uni-view",{staticClass:"main"},[i("v-uni-view",{staticClass:"main-sides",staticStyle:{width:"100%"}},[i("v-uni-view",{staticClass:"box",staticStyle:{height:"90%"}},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{directives:[{name:"show",rawName:"v-show",value:!t.errorShow,expression:"!errorShow"}],staticStyle:{width:"100%",height:"100%"}},[i("v-uni-view",{class:t.width},[i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.title))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.staNo))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.maknx))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.specs))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.count))])],1),i("v-uni-view",{directives:[{name:"show",rawName:"v-show",value:t.orderShow,expression:"orderShow"}],staticStyle:{width:"50%",height:"100%",display:"inline-block",float:"left"}},[i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.orderNo))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.doneOfTray))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.totalOfTray))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.doneOfUnit))]),i("v-uni-view",{staticClass:"box-items"},[t._v(t._s(t.totalOfUnit))])],1)],1),i("v-uni-view",{directives:[{name:"show",rawName:"v-show",value:t.errorShow,expression:"errorShow"}],staticStyle:{width:"100%",height:"100%"}},[i("v-uni-view",{staticStyle:{"line-height":"700px","font-size":"175rpx"}},[t._v(t._s(t.errorMsg))])],1)],1)],1)],1)],1),i("v-uni-view",{staticClass:"top-screen",class:t.topMove},[i("v-uni-view",{staticClass:"head"},[i("v-uni-text",{on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.port()}}},[t._v("鑷姩浠撳簱WCS鐩戞帶骞冲彴")]),i("v-uni-view",{staticClass:"time-tools"},[t._v(t._s(t.year)+"-"+t._s(t.month)+"-"+t._s(t.day)+"聽"+t._s(t.hours)+":"+t._s(t.minutes)+":"+t._s(t.seconds)+"聽"+t._s(t.week))]),i("v-uni-view",{staticClass:"button-left",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ejected()}}}),i("v-uni-view",{staticClass:"button-right",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ledId()}}})],1),i("v-uni-view",{staticClass:"main"},[i("v-uni-view",{staticClass:"main-sides"},[i("v-uni-view",{staticClass:"box box-lg"},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{staticClass:"box-item introduce"},[i("h3",[t._v("鑷姩鍖栫珛浣撲粨搴�")]),i("p",{staticClass:"english"},[t._v("Automatic Storageand Retrieval System")]),i("p",{staticClass:"introduce-content"},[t._v("鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆俓n\t\t\t\t\t\t鑷姩鍖栫珛浣撲粨搴撶殑涓讳綋鐢辫揣鏋躲�佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆俓n\t\t\t\t\t\t璐ф灦鏄挗缁撴瀯鎴栭挗绛嬫贩鍑濆湡缁撴瀯鐨勫缓绛戠墿鎴栫粨鏋勪綋锛岃揣鏋跺唴鏄爣鍑嗗昂瀵哥殑璐т綅绌洪棿锛屽贩閬撳爢鍨涜捣閲嶆満绌胯浜庤揣鏋朵箣闂寸殑宸烽亾涓紝瀹屾垚瀛樸�佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��")])]),i("v-uni-view",{staticClass:"box-item charge-info"},[i("h3",[t._v("浠撳簱鏁版嵁")]),i("p",{staticClass:"english"},[t._v("warehouse data")]),i("v-uni-view",{staticClass:"charge-info-item"},[i("v-uni-image",{attrs:{src:e("7be7"),mode:"aspectFit"}}),i("v-uni-view",[i("v-uni-text",{staticClass:"count"},[t._v(t._s(t.xDistance))]),i("v-uni-text",{staticClass:"unit"},[t._v("m")])],1),i("v-uni-view",[t._v("绱璧拌璺濈(绫�)")])],1),i("v-uni-view",{staticClass:"charge-info-item"},[i("v-uni-image",{attrs:{src:e("feb8"),mode:"aspectFit"}}),i("v-uni-view",[i("v-uni-text",{staticClass:"count"},[t._v(t._s(t.yDistance))]),i("v-uni-text",{staticClass:"unit"},[t._v("m")])],1),i("v-uni-view",[t._v("绱鍗囬檷璺濈(绫�)")])],1),i("v-uni-view",{staticClass:"charge-info-item"},[i("v-uni-image",{attrs:{src:e("00ce"),mode:"aspectFit"}}),i("v-uni-view",[i("v-uni-text",{staticClass:"count"},[t._v(t._s(t.xDuration))]),i("v-uni-text",{staticClass:"unit"},[t._v("m")])],1),i("v-uni-view",[t._v("绱璧拌鏃堕暱(绉�)")])],1),i("v-uni-view",{staticClass:"charge-info-item"},[i("v-uni-image",{attrs:{src:e("05a1"),mode:"aspectFit"}}),i("v-uni-view",[i("v-uni-text",{staticClass:"count"},[t._v(t._s(t.yDuration))]),i("v-uni-text",{staticClass:"unit"},[t._v("m")])],1),i("v-uni-view",[t._v("绱鍗囬檷鏃堕暱(绉�)")])],1)],1),i("v-uni-view",{staticClass:"box-item use-info"},[i("v-uni-view",{staticClass:"use-left"},[i("h3",[t._v("搴撲綅浣跨敤鐜�")]),i("p",{staticClass:"english"},[t._v("EQUIPMENT USAGE THIS MONTH")])]),i("v-uni-view",{staticClass:"use-right"},[i("h3",[t._v(t._s(t.usedPr)+"%")]),i("p",{staticClass:"english"},[t._v("鍚屾瘮涓婃湀 + 5%")])]),i("v-uni-view",{staticClass:"use-main"},[i("v-uni-view",{staticClass:"left"},[i("v-uni-view",{staticClass:"progressBar"},[i("v-uni-view",{staticClass:"progress",style:"width:"+t.usedPr+"%"})],1)],1),i("v-uni-view",{staticClass:"right"},[t._v(t._s(t.used))])],1)],1)],1)],1),i("v-uni-view",{staticClass:"main-sides"},[i("v-uni-view",{staticClass:"box box-tp"},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{staticClass:"box-item right-item"},[i("v-uni-view",{staticClass:"sub-left"},[i("h3",[t._v("鍏ュ嚭搴撶粺璁�")]),i("p",{staticClass:"english"},[t._v("ORDER STATISTICS")])]),i("v-uni-view",{staticClass:"sub-right"},[i("h3",[t._v("31")]),i("p",{staticClass:"english"},[t._v("浠婃棩璁㈠崟鏁�")])]),i("v-uni-view",{staticClass:"sub-main"},[i("v-uni-view",{staticClass:"charts-box"},[i("qiun-data-charts",{attrs:{type:"line",chartData:t.chartsDataLine1,echartsH5:!0,echartsApp:!0}})],1)],1)],1)],1),i("v-uni-view",{staticClass:"box box-md"},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{staticClass:"box-item right-item"},[i("v-uni-view",{staticClass:"sub-left"},[i("h3",[t._v("搴撳瓨绫诲瀷")]),i("p",{staticClass:"english"},[t._v("INCOME DATE")])]),i("v-uni-view",{staticClass:"sub-right"},[i("h3",[t._v("浠婂ぉ")]),i("p",{staticClass:"english"},[t._v("Today")])]),i("v-uni-view",{staticClass:"sub-main"},[i("v-uni-view",{staticClass:"charts-box ring"},[i("qiun-data-charts",{attrs:{type:"ring",opts:{legend:{position:"bottom"}},eopts:t.ringOpts,chartData:t.chartsDataPie2,echartsH5:!0,echartsApp:!0}})],1),i("v-uni-view",{staticClass:"sub-main-right"},[i("v-uni-view",{staticClass:"sub-info"},[i("v-uni-image",{attrs:{src:e("82fe"),mode:"aspectFit"}}),i("v-uni-text",[t._v("鍦ㄥ簱")]),i("v-uni-text",[t._v(t._s(t.stockCount))])],1),i("v-uni-view",{staticClass:"sub-info"},[i("v-uni-image",{attrs:{src:e("1cd5"),mode:"aspectFit"}}),i("v-uni-text",[t._v("绌哄簱")]),i("v-uni-text",[t._v(t._s(t.emptyCount))])],1),i("v-uni-view",{staticClass:"sub-info"},[i("v-uni-image",{attrs:{src:e("b64b0"),mode:"aspectFit"}}),i("v-uni-text",[t._v("绂佺敤")]),i("v-uni-text",[t._v(t._s(t.noneCount))])],1)],1)],1)],1)],1),i("v-uni-view",{staticClass:"box box-bt"},[i("v-uni-view",{staticClass:"box-border box-border1"}),i("v-uni-view",{staticClass:"box-border box-border2"}),i("v-uni-view",{staticClass:"box-border box-border3"}),i("v-uni-view",{staticClass:"box-border box-border4"}),i("v-uni-view",{on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.crn()}}},[t._v("鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃")])],1)],1)],1)],1),i("v-uni-view",[i("uni-popup",{ref:"url",attrs:{type:"dialog"}},[i("uni-popup-dialog",{ref:"inputClose",attrs:{mode:"input",title:"閰嶇疆url",value:t.baseIP,placeholder:"绀轰緥:192.168.1.1"},on:{confirm:function(n){arguments[0]=n=t.$handleEvent(n),t.baseUrlConfirm.apply(void 0,arguments)}}})],1)],1),i("v-uni-view",[i("uni-popup",{ref:"ledId",attrs:{type:"dialog"}},[i("uni-popup-dialog",{ref:"inputClose",attrs:{mode:"input",title:"閰嶇疆ledId",value:t.baseLedId,placeholder:"绀轰緥:188"},on:{confirm:function(n){arguments[0]=n=t.$handleEvent(n),t.ledIdConfirm.apply(void 0,arguments)}}})],1)],1),i("v-uni-view",[i("uni-popup",{ref:"port",attrs:{type:"dialog"}},[i("uni-popup-dialog",{ref:"inputClose",attrs:{mode:"input",title:"閰嶇疆绔彛鍙�",value:t.basePort,placeholder:"绀轰緥:9090"},on:{confirm:function(n){arguments[0]=n=t.$handleEvent(n),t.portConfirm.apply(void 0,arguments)}}})],1)],1),i("v-uni-view",[i("uni-popup",{ref:"crnId",attrs:{type:"dialog"}},[i("uni-popup-dialog",{ref:"inputClose",attrs:{mode:"input",title:"閰嶇疆鍫嗗灈鏈�",value:t.crnId,placeholder:"绀轰緥:1"},on:{confirm:function(n){arguments[0]=n=t.$handleEvent(n),t.crnConfirm.apply(void 0,arguments)}}})],1)],1),i("v-uni-view",{directives:[{name:"show",rawName:"v-show",value:t.ejectShow,expression:"ejectShow"}],staticClass:"eject-mask"},[i("v-uni-view",{staticClass:"eject"},[i("v-uni-view",{staticClass:"eject-title"},[t._v("淇敼 / 閰嶇疆")]),i("v-uni-view",{staticClass:"eject-input"},[i("v-uni-view",{staticClass:"item"},[i("v-uni-view",{staticClass:"desc"},[t._v("ip锛�")]),i("v-uni-view",{staticClass:"input"},[i("v-uni-input",{attrs:{type:"text"},model:{value:t.baseIP,callback:function(n){t.baseIP=n},expression:"baseIP"}})],1)],1),i("v-uni-view",{staticClass:"item"},[i("v-uni-view",{staticClass:"desc"},[t._v("port锛�")]),i("v-uni-view",{staticClass:"input"},[i("v-uni-input",{attrs:{type:"text"},model:{value:t.basePort,callback:function(n){t.basePort=n},expression:"basePort"}})],1)],1),i("v-uni-view",{staticClass:"item"},[i("v-uni-view",{staticClass:"desc"},[t._v("ledId锛�")]),i("v-uni-view",{staticClass:"input"},[i("v-uni-input",{attrs:{type:"text"},model:{value:t.baseLedId,callback:function(n){t.baseLedId=n},expression:"baseLedId"}})],1)],1),i("v-uni-view",{staticClass:"item"},[i("v-uni-view",{staticClass:"desc"},[t._v("CrnId锛�")]),i("v-uni-view",{staticClass:"input"},[i("v-uni-input",{attrs:{type:"text"},model:{value:t.baseCrnId,callback:function(n){t.baseCrnId=n},expression:"baseCrnId"}})],1)],1)],1),i("v-uni-view",{staticClass:"eject-button"},[i("v-uni-view",{staticClass:"button-item",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ejectClose.apply(void 0,arguments)}}},[t._v("鍙� 娑�")]),i("v-uni-view",{staticClass:"button-item",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.ejectConfirm.apply(void 0,arguments)}}},[t._v("纭� 璁�")])],1)],1)],1)],1)},o=[]},"608f":function(t){t.exports=JSON.parse('{"uni-popup.cancel":"鍙栨秷","uni-popup.ok":"纰哄畾","uni-popup.placeholder":"璜嬭几鍏�","uni-popup.title":"鎻愮ず","uni-popup.shareTitle":"鍒嗕韩鍒�"}')},"6b2c":function(t,n,e){"use strict";var i=e("3f77"),a=e.n(i);a.a},"75f2":function(t,n,e){var i=e("e64a");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=e("4f06").default;a("fb8ea27a",i,!0,{sourceMap:!1,shadowMode:!1})},7714:function(t,n,e){"use strict";e("7a82");var i=e("4ea4").default;Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,e("e9c4");var a=i(e("6bf8")),o=i(e("f887")),s={data:function(){return{commonUrl:null,show:!0,modeClass:"fade",styles:{},baseIP:"",baseLedId:"",basePort:"",crnId:"",value:"",xDistance:0,yDistance:0,xDuration:0,yDuration:0,used:317,usedPr:90,stockCount:0,emptyCount:0,noneCount:0,chartsData:{Line:{categories:[],series:[]},Pie:{series:[{data:[]}]}},chartsDataLine1:{},chartsDataPie2:{},ringOpts:{},year:2022,month:4,day:14,hours:13,minutes:38,seconds:13,week:"鏄熸湡鍥�",ani:"",move:!1,topMove:"topUp",floorMove:"",version:"",newspaper:"",errorPaper:"",title:"",staNo:"",matnr:"",maknx:"",specs:"",count:"",orderNo:null,doneOfTray:"",totalOfTray:"",doneOfUnit:"",totalOfUnit:"",errorMsg:null,width:"full-width",errorShow:"",pakinShow:"",pakinGun:"",orderShow:!1,swiper:"swiper-here",autoplay:!0,interval:1e3,duration:8e3,matList:[],ejectShow:!1}},mounted:function(){var t=uni.getStorageSync("BaseIp"),n=uni.getStorageSync("BaseLedId"),e=uni.getStorageSync("BasePort"),i=uni.getStorageSync("BaseCrnId");this.baseIP=t,this.baseLedId=n,this.basePort=e,this.baseCrnId=i,this.getUrl()},onLoad:function(){},onReady:function(){var t=this;setInterval((function(){t.initlineChart(),t.initPieChart(),t.getServerData(),t.getOther(),t.getDate(),t.getPakin(),t.getError(),t.animation(),t.getUrl()}),1e3)},methods:{getUrl:function(){this.commonUrl=this.baseHttp+this.baseIP+":"+this.basePort+this.baseUrl,this.chartsDataLine1=JSON.parse(JSON.stringify(o.default.Line))},getYYY:function(){var t=a.default.dataEEE,n=t.data;if(n.data&&""!==n.data)this.errorMsg=n.data,this.errorShow=!0,this.move=!1;else{if(this.errorPaper="",this.errorShow=!1,this.pakinShow)return;this.move=!0}},getEEE:function(){var t=a.default.dataYYY,n=t.data;if(n.data&&null!==n.data){if(101===n.data[0].ioType?this.title="鍏ㄦ澘鍑哄簱":103===n.data[0].ioType&&(this.title="妫�鏂欏嚭搴�"),this.staNo="鐩爣绔�:"+n.data[0].staNo,this.matnr="鍝佸彿锛�"+n.data[0].matDtos[0].matnr,this.maknx="鍝佸悕锛�"+n.data[0].matDtos[0].maknx,this.count="鍑哄簱鏁伴噺锛�"+n.data[0].matDtos[0].count,n.data[0].orderNo?(this.orderNo="璁㈠崟鍙凤細"+n.data[0].orderNo,this.orderShow=!0,this.width="half-width"):(this.orderNo=null,this.orderShow=!1,this.width="full-width"),this.doneOfTray="宸插嚭鎵樼洏鏁�:"+n.data[0].doneOfTray,this.totalOfTray="鎵樼洏鎬绘暟閲忥細"+n.data[0].totalOfTray,this.doneOfUnit="宸插嚭绠辨暟锛�"+n.data[0].doneOfUnit,this.totalOfUnit="鎬荤鏁帮細"+n.data[0].totalOfUnit,this.errorShow)return;this.newspaper="",this.move=!1}else this.move=!0},getError:function(){var t,n=this;uni.request({url:n.commonUrl+"/monitor/led/error",data:{ledId:n.baseLedId},method:"GET",success:function(e){t=e.data,t.data&&""!==t.data?(n.errorMsg=t.data,n.errorShow=!0,n.move=!1):n.errorShow=!1}})},getPakin:function(){var t=this;t.matList=[];var n;uni.request({url:t.commonUrl+"/monitor/led",data:{ledId:t.baseLedId},method:"GET",success:function(e){n=e.data,t.errorShow||(n.data&&null!==n.data?(101===n.data[0].ioType?t.title="鍏ㄦ澘鍑哄簱":103===n.data[0].ioType?t.title="妫�鏂欏嚭搴�":t.title=n.data[0].title,t.staNo="鐩爣绔�:"+n.data[0].staNo,t.matnr="鍝佸彿锛�"+n.data[0].matDtos[0].matnr,t.maknx="鍝佸悕锛�"+n.data[0].matDtos[0].maknx,t.specs="瑙勬牸锛�"+n.data[0].matDtos[0].specs,t.count="鍑哄簱鏁伴噺锛�"+n.data[0].matDtos[0].count,n.data[0].orderNo?(t.orderNo="璁㈠崟鍙凤細"+n.data[0].orderNo,t.orderShow=!0,t.width="half-width"):(t.orderNo=null,t.orderShow=!1,t.width="full-width"),t.doneOfTray="宸插嚭鎵樼洏鏁�:"+n.data[0].doneOfTray,t.totalOfTray="鎵樼洏鎬绘暟閲忥細"+n.data[0].totalOfTray,t.doneOfUnit="宸插嚭绠辨暟锛�"+n.data[0].doneOfUnit,t.totalOfUnit="鎬荤鏁帮細"+n.data[0].totalOfUnit,t.newspaper="",t.move=!1):t.move=!0)}})},animation:function(){this.move?(this.topMove="topUp",this.floorMove="floorUp"):(this.topMove="topDown",this.floorMove="floorDown")},getDateFormat:function(t){var n=new Date;n.setDate(n.getDate()+t);var e=n.getMonth()+1,i=n.getDate(),a=e+"-"+i;return a},initlineChart:function(){var t=this;uni.request({url:t.commonUrl+"/monitor/line/charts",method:"GET",success:function(n){var e=n.data;console.log(n),200===e.code&&(t.chartsData.Line.categories=[t.getDateFormat(-11),t.getDateFormat(-10),t.getDateFormat(-9),t.getDateFormat(-8),t.getDateFormat(-7),t.getDateFormat(-6),t.getDateFormat(-5),t.getDateFormat(-4),t.getDateFormat(-3),t.getDateFormat(-2),t.getDateFormat(-1),t.getDateFormat(0)],t.chartsData.Line.series=e.data.rows)}})},initPieChart:function(){var t=this;uni.request({url:t.commonUrl+"/monitor/loc/rep",method:"GET",success:function(n){var e=n.data;200===e.code&&(t.chartsData.Pie.series[0].data=e.data.pie,t.stockCount=e.data.stockCunt,t.emptyCount=e.data.emptyCount,t.noneCount=e.data.noneCount,t.used=e.data.used,t.usedPr=e.data.usedPr)}})},getOther:function(){var t=this;uni.request({url:t.commonUrl+"/monitor/other",data:{crnId:t.baseCrnId,ledId:1},success:function(n){console.log(n);var e=n.data;200===e.code?(t.xDistance=e.data.xDistance,t.yDistance=e.data.yDistance,t.xDuration=e.data.xDuration,t.yDuration=e.data.yDuration):e.code}})},ejected:function(){this.ejectShow=!0},ejectConfirm:function(){uni.setStorageSync("BaseIp",this.baseIP),uni.setStorageSync("BaseLedId",this.baseLedId),uni.setStorageSync("BasePort",this.basePort),uni.setStorageSync("BaseCrnId",this.baseCrnId),this.getUrl(),this.ejectShow=!1},ejectClose:function(){this.ejectShow=!1},getServerData:function(){this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line)),this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))},complete:function(t){console.log("娓叉煋瀹屾垚浜嬩欢",t)},getDate:function(){var t=new Date;switch(this.year=t.getFullYear(),this.month=t.getMonth()+1<10?"0"+(t.getMonth()+1):t.getMonth()+1,this.day=t.getDate()<10?"0"+t.getDate():t.getDate(),this.hours=t.getHours()<10?"0"+t.getHours():t.getHours(),this.minutes=t.getMinutes()<10?"0"+t.getMinutes():t.getMinutes(),this.seconds=t.getSeconds()<10?"0"+t.getSeconds():t.getSeconds(),this.weeks=t.getDay(),this.weeks){case 0:this.week="鏄熸湡鏃�";break;case 1:this.week="鏄熸湡涓�";break;case 2:this.week="鏄熸湡浜�";break;case 3:this.week="鏄熸湡涓�";break;case 4:this.week="鏄熸湡鍥�";break;case 5:this.week="鏄熸湡浜�";break;default:this.week="鏄熸湡鍏�"}}}};n.default=s},"8b3f":function(t,n,e){"use strict";e("7a82");var i=e("4ea4").default;Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,e("a9e3");var a=i(e("309e")),o=e("37dc"),s=i(e("db2a")),r=(0,o.initVueI18n)(s.default),l=r.t,c={name:"uniPopupDialog",mixins:[a.default],emits:["confirm","close"],props:{value:{type:[String,Number],default:""},placeholder:{type:[String,Number],default:""},type:{type:String,default:"error"},mode:{type:String,default:"base"},title:{type:String,default:""},content:{type:String,default:""},beforeClose:{type:Boolean,default:!1},cancelText:{type:String,default:""},confirmText:{type:String,default:""}},data:function(){return{dialogType:"error",focus:!1,val:""}},computed:{okText:function(){return this.confirmText||l("uni-popup.ok")},closeText:function(){return this.cancelText||l("uni-popup.cancel")},placeholderText:function(){return this.placeholder||l("uni-popup.placeholder")},titleText:function(){return this.title||l("uni-popup.title")}},watch:{type:function(t){this.dialogType=t},mode:function(t){"input"===t&&(this.dialogType="info")},value:function(t){this.val=t}},created:function(){this.popup.disableMask(),"input"===this.mode?(this.dialogType="info",this.val=this.value):this.dialogType=this.type},mounted:function(){this.focus=!0},methods:{onOk:function(){"input"===this.mode?this.$emit("confirm",this.val):this.$emit("confirm"),this.beforeClose||this.popup.close()},closeDialog:function(){this.$emit("close"),this.beforeClose||this.popup.close()},close:function(){this.popup.close()}}};n.default=c},"9ac9":function(t,n,e){"use strict";var i=e("75f2"),a=e.n(i);a.a},"9b37":function(t,n,e){var i=e("24fb");n=i(!1),n.push([t.i,'@charset "UTF-8";\r\n/**\r\n * 杩欓噷鏄痷ni-app鍐呯疆鐨勫父鐢ㄦ牱寮忓彉閲廫r\n *\r\n * uni-app 瀹樻柟鎵╁睍鎻掍欢鍙婃彃浠跺競鍦猴紙https://ext.dcloud.net.cn锛変笂寰堝涓夋柟鎻掍欢鍧囦娇鐢ㄤ簡杩欎簺鏍峰紡鍙橀噺\r\n * 濡傛灉浣犳槸鎻掍欢寮�鍙戣�咃紝寤鸿浣犱娇鐢╯css棰勫鐞嗭紝骞跺湪鎻掍欢浠g爜涓洿鎺ヤ娇鐢ㄨ繖浜涘彉閲忥紙鏃犻渶 import 杩欎釜鏂囦欢锛夛紝鏂逛究鐢ㄦ埛閫氳繃鎼Н鏈ㄧ殑鏂瑰紡寮�鍙戞暣浣撻鏍间竴鑷寸殑App\r\n *\r\n */\r\n/**\r\n * 濡傛灉浣犳槸App寮�鍙戣�咃紙鎻掍欢浣跨敤鑰咃級锛屼綘鍙互閫氳繃淇敼杩欎簺鍙橀噺鏉ュ畾鍒惰嚜宸辩殑鎻掍欢涓婚锛屽疄鐜拌嚜瀹氫箟涓婚鍔熻兘\r\n *\r\n * 濡傛灉浣犵殑椤圭洰鍚屾牱浣跨敤浜唖css棰勫鐞嗭紝浣犱篃鍙互鐩存帴鍦ㄤ綘鐨� scss 浠g爜涓娇鐢ㄥ涓嬪彉閲忥紝鍚屾椂鏃犻渶 import 杩欎釜鏂囦欢\r\n */\r\n/* 棰滆壊鍙橀噺 */\r\n/* 琛屼负鐩稿叧棰滆壊 */\r\n/* 鏂囧瓧鍩烘湰棰滆壊 */\r\n/* 鑳屾櫙棰滆壊 */\r\n/* 杈规棰滆壊 */\r\n/* 灏哄鍙橀噺 */\r\n/* 鏂囧瓧灏哄 */\r\n/* 鍥剧墖灏哄 */\r\n/* Border Radius */\r\n/* 姘村钩闂磋窛 */\r\n/* 鍨傜洿闂磋窛 */\r\n/* 閫忔槑搴� */\r\n/* 鏂囩珷鍦烘櫙鐩稿叧 */.uni-popup-dialog[data-v-99b3946c]{width:300px;border-radius:11px;background-color:#fff}.uni-dialog-title[data-v-99b3946c]{display:flex;flex-direction:row;justify-content:center;padding-top:25px}.uni-dialog-title-text[data-v-99b3946c]{font-size:16px;font-weight:500}.uni-dialog-content[data-v-99b3946c]{display:flex;flex-direction:row;justify-content:center;align-items:center;padding:20px}.uni-dialog-content-text[data-v-99b3946c]{font-size:14px;color:#6c6c6c}.uni-dialog-button-group[data-v-99b3946c]{display:flex;flex-direction:row;border-top-color:#f5f5f5;border-top-style:solid;border-top-width:1px}.uni-dialog-button[data-v-99b3946c]{display:flex;flex:1;flex-direction:row;justify-content:center;align-items:center;height:45px}.uni-border-left[data-v-99b3946c]{border-left-color:#f0f0f0;border-left-style:solid;border-left-width:1px}.uni-dialog-button-text[data-v-99b3946c]{font-size:16px;color:#333}.uni-button-color[data-v-99b3946c]{color:#007aff}.uni-dialog-input[data-v-99b3946c]{flex:1;font-size:14px;border:1px #eee solid;height:40px;padding:0 10px;border-radius:5px;color:#555}.uni-popup__success[data-v-99b3946c]{color:#4cd964}.uni-popup__warn[data-v-99b3946c]{color:#f0ad4e}.uni-popup__error[data-v-99b3946c]{color:#dd524d}.uni-popup__info[data-v-99b3946c]{color:#909399}',""]),t.exports=n},a65d:function(t,n,e){"use strict";e("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,e("7db0"),e("d3b7"),e("b64b"),e("caad"),e("2532");var i={name:"Keypress",props:{disable:{type:Boolean,default:!1}},mounted:function(){var t=this,n={esc:["Esc","Escape"],tab:"Tab",enter:"Enter",space:[" ","Spacebar"],up:["Up","ArrowUp"],left:["Left","ArrowLeft"],right:["Right","ArrowRight"],down:["Down","ArrowDown"],delete:["Backspace","Delete","Del"]};document.addEventListener("keyup",(function(e){if(!t.disable){var i=Object.keys(n).find((function(t){var i=e.key,a=n[t];return a===i||Array.isArray(a)&&a.includes(i)}));i&&setTimeout((function(){t.$emit(i,{})}),0)}}))},render:function(){}};n.default=i},a750:function(t,n,e){"use strict";e.r(n);var i=e("7714"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a},aad2:function(t,n,e){"use strict";e.r(n);var i=e("5691"),a=e("a750");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("9ac9");var s=e("f0c5"),r=Object(s["a"])(a["default"],i["b"],i["c"],!1,null,"f53b5424",null,!1,i["a"],void 0);n["default"]=r.exports},bac9:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",{staticClass:"uni-popup-dialog"},[e("v-uni-view",{staticClass:"uni-dialog-title"},[e("v-uni-text",{staticClass:"uni-dialog-title-text",class:["uni-popup__"+t.dialogType]},[t._v(t._s(t.titleText))])],1),"base"===t.mode?e("v-uni-view",{staticClass:"uni-dialog-content"},[t._t("default",[e("v-uni-text",{staticClass:"uni-dialog-content-text"},[t._v(t._s(t.content))])])],2):e("v-uni-view",{staticClass:"uni-dialog-content"},[t._t("default",[e("v-uni-input",{staticClass:"uni-dialog-input",attrs:{type:"text",placeholder:t.placeholderText,focus:t.focus},model:{value:t.val,callback:function(n){t.val=n},expression:"val"}})])],2),e("v-uni-view",{staticClass:"uni-dialog-button-group"},[e("v-uni-view",{staticClass:"uni-dialog-button",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.closeDialog.apply(void 0,arguments)}}},[e("v-uni-text",{staticClass:"uni-dialog-button-text"},[t._v(t._s(t.closeText))])],1),e("v-uni-view",{staticClass:"uni-dialog-button uni-border-left",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.onOk.apply(void 0,arguments)}}},[e("v-uni-text",{staticClass:"uni-dialog-button-text uni-button-color"},[t._v(t._s(t.okText))])],1)],1)],1)},a=[]},c3ae:function(t){t.exports=JSON.parse('{"uni-popup.cancel":"鍙栨秷","uni-popup.ok":"纭畾","uni-popup.placeholder":"璇疯緭鍏�","uni-popup.title":"鎻愮ず","uni-popup.shareTitle":"鍒嗕韩鍒�"}')},c6dc:function(t,n,e){"use strict";e.r(n);var i=e("bac9"),a=e("3e54");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("6b2c");var s=e("f0c5"),r=Object(s["a"])(a["default"],i["b"],i["c"],!1,null,"99b3946c",null,!1,i["a"],void 0);n["default"]=r.exports},db2a:function(t,n,e){"use strict";e("7a82");var i=e("4ea4").default;Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=i(e("fbad")),o=i(e("c3ae")),s=i(e("608f")),r={en:a.default,"zh-Hans":o.default,"zh-Hant":s.default};n.default=r},dbf0:function(t,n,e){"use strict";e("7a82");var i=e("4ea4").default;Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,e("c975");var a=i(e("a65d")),o={name:"uniPopup",components:{keypress:a.default},emits:["change","maskClick"],props:{animation:{type:Boolean,default:!0},type:{type:String,default:"center"},isMaskClick:{type:Boolean,default:null},maskClick:{type:Boolean,default:null},backgroundColor:{type:String,default:"none"},safeArea:{type:Boolean,default:!0},maskBackgroundColor:{type:String,default:"rgba(0, 0, 0, 0.4)"}},watch:{type:{handler:function(t){this.config[t]&&this[this.config[t]](!0)},immediate:!0},isDesktop:{handler:function(t){this.config[t]&&this[this.config[this.type]](!0)},immediate:!0},maskClick:{handler:function(t){this.mkclick=t},immediate:!0},isMaskClick:{handler:function(t){this.mkclick=t},immediate:!0},showPopup:function(t){document.getElementsByTagName("body")[0].style.overflow=t?"hidden":"visible"}},data:function(){return{duration:300,ani:[],showPopup:!1,showTrans:!1,popupWidth:0,popupHeight:0,config:{top:"top",bottom:"bottom",center:"center",left:"left",right:"right",message:"top",dialog:"center",share:"bottom"},maskClass:{position:"fixed",bottom:0,top:0,left:0,right:0,backgroundColor:"rgba(0, 0, 0, 0.4)"},transClass:{position:"fixed",left:0,right:0},maskShow:!0,mkclick:!0,popupstyle:this.isDesktop?"fixforpc-top":"top"}},computed:{isDesktop:function(){return this.popupWidth>=500&&this.popupHeight>=500},bg:function(){return""===this.backgroundColor||"none"===this.backgroundColor?"transparent":this.backgroundColor}},mounted:function(){var t=this;(function(){var n=uni.getSystemInfoSync(),e=n.windowWidth,i=n.windowHeight,a=n.windowTop,o=n.safeArea,s=(n.screenHeight,n.safeAreaInsets);t.popupWidth=e,t.popupHeight=i+a,t.safeAreaInsets=o?s.bottom:0})()},created:function(){null===this.isMaskClick&&null===this.maskClick?this.mkclick=!0:this.mkclick=null!==this.isMaskClick?this.isMaskClick:this.maskClick,this.animation?this.duration=300:this.duration=0,this.messageChild=null,this.clearPropagation=!1,this.maskClass.backgroundColor=this.maskBackgroundColor},methods:{closeMask:function(){this.maskShow=!1},disableMask:function(){this.mkclick=!1},clear:function(t){t.stopPropagation(),this.clearPropagation=!0},open:function(t){t&&-1!==["top","center","bottom","left","right","message","dialog","share"].indexOf(t)||(t=this.type),this.config[t]?(this[this.config[t]](),this.$emit("change",{show:!0,type:t})):console.error("缂哄皯绫诲瀷锛�",t)},close:function(t){var n=this;this.showTrans=!1,this.$emit("change",{show:!1,type:this.type}),clearTimeout(this.timer),this.timer=setTimeout((function(){n.showPopup=!1}),300)},touchstart:function(){this.clearPropagation=!1},onTap:function(){this.clearPropagation?this.clearPropagation=!1:(this.$emit("maskClick"),this.mkclick&&this.close())},top:function(t){var n=this;this.popupstyle=this.isDesktop?"fixforpc-top":"top",this.ani=["slide-top"],this.transClass={position:"fixed",left:0,right:0,backgroundColor:this.bg},t||(this.showPopup=!0,this.showTrans=!0,this.$nextTick((function(){n.messageChild&&"message"===n.type&&n.messageChild.timerClose()})))},bottom:function(t){this.popupstyle="bottom",this.ani=["slide-bottom"],this.transClass={position:"fixed",left:0,right:0,bottom:0,paddingBottom:this.safeAreaInsets+"px",backgroundColor:this.bg},t||(this.showPopup=!0,this.showTrans=!0)},center:function(t){this.popupstyle="center",this.ani=["zoom-out","fade"],this.transClass={position:"fixed",display:"flex",flexDirection:"column",bottom:0,left:0,right:0,top:0,justifyContent:"center",alignItems:"center"},t||(this.showPopup=!0,this.showTrans=!0)},left:function(t){this.popupstyle="left",this.ani=["slide-left"],this.transClass={position:"fixed",left:0,bottom:0,top:0,backgroundColor:this.bg,display:"flex",flexDirection:"column"},t||(this.showPopup=!0,this.showTrans=!0)},right:function(t){this.popupstyle="right",this.ani=["slide-right"],this.transClass={position:"fixed",bottom:0,right:0,top:0,backgroundColor:this.bg,display:"flex",flexDirection:"column"},t||(this.showPopup=!0,this.showTrans=!0)}}};n.default=o},e64a:function(t,n,e){var i=e("24fb"),a=e("1de5"),o=e("2617"),s=e("88ac");n=i(!1);var r=a(o),l=a(s);n.push([t.i,"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/* 寮瑰嚭:閰嶇疆鍖哄煙 */.eject-mask[data-v-f53b5424]{width:100%;height:100%;background-color:rgba(0,0,0,.5);position:fixed;top:0;left:0;z-index:999;display:flex;align-items:center;justify-content:center}.eject[data-v-f53b5424]{position:relative;width:600px;height:350px;background-color:#eaeaea;border-radius:%?25?%}.eject-title[data-v-f53b5424]{width:100%;height:100px;line-height:100px;font-size:20px;font-weight:700;color:#606266;text-align:center}.item[data-v-f53b5424]{display:flex;align-items:center;margin:10px 0 0 0}.desc[data-v-f53b5424]{display:inline-block;width:40%;text-align:right;color:#606266;font-size:18px}.input[data-v-f53b5424]{display:flex;align-items:center;padding-left:5px;padding-right:5px;width:100%;height:30px;border:1px solid #c0c4cc;margin-right:50px}.eject-input uni-input[data-v-f53b5424]{width:100%}.eject-button[data-v-f53b5424]{display:flex;align-items:center;position:absolute;bottom:0;height:60px;line-height:60px;width:100%;border-top:1px solid #ccc}.button-item[data-v-f53b5424]{width:50%;height:100%;font-size:20px;font-weight:700;text-align:center;color:#909399}.button-item[data-v-f53b5424]:last-child{color:#67c23a;border-left:1px solid #ccc}.full-width[data-v-f53b5424]{width:100%;height:100%;display:inline-block;float:left}.half-width[data-v-f53b5424]{width:50%;height:100%;display:inline-block;float:left}.box-items[data-v-f53b5424]{height:20%;width:100%;\n\t/* background-color: #233751; */line-height:%?300?%}\n/* 褰撳墠椤甸潰鏃� orderNo */.swiper-here[data-v-f53b5424]{display:inline-block;margin:0 auto;width:100%;height:100%}\n/* 褰撳墠椤甸潰鏈� orderNo */.swiper-here-oN[data-v-f53b5424]{display:inline-block;\n\t/* background-color: #063A7B; */margin:0 auto;width:100%;height:90%}\n/* 褰撳墠椤甸潰鏈� error鎻愮ず */.swiper-here-error[data-v-f53b5424]{display:inline-block;\n\t/* background-color: #063A7B; */\n\t/* margin: 0 auto; */margin-top:20%;width:100%;height:100%}.animate[data-v-f53b5424]{display:inline-block;\n            /* white-space: nowrap; */-webkit-animation:25s wordsLoop-data-v-f53b5424 linear infinite normal;animation:25s wordsLoop-data-v-f53b5424 linear infinite normal}@keyframes wordsLoop-data-v-f53b5424{0%{transform:translateY(100px);-webkit-transform:translateY(100px)}100%{transform:translateY(-100%);-webkit-transform:translateY(-100%)}}@-webkit-keyframes wordsLoop-data-v-f53b5424{0%{transform:translateY(100px);-webkit-transform:translateY(100px)}100%{transform:translateY(-100%);-webkit-transform:translateY(-100%)}}\n/* animation:upMove 1.5s 1; */\n/* downMove */\n/* 涓婂眰鍚戜笂 */.topUp[data-v-f53b5424]{-webkit-animation:topUp-data-v-f53b5424 1.5s 1;animation:topUp-data-v-f53b5424 1.5s 1;-webkit-animation-fill-mode:both;animation-fill-mode:both}@-webkit-keyframes topUp-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:-1080px}to{opacity:1;\n\t\t/* background-color:red; */top:0}}@keyframes topUp-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:-1080px}to{opacity:1;\n\t\t/* background-color:red; */top:0}}\n/* 涓婂眰鍚戜笅 */.topDown[data-v-f53b5424]{-webkit-animation:topDown-data-v-f53b5424 1.5s 1;animation:topDown-data-v-f53b5424 1.5s 1;-webkit-animation-fill-mode:both;animation-fill-mode:both}@-webkit-keyframes topDown-data-v-f53b5424{from{opacity:1;\n\t\t/* background-color:red; */top:0}to{opacity:.5;\n\t\t/* background-color:blue; */top:-1080px}}@keyframes topDown-data-v-f53b5424{from{opacity:1;\n\t\t/* background-color:red; */top:0}to{opacity:.5;\n\t\t/* background-color:blue; */top:-1080px}}\n/* 涓嬪眰鍚戜笂 */.floorUp[data-v-f53b5424]{-webkit-animation:floorUp-data-v-f53b5424 1.5s 1;animation:floorUp-data-v-f53b5424 1.5s 1;-webkit-animation-fill-mode:both;animation-fill-mode:both}@-webkit-keyframes floorUp-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:0}to{opacity:1;\n\t\t/* background-color:red; */top:1080px}}@keyframes floorUp-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:0}to{opacity:1;\n\t\t/* background-color:red; */top:1080px}}\n/* 涓嬪眰鍚戜笅 */.floorDown[data-v-f53b5424]{-webkit-animation:floorDown-data-v-f53b5424 1.5s 1;animation:floorDown-data-v-f53b5424 1.5s 1;-webkit-animation-fill-mode:both;animation-fill-mode:both}@-webkit-keyframes floorDown-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:1080px}to{opacity:1;\n\t\t/* background-color:red; */top:0}}@keyframes floorDown-data-v-f53b5424{from{opacity:.5;\n\t\t/* background-color:blue; */top:1080px}to{opacity:1;\n\t\t/* background-color:red; */top:0}}.top-screen[data-v-f53b5424]{position:fixed;width:1920px;height:1080px;\n\t/* top: -1000px; */background-image:url("+r+");\n\t/* background:red; */\n\t/* animation:upMove 1.5s 1; */z-index:999}.floor-screen[data-v-f53b5424]{width:1920px;height:1080px;position:relative;color:#fff;text-align:center;font-size:%?120?%;letter-spacing:%?5?%;background-image:url("+r+")}.container[data-v-f53b5424]{width:1920px;height:1080px;position:relative\n\t/* background: #000428;  \n\tbackground: -webkit-linear-gradient(to right, #004e92, #000428);  \n\tbackground: linear-gradient(to right, #004e92, #000428); */}.head[data-v-f53b5424]{\n\t/* background-color: #55aaff; */width:100%;height:10%;text-align:center;line-height:110px;color:#fff;font-size:40px;font-weight:700;letter-spacing:5px}.head uni-text[data-v-f53b5424]{-webkit-transform:scaleY(.9);transform:scaleY(.9)}.time-tools[data-v-f53b5424]{height:5%;\n\t/* background-color: #007AFF; */position:absolute;top:0;float:right;right:50px;font-size:16px;font-weight:400;line-height:70px;letter-spacing:1px}.button-left[data-v-f53b5424]{position:absolute;background-image:url("+l+");background-size:100% 100%;top:1.8%;left:21.3%;width:13.5%;height:8.5%;-webkit-transform:scaleX(-1);transform:scaleX(-1)}.button-right[data-v-f53b5424]{position:absolute;background-image:url("+l+");background-size:100% 100%;top:1.8%;left:65%;width:13.5%;height:8.5%}.main[data-v-f53b5424]{\n\t/* background-color: #3F536E; */position:relative;width:100%;height:90%}.main-sides[data-v-f53b5424]{\n\t/* background-color: #004E92; */position:relative;display:inline-block;float:left;width:50%;height:100%\n\t/* margin: 2% auto 0 3.2%;\n\tborder: 1px solid rgba(20, 80, 136, 1); */}.box[data-v-f53b5424]{position:relative;\n\t/* background-color: #ffffff; */margin:3% 2% 0 2%;width:96%;height:30%;border:1px solid #145088;overflow:hidden}.box-lg[data-v-f53b5424]{height:94%}.box-border[data-v-f53b5424]{position:absolute;\n\t/* background-color: #4CD964; */width:10px;height:10px}.box-border1[data-v-f53b5424]{top:0;left:0;border-left:2px solid #31c4c4;border-top:2px solid #31c4c4}.box-border2[data-v-f53b5424]{top:0;right:0;border-right:2px solid #31c4c4;border-top:2px solid #31c4c4}.box-border3[data-v-f53b5424]{bottom:0;left:0;border-bottom:2px solid #31c4c4;border-left:2px solid #31c4c4}.box-border4[data-v-f53b5424]{bottom:0;right:0;border-right:2px solid #31c4c4;border-bottom:2px solid #31c4c4}.content[data-v-f53b5424]{display:flex;flex-direction:column;flex:1}.charts-box[data-v-f53b5424]{width:80%;height:230px;margin-left:10%\n  /* background-color: #fff; */}.ring[data-v-f53b5424]{display:inline-block;float:left;width:60%;height:300px;margin-left:-10%}.box-item[data-v-f53b5424]{\n\t/* background-color: #2C405A; */width:92%;height:20%;margin-left:4%;padding-top:1em;color:#fff}.introduce[data-v-f53b5424]{height:30%}.introduce h2[data-v-f53b5424]{letter-spacing:5px}.english[data-v-f53b5424]{font-size:14px}.introduce-content[data-v-f53b5424]{font-size:20px;padding-top:2em;text-indent:2em;line-height:2em}.charge-info[data-v-f53b5424]{\n\t/* background-color: #2C405A; */height:45%}.charge-info-item[data-v-f53b5424]{\n\t/* background-color: #EE6666; */display:inline-block;width:50%;height:40%}.charge-info-item uni-image[data-v-f53b5424]{display:inline-block;float:left;\n\t/* background-color: #4CD964; */height:100%;width:20%}.charge-info-item uni-view[data-v-f53b5424]{display:inline-block;position:relative;margin-left:10%;width:70%;height:49%\n\t/* background-color: #1890FF; */}.charge-info-item .count[data-v-f53b5424], .charge-info-item .unit[data-v-f53b5424]{position:absolute;display:inline-block;font-size:32px;bottom:0;padding-left:5%}.charge-info-item .unit[data-v-f53b5424]{font-size:16px;float:right;right:20%}.footer[data-v-f53b5424]{position:absolute;border:1px solid #145088;height:15%}.use-info[data-v-f53b5424]{\n\t/* background-color: #007AFF; */}.use-left[data-v-f53b5424]{display:inline-block;\n\t/* background-color: #2C405A; */width:40%}.use-right[data-v-f53b5424]{display:inline-block;\n\t/* background-color: #2C405A; */float:right;width:20%}.use-main[data-v-f53b5424]{width:100%;height:75%\n\t/* background-color: #4CD964; */}.use-main .left[data-v-f53b5424]{\n\t/* background-color: #ffaa7f; */display:inline-block;float:left;height:100%;width:70%;line-height:20px}.left .progressBar[data-v-f53b5424]{\n\t/* margin-left: ; */margin-top:9%;width:100%;height:20%;background-color:#233751;border-radius:20px}.left .progress[data-v-f53b5424]{\n\t/* width: 90%; */height:100%;background-color:#ff5722;border-radius:20px}.left uni-progress[data-v-f53b5424]{margin-left:10%;margin-top:10%;display:block}.use-main .right[data-v-f53b5424]{\n\t/* background-color: #ffaaff; */display:inline-block;float:right;height:100%;width:20%;font-size:40px;color:#ff5722;line-height:130px}.box-tp[data-v-f53b5424]{height:30%}.box-tp .sub-main[data-v-f53b5424]{\n\t/* background-color: #FFFFFF; */}.box-md[data-v-f53b5424]{height:43%}.sub-main-right[data-v-f53b5424]{display:inline-block;height:100%;width:50%}.sub-info[data-v-f53b5424]{width:100%;height:33%}.sub-info uni-image[data-v-f53b5424]{display:inline-block;float:left;height:100%;width:15%}.sub-info uni-text[data-v-f53b5424]{display:inline-block;width:40%;height:100%;text-align:center;line-height:120px;font-size:20px}.box-bt[data-v-f53b5424]{background-color:#063a7b;border:none;height:15%;color:#fff}.box-bt uni-image[data-v-f53b5424]{position:absolute;float:right;right:0;top:0;width:20%;height:100%}.box-bt[data-v-f53b5424]{font-size:36px;line-height:140px;text-indent:5em}.right-item[data-v-f53b5424]{height:94%}.sub-left[data-v-f53b5424]{display:inline-block;float:left;width:40%}.sub-right[data-v-f53b5424]{display:inline-block;float:right;width:20%}.sub-main[data-v-f53b5424]{position:absolute;\n\t/* background-color: #31C4C4; */width:92%;height:80%;bottom:0}",""]),t.exports=n},fac2:function(t,n,e){"use strict";e.r(n);var i=e("dbf0"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a},fbad:function(t){t.exports=JSON.parse('{"uni-popup.cancel":"cancel","uni-popup.ok":"ok","uni-popup.placeholder":"pleace enter","uni-popup.title":"Hint","uni-popup.shareTitle":"Share to"}')}}]);
\ No newline at end of file
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index ed29a70..56c0ffd 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -22,7 +22,7 @@
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
 //             {field: 'adjId', align: 'center',title: '搴忓彿'}
             {field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
+            ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
             ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
             // ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
             ,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 2c344fa..0f12b3f 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -181,11 +181,11 @@
 }
 
 var matCols = [
-    {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', width: 180}
+    {field: 'matnr', align: 'center',title: '鍝佸彿', width: 180}
     // {field: 'id', align: 'center',title: 'ID'}
     // ,{field: 'uuid', align: 'center',title: '缂栧彿'}
     // ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
-    ,{field: 'maktx', align: 'center',title: '鍝佸彿', width: 200}
+    ,{field: 'maktx', align: 'center',title: '鍝佸悕', width: 200}
     // ,{field: 'name', align: 'center',title: '鍒悕'}
     ,{field: 'specs', align: 'center',title: '瑙勬牸'}
     ,{field: 'model', align: 'center',title: '浠g爜', hide: true}
@@ -222,8 +222,8 @@
 ]
 
 var detlCols = [
-    {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
-    ,{field: 'maktx', align: 'center',title: '鍝佸彿', sort:true}
+    {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
+    ,{field: 'maktx', align: 'center',title: '鍝佸悕', sort:true}
     ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
     ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
     ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
diff --git a/src/main/webapp/static/js/locCheck/locCheck.js b/src/main/webapp/static/js/locCheck/locCheck.js
index 26a8ec1..edaa1ad 100644
--- a/src/main/webapp/static/js/locCheck/locCheck.js
+++ b/src/main/webapp/static/js/locCheck/locCheck.js
@@ -24,7 +24,7 @@
             {type: 'checkbox', hide: true}
             , {field: 'id', align: 'center', title: '鍞竴ID', hide: true}
             , {field: 'locNo', align: 'center', title: '搴撲綅鍙�'}
-            , {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'}
+            , {field: 'matnr', align: 'center', title: '鍝佸彿'}
             , {field: 'originAnfme', align: 'center', title: '鐩樼偣鍓嶆暟閲�'}
             , {field: 'type$', align: 'center', title: '鐘舵��'}
             , {field: 'realAnfme', align: 'center', title: '鐪熷疄鏁伴噺'}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index dd645dc..30832b2 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,8 +2,8 @@
 function getCol() {
     var cols = [
         {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
-        {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
-        ,{field: 'maktx', align: 'center',title: '鍝佸彿', sort:true}
+        {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
+        ,{field: 'maktx', align: 'center',title: '鍝佸悕', sort:true}
         ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
         ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺', sort:true}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 2de0969..aa7932c 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -2,8 +2,8 @@
 function getCol() {
     var cols = [
         {field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
-        {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
-        ,{field: 'maktx', align: 'center',title: '鍝佸彿', sort:true}
+        {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
+        ,{field: 'maktx', align: 'center',title: '鍝佸悕', sort:true}
         ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
         ,{field: 'specs', align: 'center',title: '瑙勬牸'}
         ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 3694905..3d47663 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -264,7 +264,7 @@
             success: function (layero, dIndex) {
                 // 鍥炴樉琛ㄥ崟鏁版嵁
                 form.val('detail', mData);
-                // 鏂板鑷姩鐢熸垚鐗╂枡鍙�
+                // 鏂板鑷姩鐢熸垚鍝佸彿
                 if (!mData) {
                     http.get(baseUrl + "/mat/auto/matnr/auth", null, function (res) {
                         $('#matnr').val(res.data);
diff --git a/src/main/webapp/static/js/matV2/matV2.js b/src/main/webapp/static/js/matV2/matV2.js
index 0ad000a..9f123ae 100644
--- a/src/main/webapp/static/js/matV2/matV2.js
+++ b/src/main/webapp/static/js/matV2/matV2.js
@@ -28,8 +28,8 @@
             ,{field: 'id', align: 'center',title: 'ID',hide: true}
             ,{field: 'uuid', align: 'center',title: '涓婄骇搴忓彿',hide: false}
             ,{field: 'tagId', align: 'center',title: '褰撳墠搴忓彿',hide: false}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�',hide: false}
-            ,{field: 'maktx', align: 'center',title: '鍝佸彿',hide: false}
+            ,{field: 'matnr', align: 'center',title: '鍝佸彿',hide: false}
+            ,{field: 'maktx', align: 'center',title: '鍝佸悕',hide: false}
             ,{field: 'name', align: 'center',title: '',hide: true}
             ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: false}
             ,{field: 'model', align: 'center',title: '',hide: true}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index d29cde9..2cbf482 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -132,8 +132,8 @@
                         cellMinWidth: 100,
                         cols: [[
                             {type: 'numbers'},
-                            {field: 'matnr', title: '鐗╂枡鍙�', width: 160},
-                            {field: 'maktx', title: '鍝佸彿', width: 160},
+                            {field: 'matnr', title: '鍝佸彿', width: 160},
+                            {field: 'maktx', title: '鍝佸悕', width: 160},
                             {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
                             {field: 'supp', title: '绔嬪簱搴撳瓨', templet: function (item){
@@ -258,8 +258,8 @@
                     cellMinWidth: 100,
                     cols: [[
                         {type: 'numbers', title: '#'},
-                        {field: 'matnr', title: '鐗╂枡鍙�', width: 160},
-                        {field: 'maktx', title: '鍝佸彿', width: 200},
+                        {field: 'matnr', title: '鍝佸彿', width: 160},
+                        {field: 'maktx', title: '鍝佸悕', width: 200},
                         {field: 'batch', title: '鎵瑰彿', edit: true},
                         {field: 'specs', title: '瑙勬牸'},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 3bf7fe0..ebb379e 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -33,8 +33,8 @@
             {type: 'checkbox'}
             ,{type: 'numbers', title: '#'}
             ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', width: 160}
-            ,{field: 'maktx', align: 'center',title: '鍝佸彿', width: 200}
+            ,{field: 'matnr', align: 'center',title: '鍝佸彿', width: 160}
+            ,{field: 'maktx', align: 'center',title: '鍝佸悕', width: 200}
             ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
             ,{field: 'specs', align: 'center',title: '瑙勬牸'}
             ,{field: 'anfme', align: 'center',title: '鎬绘暟閲�', style: 'font-weight: bold'}
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index 753a75f..2222cc1 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -25,8 +25,8 @@
             ,{field: 'id', align: 'center',title: 'ID'}
             ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
             ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
-            ,{field: 'maktx', align: 'center',title: '鍝佸彿'}
+            ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
+            ,{field: 'maktx', align: 'center',title: '鍝佸悕'}
             ,{field: 'name', align: 'center',title: '鍚嶇О'}
             ,{field: 'specs', align: 'center',title: '瑙勬牸'}
             ,{field: 'model', align: 'center',title: '鍨嬪彿'}
diff --git a/src/main/webapp/static/js/pack/pack.js b/src/main/webapp/static/js/pack/pack.js
index 0d261f7..47e7993 100644
--- a/src/main/webapp/static/js/pack/pack.js
+++ b/src/main/webapp/static/js/pack/pack.js
@@ -24,7 +24,7 @@
             {type: 'checkbox'}
             // ,{field: 'id', align: 'center',title: 'ID'}
             ,{field: 'barcode',title: '鏉$爜'}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', minWidth: 250, width: 250}
+            ,{field: 'matnr', align: 'center',title: '鍝佸彿', minWidth: 250, width: 250}
             ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
             ,{field: 'settle$', align: 'center',title: '鐘舵��', templet: '#settleTpl',  minWidth: 160, width: 160}
             // ,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/static/js/pakStore/pakComb.js b/src/main/webapp/static/js/pakStore/pakComb.js
index 30e1d07..b3e5ca0 100644
--- a/src/main/webapp/static/js/pakStore/pakComb.js
+++ b/src/main/webapp/static/js/pakStore/pakComb.js
@@ -42,7 +42,7 @@
         , cols: [[ //鏍囬鏍�
             {field: 'locNo', title: '搴撲綅', width: 120}
             , {field: 'maktx', title: '鍟嗗搧鍚�', width: 300}
-            , {field: 'matnr', title: '鍟嗗搧鍙�', width: 200}
+            , {field: 'matnr', title: '鍟嗗搧鍚�', width: 200}
             , {field: 'specs', title: '瑙勬牸', width: 300}
             , {field: 'anfme', title: '鏁伴噺', width: 100}
         ]]
@@ -95,8 +95,8 @@
                 width: 120,
                 style: 'color: blue;font-weight: bold'
             },
-            {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
-            {field: 'maktx', align: 'center', title: '鍝佸彿'},
+            {field: 'matnr', align: 'center', title: '鍝佸彿'},
+            {field: 'maktx', align: 'center', title: '鍝佸悕'},
             {field: 'specs', align: 'center', title: '瑙勬牸'},
             {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 200}
         ]]
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index f65b876..da24337 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -109,8 +109,8 @@
                                 ,{field: 'id', align: 'center',title: 'id', hide:true}
                                 ,{field: 'docNum', align: 'center',title: '鎷h揣鍗曞彿'}
                                 ,{field: 'locNo', align: 'center',title: '搴撲綅'}
-                                ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
-                                ,{field: 'maktx', align: 'center',title: '鍝佸彿'}
+                                ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
+                                ,{field: 'maktx', align: 'center',title: '鍝佸悕'}
                                 ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
                                 ,{field: 'createTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
                                 ,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/static/js/picking/pickingOrder.js b/src/main/webapp/static/js/picking/pickingOrder.js
index 5439b4e..4584f6b 100644
--- a/src/main/webapp/static/js/picking/pickingOrder.js
+++ b/src/main/webapp/static/js/picking/pickingOrder.js
@@ -115,8 +115,8 @@
                             cellMinWidth: 100,
                             cols: [[
                                 {type: 'numbers'},
-                                {field: 'matnr', title: '鐗╂枡鍙�', width: 160},
-                                {field: 'maktx', title: '鍝佸彿', width: 160},
+                                {field: 'matnr', title: '鍝佸彿', width: 160},
+                                {field: 'maktx', title: '鍝佸悕', width: 160},
                                 {field: 'batch', title: '鎵瑰彿'},
                                 {field: 'anfme', title: '鏁伴噺'},
                                 // {field: 'workQty', title: '浣滀笟鏁伴噺'},
@@ -305,8 +305,8 @@
                     cellMinWidth: 100,
                     cols: [[
                         {type: 'numbers', title: '#'},
-                        {field: 'matnr', title: '鐗╂枡鍙�', width: 160},
-                        {field: 'maktx', title: '鍝佸彿', width: 200},
+                        {field: 'matnr', title: '鍝佸彿', width: 160},
+                        {field: 'maktx', title: '鍝佸悕', width: 200},
                         {field: 'batch', title: '鎵瑰彿', edit: true},
                         {field: 'specs', title: '瑙勬牸'},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js
index 65153ff..547b763 100644
--- a/src/main/webapp/static/js/report/workCountIn.js
+++ b/src/main/webapp/static/js/report/workCountIn.js
@@ -2,8 +2,8 @@
 function getCol() {
     var cols = [
         {field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
-        ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
-        ,{field: 'maktx', align: 'center',title: '鍝佸彿'}
+        ,{field: 'matnr', 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 33ae0cc..8a82401 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -2,8 +2,8 @@
 function getCol() {
     var cols = [
         {field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
-        ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
-        ,{field: 'maktx', align: 'center',title: '鍝佸彿'}
+        ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
+        ,{field: 'maktx', align: 'center',title: '鍝佸悕'}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
     ];
 
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 500f8b6..713b56e 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -2,8 +2,8 @@
 function getCol() {
     var cols = [
         {field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
-        {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
-        ,{field: 'maktx', align: 'center',title: '鍝佸彿', sort:true}
+        {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
+        ,{field: 'maktx', align: 'center',title: '鍝佸悕', sort:true}
         ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false, hide: true}
         ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true , hide: true}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js
index 6d2833e..0bb29bf 100644
--- a/src/main/webapp/static/js/saasLog/saasLog.js
+++ b/src/main/webapp/static/js/saasLog/saasLog.js
@@ -25,7 +25,7 @@
             ,{field: 'id', align: 'center',title: 'id', hide:true}
             ,{field: 'locNo', align: 'center',title: '搴撲綅'}
             ,{field: 'type$', align: 'center',title: '鎿嶄綔绫诲瀷'}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
+            ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
             ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
             ,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
             ,{field: 'createBy', align: 'center',title: '', hide:true}
diff --git a/src/main/webapp/views/ioWorks/locDetlQuery.html b/src/main/webapp/views/ioWorks/locDetlQuery.html
index 71509f5..31bbe05 100644
--- a/src/main/webapp/views/ioWorks/locDetlQuery.html
+++ b/src/main/webapp/views/ioWorks/locDetlQuery.html
@@ -52,12 +52,12 @@
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�"  autocomplete="off">
+                <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿"  autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="maktx" placeholder="鍝佸彿" autocomplete="off">
+                <input class="layui-input" type="text" name="maktx" placeholder="鍝佸悕" autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
diff --git a/src/main/webapp/views/ioWorks/matQuery.html b/src/main/webapp/views/ioWorks/matQuery.html
index 5d3ba8b..6cbeee4 100644
--- a/src/main/webapp/views/ioWorks/matQuery.html
+++ b/src/main/webapp/views/ioWorks/matQuery.html
@@ -28,12 +28,12 @@
     <div id="search-box" class="layui-form layui-card-header">
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+                <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="maktx" placeholder="鍝佸彿" autocomplete="off">
+                <input class="layui-input" type="text" name="maktx" placeholder="鍝佸悕" autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
diff --git a/src/main/webapp/views/locCheck/locCheck.html b/src/main/webapp/views/locCheck/locCheck.html
index 0d2507d..0f1ff77 100644
--- a/src/main/webapp/views/locCheck/locCheck.html
+++ b/src/main/webapp/views/locCheck/locCheck.html
@@ -83,9 +83,9 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">鐗╂枡鍙�: </label>
+                    <label class="layui-form-label">鍝佸彿: </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ョ墿鏂欏彿">
+                        <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ搧鍙�">
                     </div>
                 </div>
                 <div class="layui-form-item">
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index a0d842b..85c7f8c 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -26,12 +26,12 @@
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="maktx" placeholder="鍝佸彿" autocomplete="off">
+            <input class="layui-input" type="text" name="maktx" placeholder="鍝佸悕" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline">
diff --git a/src/main/webapp/views/locDetl/locDetl1.html b/src/main/webapp/views/locDetl/locDetl1.html
index 65180e8..f9b04f0 100644
--- a/src/main/webapp/views/locDetl/locDetl1.html
+++ b/src/main/webapp/views/locDetl/locDetl1.html
@@ -75,15 +75,15 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鐗╂枡鍙�:</label>
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸彿:</label>
                             <div class="layui-input-inline">
-                                <input name="matnr" class="layui-input" placeholder="杈撳叆鐗╂枡鍙�"/>
+                                <input name="matnr" class="layui-input" placeholder="杈撳叆鍝佸彿"/>
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸彿:</label>
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸悕:</label>
                             <div class="layui-input-inline">
-                                <input name="maktx" class="layui-input" placeholder="杈撳叆鍝佸彿"/>
+                                <input name="maktx" class="layui-input" placeholder="杈撳叆鍝佸悕"/>
                             </div>
                         </div>
                         <div class="layui-inline">&emsp;
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index 6a7fd52..740be08 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -16,12 +16,12 @@
 <div id="search-box" class="layui-form layui-card-header">
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="maktx" placeholder="鍝佸彿" autocomplete="off">
+            <input class="layui-input" type="text" name="maktx" placeholder="鍝佸悕" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline">
diff --git a/src/main/webapp/views/manLocDetl/manLocDetl.html b/src/main/webapp/views/manLocDetl/manLocDetl.html
index 5be05d8..4345bf9 100644
--- a/src/main/webapp/views/manLocDetl/manLocDetl.html
+++ b/src/main/webapp/views/manLocDetl/manLocDetl.html
@@ -75,15 +75,15 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鐗╂枡鍙�:</label>
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸彿:</label>
                             <div class="layui-input-inline">
-                                <input name="matnr" class="layui-input" placeholder="杈撳叆鐗╂枡鍙�"/>
+                                <input name="matnr" class="layui-input" placeholder="杈撳叆鍝佸彿"/>
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸彿:</label>
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸悕:</label>
                             <div class="layui-input-inline">
-                                <input name="maktx" class="layui-input" placeholder="杈撳叆鍝佸彿"/>
+                                <input name="maktx" class="layui-input" placeholder="杈撳叆鍝佸悕"/>
                             </div>
                         </div>
                         <div class="layui-inline">&emsp;
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 0ba7749..b9d8c37 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,15 +86,15 @@
                     <!-- 琛ㄦ牸宸ュ叿鏍�2 -->
                     <div id="search-box" class="layui-form toolbar"  style="padding-top: 5px">
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鐗╂枡鍙�:</label>
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸彿:</label>
                             <div class="layui-input-inline">
-                                <input name="matnr" class="layui-input" placeholder="杈撳叆鐗╂枡鍙�"/>
+                                <input name="matnr" class="layui-input" placeholder="杈撳叆鍝佸彿"/>
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸彿:</label>
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸悕:</label>
                             <div class="layui-input-inline">
-                                <input name="maktx" class="layui-input" placeholder="杈撳叆鍝佸彿"/>
+                                <input name="maktx" class="layui-input" placeholder="杈撳叆鍝佸悕"/>
                             </div>
                         </div>
                         <div class="layui-inline">&emsp;
@@ -186,9 +186,9 @@
                 </div>
 
                 <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">鍝佸彿</label>
+                    <label class="layui-form-label layui-form-required">鍝佸悕</label>
                     <div class="layui-input-block">
-                        <input name="maktx" placeholder="璇疯緭鍏ュ搧鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+                        <input name="maktx" placeholder="璇疯緭鍏ュ搧鍚�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                     </div>
                 </div>
 
@@ -225,9 +225,9 @@
 
             <div class="layui-col-md6">
                 <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">鐗╂枡鍙�</label>
+                    <label class="layui-form-label layui-form-required">鍝佸彿</label>
                     <div class="layui-input-block">
-                        <input id="matnr" name="matnr" placeholder="璇疯緭鍏ョ墿鏂欏彿" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+                        <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ搧鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                     </div>
                 </div>
 
@@ -287,7 +287,7 @@
                 <div id="template-preview-1" class="template-preview" style="display: inline-block">
                     <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                         <tr style="height: 74px">
-                            <td colspan="3" align="center" scope="col">鐗╂枡鍙�</td>
+                            <td colspan="3" align="center" scope="col">鍝佸彿</td>
                             <td class="barcode" colspan="9" align="center" scope="col">
                                 <img class="template-code template-barcode" src="" width="90%;">
                                 <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
@@ -296,7 +296,7 @@
                             </td>
                         </tr>
                         <tr style="height: 74px">
-                            <td align="center" colspan="3">鍝佸彿</td>
+                            <td align="center" colspan="3">鍝佸悕</td>
                             <td align="center" colspan="5">xxxxxx-xx/xx</td>
                             <td align="center" colspan="2">澶囨敞</td>
                             <td align="center" colspan="2">xx</td>
@@ -308,7 +308,7 @@
                 <div id="template-preview-2" class="template-preview" style="display: none">
                     <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                         <tr style="height: 30px">
-                            <td align="center" width="20%">鍝佸彿</td>
+                            <td align="center" width="20%">鍝佸悕</td>
                             <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
                         </tr>
                         <tr style="height: 30px">
@@ -330,7 +330,7 @@
                 <div id="template-preview-3" class="template-preview" style="display: none">
                     <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                         <tr style="height: 74px">
-                            <td align="center" scope="col" colspan="1">鍝佸彿</td>
+                            <td align="center" scope="col" colspan="1">鍝佸悕</td>
                             <td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
                             <td align="center" scope="col" colspan="2" rowspan="2">
                                 <img class="template-code template-qrcode" src="" width="80%">
@@ -366,7 +366,7 @@
     {{#each data}}
     <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
         <tr style="height: 74px">
-            <td align="center" colspan="3" scope="col">鐗╂枡鍙�</td>
+            <td align="center" colspan="3" scope="col">鍝佸彿</td>
             <td align="center" class="barcode" colspan="9" scope="col">
                 <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
                 <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
@@ -375,7 +375,7 @@
             </td>
         </tr>
         <tr style="height: 74px">
-            <td align="center" colspan="3">鍝佸彿</td>
+            <td align="center" colspan="3">鍝佸悕</td>
             <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.maktx}}</td>
             <td align="center" colspan="2">澶囨敞</td>
             <td align="center" colspan="2">{{this.memo}}</td>
@@ -388,7 +388,7 @@
     {{#each data}}
     <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
         <tr style="height: 35px">
-            <td align="center" width="20%">鍝佸彿</td>
+            <td align="center" width="20%">鍝佸悕</td>
             <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
         </tr>
         <tr style="height: 35px">
@@ -411,7 +411,7 @@
     {{#each data}}
     <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
         <tr style="height: 74px" >
-            <td align="center" scope="col" colspan="1">鍝佸彿</td>
+            <td align="center" scope="col" colspan="1">鍝佸悕</td>
             <td align="center" scope="col" colspan="1" style="
                 display: inline-block;
                 line-height: 20px;
diff --git a/src/main/webapp/views/matV2/matV2.html b/src/main/webapp/views/matV2/matV2.html
index 4c9b398..ee2f4a3 100644
--- a/src/main/webapp/views/matV2/matV2.html
+++ b/src/main/webapp/views/matV2/matV2.html
@@ -89,13 +89,13 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">鐗╂枡鍙�: </label>
+                    <label class="layui-form-label layui-form-required">鍝佸彿: </label>
                     <div class="layui-input-block">
                         <input class="layui-input" name="matnr" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">鍝佸彿: </label>
+                    <label class="layui-form-label">鍝佸悕: </label>
                     <div class="layui-input-block">
                         <input class="layui-input" name="maktx" placeholder="璇疯緭鍏�">
                     </div>
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 668adde..073cc3f 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -95,15 +95,15 @@
                     <form class="layui-form toolbar">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label class="layui-form-label">鐗╂枡鍙�:</label>
+                                <label class="layui-form-label">鍝佸彿:</label>
                                 <div class="layui-input-inline">
-                                    <input name="matnr" class="layui-input" placeholder="鐗╂枡鍙�"/>
+                                    <input name="matnr" class="layui-input" placeholder="鍝佸彿"/>
                                 </div>
                             </div>
                             <div class="layui-inline">
-                                <label class="layui-form-label">鍝佸彿:</label>
+                                <label class="layui-form-label">鍝佸悕:</label>
                                 <div class="layui-input-inline">
-                                    <input name="maktx" class="layui-input" placeholder="鍝佸彿"/>
+                                    <input name="maktx" class="layui-input" placeholder="鍝佸悕"/>
                                 </div>
                             </div>
                             <div class="layui-inline">
diff --git a/src/main/webapp/views/order/view.html b/src/main/webapp/views/order/view.html
index e91aece..1c1a555 100644
--- a/src/main/webapp/views/order/view.html
+++ b/src/main/webapp/views/order/view.html
@@ -10,7 +10,7 @@
         <tr><th colspan="8">鏉愭枡鍑哄簱鍗�</th></tr>
         <tr><td>鍑哄簱鍗曞彿</td><td colspan="2">HAND1056256517314969600</td><td>鍑哄簱鏃ユ湡</td><td colspan="2">2022-12-24</td><td>浠撳簱</td><td>1鍙蜂粨搴�</td></tr>
         <tr>
-            <td>搴忓彿</td><td>鐗╂枡鍙�</td><td>鍝佸彿</td><td>鍚堝悓鍙�</td><td>瑙勬牸鍨嬪彿</td><td>鍗曚綅</td><td>鏁伴噺</td><td>澶囨敞</td>
+            <td>搴忓彿</td><td>鍝佸彿</td><td>鍝佸悕</td><td>鍚堝悓鍙�</td><td>瑙勬牸鍨嬪彿</td><td>鍗曚綅</td><td>鏁伴噺</td><td>澶囨敞</td>
         </tr>
         <tr></tr>
         <tr><td>鍚堣</td><td colspan="5"></td><td></td><td></td></tr>
diff --git a/src/main/webapp/views/orderDetl/orderDetl.html b/src/main/webapp/views/orderDetl/orderDetl.html
index fd46bd3..862964c 100644
--- a/src/main/webapp/views/orderDetl/orderDetl.html
+++ b/src/main/webapp/views/orderDetl/orderDetl.html
@@ -82,15 +82,15 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">鐗╂枡鍙�: </label>
+                    <label class="layui-form-label">鍝佸彿: </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ョ墿鏂欏彿">
+                        <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ搧鍙�">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">鍝佸彿: </label>
+                    <label class="layui-form-label">鍝佸悕: </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ搧鍙�">
+                        <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ搧鍚�">
                     </div>
                 </div>
                 <div class="layui-form-item">
diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index 16da117..3691086 100644
--- a/src/main/webapp/views/pack/pack.html
+++ b/src/main/webapp/views/pack/pack.html
@@ -97,9 +97,9 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">鐗╂枡鍙�: </label>
+                    <label class="layui-form-label">鍝佸彿: </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ョ墿鏂欏彿">
+                        <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ搧鍙�">
                     </div>
                 </div>
                 <div class="layui-form-item">
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 23afe86..6e6dd3f 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -73,7 +73,7 @@
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�"  autocomplete="off">
+                <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿"  autocomplete="off">
             </div>
         </div>
 <!--        <div class="layui-inline">-->
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 919987a..51f99e1 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -64,7 +64,7 @@
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�"  autocomplete="off">
+                <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿"  autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 8393fc9..b765c7c 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -30,12 +30,12 @@
         <div id="search-box" class="layui-form layui-card-header">
             <div class="layui-inline">
                 <div class="layui-input-inline">
-                    <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+                    <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
                 </div>
             </div>
             <div class="layui-inline">
                 <div class="layui-input-inline">
-                    <input class="layui-input" type="text" name="maktx" placeholder="鍝佸彿" autocomplete="off">
+                    <input class="layui-input" type="text" name="maktx" placeholder="鍝佸悕" autocomplete="off">
                 </div>
             </div>
             <!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index b661c84..1733299 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -55,8 +55,8 @@
             cellMinWidth: 50,
             cols: [[
                 {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
-                {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
-                {field: 'maktx', align: 'center', title: '鍝佸彿'}
+                {field: 'matnr', align: 'center', title: '鍝佸彿'},
+                {field: 'maktx', align: 'center', title: '鍝佸悕'}
             ]],
             done: function (res, curr, count) {
             }
diff --git a/src/main/webapp/views/pda/locDetlIframe.html b/src/main/webapp/views/pda/locDetlIframe.html
index 11b2ca2..660a8e7 100644
--- a/src/main/webapp/views/pda/locDetlIframe.html
+++ b/src/main/webapp/views/pda/locDetlIframe.html
@@ -79,11 +79,11 @@
         <input id="locNo" type="text" disabled="disabled">
     </div>
     <div class="form-item">
-        <span>鐗╂枡鍙�</span>
+        <span>鍝佸彿</span>
         <input id="matnr" type="text" disabled="disabled">
     </div>
     <div class="form-item">
-        <span>鍝佸彿</span>
+        <span>鍝佸悕</span>
         <input id="maktx" type="text" disabled="disabled">
     </div>
     <div class="form-item">
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index c135060..20acfc8 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -77,11 +77,11 @@
 
 <div class="form-box">
     <div class="form-item">
-        <span>鐗╂枡鍙�</span>
+        <span>鍝佸彿</span>
         <input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
     </div>
     <div class="form-item">
-        <span>鍝佸彿</span>
+        <span>鍝佸悕</span>
         <input id="matName" type="text" disabled="disabled">
     </div>
     <div class="form-item">
@@ -108,7 +108,7 @@
     var pageCurr;
 
     /**
-     * 鏍规嵁鐗╂枡鍙锋煡璇㈢墿鏂欒鎯�
+     * 鏍规嵁鍝佸彿鏌ヨ鐗╂枡璇︽儏
      */
     function find(el){
         if (isEmpty(el.value)) {
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 6a3f051..15cd315 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -120,8 +120,8 @@
             cellMinWidth: 50,
             cols: [[
                 {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
-                {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
-                {field: 'maktx', align: 'center', title: '鍝佸彿'}
+                {field: 'matnr', align: 'center', title: '鍝佸彿'},
+                {field: 'maktx', align: 'center', title: '鍝佸悕'}
             ]],
             done: function (res, curr, count) {
 
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 87a39e0..eca8ab2 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -77,7 +77,7 @@
     }
 
     /**
-     * 鏍规嵁鐗╂枡鍙锋煡鎵惧簱瀛樻槑缁�
+     * 鏍规嵁鍝佸彿鏌ユ壘搴撳瓨鏄庣粏
      */
     function findByMatNo(el){
         if (isEmpty(el.value)) {
diff --git a/src/main/webapp/views/report/viewStayTime.html b/src/main/webapp/views/report/viewStayTime.html
index fa8911d..f9d8c05 100644
--- a/src/main/webapp/views/report/viewStayTime.html
+++ b/src/main/webapp/views/report/viewStayTime.html
@@ -26,7 +26,7 @@
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
 
diff --git a/src/main/webapp/views/report/viewWorkCountIn.html b/src/main/webapp/views/report/viewWorkCountIn.html
index fd8a55a..81b0ae3 100644
--- a/src/main/webapp/views/report/viewWorkCountIn.html
+++ b/src/main/webapp/views/report/viewWorkCountIn.html
@@ -20,7 +20,7 @@
 <div id="search-box" class="layui-form layui-card-header">
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/report/viewWorkCountOut.html b/src/main/webapp/views/report/viewWorkCountOut.html
index 197c32a..9eb2087 100644
--- a/src/main/webapp/views/report/viewWorkCountOut.html
+++ b/src/main/webapp/views/report/viewWorkCountOut.html
@@ -21,7 +21,7 @@
 <div id="search-box" class="layui-form layui-card-header">
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 63930ca..db4fc34 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -26,7 +26,7 @@
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index a115e3c..628179a 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -26,7 +26,7 @@
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/saas/locDetl.html b/src/main/webapp/views/saas/locDetl.html
index d630c5a..51bc48d 100644
--- a/src/main/webapp/views/saas/locDetl.html
+++ b/src/main/webapp/views/saas/locDetl.html
@@ -26,7 +26,7 @@
 <!--    </div>-->
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
 <!--    <div class="layui-inline">-->
diff --git a/src/main/webapp/views/saas/matQuery.html b/src/main/webapp/views/saas/matQuery.html
index 29f692a..3f680e3 100644
--- a/src/main/webapp/views/saas/matQuery.html
+++ b/src/main/webapp/views/saas/matQuery.html
@@ -28,12 +28,12 @@
     <div id="search-box" class="layui-form layui-card-header">
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+                <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="maktx" placeholder="鍝佸彿" autocomplete="off">
+                <input class="layui-input" type="text" name="maktx" placeholder="鍝佸悕" autocomplete="off">
             </div>
         </div>
         <!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index 77f1a49..d77e276 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.html
@@ -21,7 +21,7 @@
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
     <!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/waitPakin/waitPakin_detail.html b/src/main/webapp/views/waitPakin/waitPakin_detail.html
index a868752..8ca407b 100644
--- a/src/main/webapp/views/waitPakin/waitPakin_detail.html
+++ b/src/main/webapp/views/waitPakin/waitPakin_detail.html
@@ -36,7 +36,7 @@
             </div>
         </div>
         <div class="layui-inline"  style="width:31%;">
-            <label class="layui-form-label">鐗╂枡鍙凤細</label>
+            <label class="layui-form-label">鍝佸彿锛�</label>
             <div class="layui-input-inline">
                 <input id="matnr" class="layui-input" type="text">
             </div>
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog.html b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
index d4f5de6..035ed3f 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -16,7 +16,7 @@
 <div id="search-box" class="layui-form layui-card-header">
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline">
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html b/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
index 9d0812e..0f0caae 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
@@ -42,7 +42,7 @@
             </div>
         </div>
         <div class="layui-inline"  style="width:31%;">
-            <label class="layui-form-label">鐗╂枡鍙凤細</label>
+            <label class="layui-form-label">鍝佸彿锛�</label>
             <div class="layui-input-inline">
                 <input id="matnr" class="layui-input" type="text">
             </div>
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index 358a049..62ea2bf 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -21,7 +21,7 @@
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline" style="width: 300px">

--
Gitblit v1.9.1