From 3d00d9dd9b444c152b08b48fde0b4dd6a0dfa4b2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 22 十月 2025 10:32:57 +0800
Subject: [PATCH] *

---
 src/main/webapp/views/basArmMast/basArmMast.html                  |  237 +++++++++++++++++++----------
 src/main/java/com/zy/asrs/entity/BasArmMast.java                  |   31 +++
 src/main/java/com/zy/asrs/controller/BasArmMastLogController.java |    1 
 src/main/java/basArmMastSign.sql                                  |   21 ++
 src/main/webapp/views/basArmMastLog/basArmMastLog.html            |   64 +++++++
 src/main/webapp/static/js/basArmMastLog/basArmMastLog.js          |   40 ++--
 src/main/java/com/zy/asrs/entity/BasArmMastLog.java               |   21 ++
 src/main/java/com/zy/asrs/controller/BasArmMastController.java    |    1 
 src/main/webapp/static/js/basArmMast/basArmMast.js                |   40 ++--
 9 files changed, 322 insertions(+), 134 deletions(-)

diff --git a/src/main/java/basArmMastSign.sql b/src/main/java/basArmMastSign.sql
index e9900d7..b03e994 100644
--- a/src/main/java/basArmMastSign.sql
+++ b/src/main/java/basArmMastSign.sql
@@ -9,10 +9,29 @@
 insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMastSign#btn-export', '瀵煎嚭', '', '3', '4', '1');
 
 -- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign/basArmMastSign.html', N'basArmMastSign绠＄悊', null, '2', null, '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign/basArmMastSign.html', N'涓嬪彂鍒嗘嫞绾挎暟鎹�', '221', '2', '12', '1');
 
 insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#view', N'鏌ヨ', '', '3', '0', '1');
 insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#btn-add', N'鏂板', '', '3', '1', '1');
 insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#btn-edit', N'缂栬緫', '', '3', '2', '1');
 insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
 insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#btn-export', N'瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver2
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMast/basArmMast.html', N'鏈烘鑷備换鍔＄鐞�', '221', '2', '10', '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#view', N'鏌ヨ', '90602', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-add', N'鏂板', '90602', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-edit', N'缂栬緫', '90602', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-delete', N'鍒犻櫎', '90602', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-export', N'瀵煎嚭', '90602', '3', '4', '1');
+
+-- sqlserver2
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastLog/basArmMastLog.html', N'鏈烘鑷備换鍔″巻鍙�', '221', '2', '11', '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#view', N'鏌ヨ', '90602', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-add', N'鏂板', '90602', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-edit', N'缂栬緫', '90602', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-delete', N'鍒犻櫎', '90602', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-export', N'瀵煎嚭', '90602', '3', '4', '1');
+
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastController.java b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
index 9124c64..a68630b 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
@@ -43,6 +43,7 @@
         convert(param, wrapper);
         allLike(BasArmMast.class, param.keySet(), wrapper, condition);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        wrapper.orderBy("create_time",false);
         return R.ok(basArmMastService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java b/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
index e796aeb..70b977e 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
@@ -43,6 +43,7 @@
         convert(param, wrapper);
         allLike(BasArmMastLog.class, param.keySet(), wrapper, condition);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        wrapper.orderBy("create_time",false);
         return R.ok(basArmMastLogService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMast.java b/src/main/java/com/zy/asrs/entity/BasArmMast.java
index 217acfc..79f3d7b 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -70,16 +70,16 @@
     @ApiModelProperty(value= "鐘舵��")
     private Integer status;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "matnr")
     private String matnr;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "sku")
     private String sku;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "po")
     private String po;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "upc")
     private String upc;
 
     /**
@@ -88,7 +88,7 @@
     @ApiModelProperty(value= "璐ф簮")
     private String supplier;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "璁㈠崟鍙�")
     @TableField("order_no")
     private String orderNo;
 
@@ -180,4 +180,25 @@
 //    );
 
 
+    public String getStatus$() {
+        if (Cools.isEmpty(status)) {return "鏈煡寮傚父";}
+        switch (status){
+            case 0:
+                return "0.绛夊緟涓嬪彂鑷虫満姊拌噦";
+            case 1:
+                return "1.鏈烘鑷備綔涓氫腑";
+            case 2:
+                return "2.鍗曠爜瀹屾垚绛夊緟鎵樼洏瀹屾垚";
+            case 3:
+                return "3.鑷姩缁勬墭涓�";
+            case 4:
+                return "4.鑷姩缁勬墭鎴愬姛";
+            case 5:
+                return "5.绛夊緟鏈烘鑷傝鍗曞畬鎴�";
+            case 6:
+                return "6.瀹岀粨";
+            default:
+                return "鏈煡寮傚父";
+        }
+    }
 }
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMastLog.java b/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
index 6e47448..b4c45c8 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
@@ -188,4 +188,25 @@
 //    );
 
 
+    public String getStatus$() {
+        if (Cools.isEmpty(status)) {return "鏈煡寮傚父";}
+        switch (status){
+            case 0:
+                return "0.绛夊緟涓嬪彂鑷虫満姊拌噦";
+            case 1:
+                return "1.鏈烘鑷備綔涓氫腑";
+            case 2:
+                return "2.鍗曠爜瀹屾垚绛夊緟鎵樼洏瀹屾垚";
+            case 3:
+                return "3.鑷姩缁勬墭涓�";
+            case 4:
+                return "4.鑷姩缁勬墭鎴愬姛";
+            case 5:
+                return "5.绛夊緟鏈烘鑷傝鍗曞畬鎴�";
+            case 6:
+                return "6.瀹岀粨";
+            default:
+                return "鏈煡寮傚父";
+        }
+    }
 }
diff --git a/src/main/webapp/static/js/basArmMast/basArmMast.js b/src/main/webapp/static/js/basArmMast/basArmMast.js
index 5f9cc4d..6a634c1 100644
--- a/src/main/webapp/static/js/basArmMast/basArmMast.js
+++ b/src/main/webapp/static/js/basArmMast/basArmMast.js
@@ -21,25 +21,27 @@
         cellMinWidth: 50,
         height: 'full-120',
         cols: [[
-            {type: 'checkbox'}
-            ,{field: 'id', align: 'center',title: 'ID'}
-            ,{field: 'armNo', align: 'center',title: '鏈烘鑷傜紪鍙�'}
-            ,{field: 'armDirection', align: 'center',title: '鎿嶄綔鏂瑰悜'}
-            ,{field: 'staNo', align: 'center',title: '缁堢偣'}
-            ,{field: 'sortingLine', align: 'center',title: '璧风偣'}
-            ,{field: 'bindingTags', align: 'center',title: '缁戝畾鏍囪'}
-            ,{field: 'priority', align: 'center',title: '浼樺厛绾�'}
-            ,{field: 'status', align: 'center',title: '鐘舵��'}
-            ,{field: 'matnr', align: 'center',title: ''}
-            ,{field: 'sku', align: 'center',title: ''}
-            ,{field: 'po', align: 'center',title: ''}
-            ,{field: 'upc', align: 'center',title: ''}
-            ,{field: 'supplier', align: 'center',title: '璐ф簮'}
-            ,{field: 'orderNo', align: 'center',title: ''}
-            ,{field: 'ctns', align: 'center',title: '绠辨暟'}
-            ,{field: 'createTime', align: 'center',title: '鏃堕棿鎴�'}
-            ,{field: 'armError', align: 'center',title: '寮傚父浠ｇ爜'}
-            ,{field: 'armMsg', align: 'center',title: '寮傚父淇℃伅'}
+            // {type: 'checkbox'}
+            // ,
+            {field: 'id', align: 'center',title: 'ID',hide: true}
+            ,{field: 'armNo', align: 'center',title: '鏈烘鑷傜紪鍙�',hide: false}
+            ,{field: 'orderNo', align: 'center',title: '璁㈠崟鍙�',hide: false}
+            ,{field: 'armDirection', align: 'center',title: '鎿嶄綔鏂瑰悜',hide: true}
+            ,{field: 'staNo', align: 'center',title: '缁堢偣',hide: false}
+            ,{field: 'sortingLine', align: 'center',title: '璧风偣',hide: false}
+            ,{field: 'matnr', align: 'center',title: 'sku',hide: false}
+            ,{field: 'sku', align: 'center',title: 'sku',hide: true}
+            ,{field: 'po', align: 'center',title: 'po',hide: false}
+            ,{field: 'upc', align: 'center',title: 'upc',hide: false}
+            ,{field: 'status', align: 'center',title: '浣滀笟鐘舵��',hide: true}
+            ,{field: 'status$', align: 'center',title: '浣滀笟鐘舵��',hide: false}
+            ,{field: 'bindingTags', align: 'center',title: '鍒嗘嫞缁戝畾鏍囪',hide: false}
+            ,{field: 'priority', align: 'center',title: '浼樺厛绾�',hide: true}
+            ,{field: 'supplier', align: 'center',title: '璐ф簮',hide: false}
+            ,{field: 'ctns', align: 'center',title: '绠辨暟',hide: true}
+            ,{field: 'createTime', align: 'center',title: '鏃堕棿鎴�',hide: true}
+            ,{field: 'armError', align: 'center',title: '寮傚父浠ｇ爜',hide: true}
+            ,{field: 'armMsg', align: 'center',title: '寮傚父淇℃伅',hide: true}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],
diff --git a/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js b/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
index 4daff55..5bc4c6d 100644
--- a/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
+++ b/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
@@ -21,25 +21,27 @@
         cellMinWidth: 50,
         height: 'full-120',
         cols: [[
-            {type: 'checkbox'}
-            ,{field: 'id', align: 'center',title: 'ID'}
-            ,{field: 'armNo', align: 'center',title: '鏈烘鑷傜紪鍙�'}
-            ,{field: 'armDirection', align: 'center',title: '鎿嶄綔鏂瑰悜'}
-            ,{field: 'staNo', align: 'center',title: '缁堢偣'}
-            ,{field: 'sortingLine', align: 'center',title: '璧风偣'}
-            ,{field: 'bindingTags', align: 'center',title: '缁戝畾鏍囪'}
-            ,{field: 'priority', align: 'center',title: '浼樺厛绾�'}
-            ,{field: 'status', align: 'center',title: '鐘舵��'}
-            ,{field: 'matnr', align: 'center',title: ''}
-            ,{field: 'sku', align: 'center',title: ''}
-            ,{field: 'po', align: 'center',title: ''}
-            ,{field: 'upc', align: 'center',title: ''}
-            ,{field: 'supplier', align: 'center',title: '璐ф簮'}
-            ,{field: 'orderNo', align: 'center',title: ''}
-            ,{field: 'ctns', align: 'center',title: '绠辨暟'}
-            ,{field: 'createTime', align: 'center',title: '鏃堕棿鎴�'}
-            ,{field: 'armError', align: 'center',title: '寮傚父浠ｇ爜'}
-            ,{field: 'armMsg', align: 'center',title: '寮傚父淇℃伅'}
+            // {type: 'checkbox'}
+            // ,
+            {field: 'id', align: 'center',title: 'ID',hide: true}
+            ,{field: 'armNo', align: 'center',title: '鏈烘鑷傜紪鍙�',hide: false}
+            ,{field: 'orderNo', align: 'center',title: '璁㈠崟鍙�',hide: false}
+            ,{field: 'armDirection', align: 'center',title: '鎿嶄綔鏂瑰悜',hide: true}
+            ,{field: 'staNo', align: 'center',title: '缁堢偣',hide: false}
+            ,{field: 'sortingLine', align: 'center',title: '璧风偣',hide: false}
+            ,{field: 'matnr', align: 'center',title: 'sku',hide: false}
+            ,{field: 'sku', align: 'center',title: 'sku',hide: true}
+            ,{field: 'po', align: 'center',title: 'po',hide: false}
+            ,{field: 'upc', align: 'center',title: 'upc',hide: false}
+            ,{field: 'status', align: 'center',title: '鐘舵��',hide: true}
+            ,{field: 'status$', align: 'center',title: '鐘舵��',hide: false}
+            ,{field: 'bindingTags', align: 'center',title: '鍒嗘嫞缁戝畾鏍囪',hide: false}
+            ,{field: 'priority', align: 'center',title: '浼樺厛绾�',hide: true}
+            ,{field: 'supplier', align: 'center',title: '璐ф簮',hide: false}
+            ,{field: 'ctns', align: 'center',title: '绠辨暟',hide: true}
+            ,{field: 'createTime', align: 'center',title: '鏃堕棿鎴�',hide: true}
+            ,{field: 'armError', align: 'center',title: '寮傚父浠ｇ爜',hide: true}
+            ,{field: 'armMsg', align: 'center',title: '寮傚父淇℃伅',hide: true}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],
diff --git a/src/main/webapp/views/basArmMast/basArmMast.html b/src/main/webapp/views/basArmMast/basArmMast.html
index 4cffdde..c26209f 100644
--- a/src/main/webapp/views/basArmMast/basArmMast.html
+++ b/src/main/webapp/views/basArmMast/basArmMast.html
@@ -17,21 +17,76 @@
         <div class="layui-card-body">
             <div class="layui-form toolbar" id="search-box">
                 <div class="layui-form-item">
+<!--                    <div class="layui-inline">-->
+<!--                        <div class="layui-input-inline">-->
+<!--                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">-->
+<!--                        </div>-->
+<!--                    </div>-->
                     <div class="layui-inline">
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
-                        </div>
-                    </div>
-                     <div class="layui-inline" style="width: 300px">
-                        <div class="layui-input-inline">
-                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                            <input class="layui-input" type="text" name="arm_no" placeholder="鏈烘鑷傜紪鍙�" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                            <input class="layui-input" type="text" name="order_no" placeholder="璁㈠崟鍙�" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="sta_no" placeholder="缁堢偣銆佺爜鍨涗綅" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="sorting_line" placeholder="璧风偣銆佹媶鍨涗綅" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="status" id="status" class="layui-input" type="text" placeholder="浣滀笟鐘舵��" autocomplete="off">
+<!--                                <option style="display: none"></option>-->
+                                <option value="">浣滀笟鐘舵��</option>
+                                <option value="0">0.绛夊緟涓嬪彂鑷虫満姊拌噦</option>
+                                <option value="1">1.鏈烘鑷備綔涓氫腑</option>
+                                <option value="2">2.鍗曠爜瀹屾垚绛夊緟鎵樼洏瀹屾垚</option>
+                                <option value="3">3.鑷姩缁勬墭涓�</option>
+                                <option value="4">4.鑷姩缁勬墭鎴愬姛</option>
+                                <option value="5">5.绛夊緟鏈烘鑷傚畬鎴愯鍗�</option>
+                                <option value="6">6.瀹岀粨</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="sku" placeholder="sku" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="po" placeholder="po" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="upc" placeholder="upc" autocomplete="off">
+                        </div>
+                    </div>
+<!--                     <div class="layui-inline" style="width: 300px">-->
+<!--                        <div class="layui-input-inline">-->
+<!--                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
+<!--                        </div>-->
+<!--                    </div>-->
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="binding_tags" placeholder="鍒嗘嫞缁戝畾鏍囪" autocomplete="off">
+                        </div>
+                    </div>
+<!--                    <div class="layui-inline">-->
+<!--                        <div class="layui-input-inline">-->
+<!--                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">-->
+<!--                        </div>-->
+<!--                    </div>-->
                     <div class="layui-inline">&emsp;
                         <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储
@@ -72,96 +127,112 @@
         <input name="id" type="hidden">
         <div class="layui-row">
             <div class="layui-col-md12">
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">鏈烘鑷傜紪鍙�: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="armNo" placeholder="璇疯緭鍏ユ満姊拌噦缂栧彿" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">鎿嶄綔鏂瑰悜: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="armDirection" placeholder="璇疯緭鍏ユ搷浣滄柟鍚�" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">缁堢偣: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ粓鐐�" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">璧风偣: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="sortingLine" placeholder="璇疯緭鍏ヨ捣鐐�" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">鏈烘鑷傜紪鍙�: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="armNo" placeholder="璇疯緭鍏ユ満姊拌噦缂栧彿" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">鎿嶄綔鏂瑰悜: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="armDirection" placeholder="璇疯緭鍏ユ搷浣滄柟鍚�" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">缁堢偣: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ粓鐐�" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">璧风偣: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="sortingLine" placeholder="璇疯緭鍏ヨ捣鐐�" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
                 <div class="layui-form-item">
                     <label class="layui-form-label layui-form-required">缁戝畾鏍囪: </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="bindingTags" placeholder="璇疯緭鍏ョ粦瀹氭爣璁�" lay-vertype="tips" lay-verify="required">
+                        <input class="layui-input" name="bindingTags" placeholder="璇疯緭鍏ュ垎鎷ｇ粦瀹氭爣璁�" lay-vertype="tips" lay-verify="required">
                     </div>
                 </div>
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">浼樺厛绾�: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="priority" placeholder="璇疯緭鍏ヤ紭鍏堢骇" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">鐘舵��: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="status" placeholder="璇疯緭鍏ョ姸鎬�" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
+
+                <!-- 宸ヤ綔鐘舵�� -->
                 <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">浼樺厛绾�: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="priority" placeholder="璇疯緭鍏ヤ紭鍏堢骇" lay-vertype="tips" lay-verify="required">
+                    <label class="layui-form-label layui-form-required">鐘舵�侊細</label>
+                    <div class="layui-input-inline">
+                        <select name="status">
+                            <option value="0">0.绛夊緟涓嬪彂鑷虫満姊拌噦</option>
+                            <option value="1">1.鏈烘鑷備綔涓氫腑</option>
+                            <option value="2">2.鍗曠爜瀹屾垚绛夊緟鎵樼洏瀹屾垚</option>
+                            <option value="3">3.鑷姩缁勬墭涓�</option>
+                            <option value="4">4.鑷姩缁勬墭鎴愬姛</option>
+                            <option value="5">5.绛夊緟鏈烘鑷傚畬鎴愯鍗�</option>
+                            <option value="6">6.瀹岀粨</option>
+                        </select>
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">鐘舵��: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="status" placeholder="璇疯緭鍏ョ姸鎬�" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <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 layui-form-required">: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="sku" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="po" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="upc" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
+<!--                <div class="layui-form-item">-->
+<!--                    <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 layui-form-required">: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="sku" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="po" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="upc" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
                 <div class="layui-form-item">
                     <label class="layui-form-label layui-form-required">璐ф簮: </label>
                     <div class="layui-input-block">
                         <input class="layui-input" name="supplier" placeholder="璇疯緭鍏ヨ揣婧�" lay-vertype="tips" lay-verify="required">
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">绠辨暟: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="ctns" placeholder="璇疯緭鍏ョ鏁�" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">鏃堕棿鎴�: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="createTime" placeholder="璇疯緭鍏ユ椂闂存埑" lay-vertype="tips" lay-verify="required">
-                    </div>
-                </div>
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">绠辨暟: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="ctns" placeholder="璇疯緭鍏ョ鏁�" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label layui-form-required">鏃堕棿鎴�: </label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <input class="layui-input" name="createTime" placeholder="璇疯緭鍏ユ椂闂存埑" lay-vertype="tips" lay-verify="required">-->
+<!--                    </div>-->
+<!--                </div>-->
                 <div class="layui-form-item">
                     <label class="layui-form-label">寮傚父浠ｇ爜: </label>
                     <div class="layui-input-block">
diff --git a/src/main/webapp/views/basArmMastLog/basArmMastLog.html b/src/main/webapp/views/basArmMastLog/basArmMastLog.html
index bcd5efc..abae12c 100644
--- a/src/main/webapp/views/basArmMastLog/basArmMastLog.html
+++ b/src/main/webapp/views/basArmMastLog/basArmMastLog.html
@@ -22,14 +22,64 @@
                             <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
                         </div>
                     </div>
-                     <div class="layui-inline" style="width: 300px">
+                    <div class="layui-inline">
                         <div class="layui-input-inline">
-                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                            <input class="layui-input" type="text" name="arm_no" placeholder="鏈烘鑷傜紪鍙�" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                            <input class="layui-input" type="text" name="order_no" placeholder="璁㈠崟鍙�" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="sta_no" placeholder="缁堢偣銆佺爜鍨涗綅" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="sorting_line" placeholder="璧风偣銆佹媶鍨涗綅" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="status" id="status" class="layui-input" type="text" placeholder="浣滀笟鐘舵��" autocomplete="off">
+                                <!--                                <option style="display: none"></option>-->
+                                <option value="">浣滀笟鐘舵��</option>
+                                <option value="0">0.绛夊緟涓嬪彂鑷虫満姊拌噦</option>
+                                <option value="1">1.鏈烘鑷備綔涓氫腑</option>
+                                <option value="2">2.鍗曠爜瀹屾垚绛夊緟鎵樼洏瀹屾垚</option>
+                                <option value="3">3.鑷姩缁勬墭涓�</option>
+                                <option value="4">4.鑷姩缁勬墭鎴愬姛</option>
+                                <option value="5">5.绛夊緟鏈烘鑷傚畬鎴愯鍗�</option>
+                                <option value="6">6.瀹岀粨</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="sku" placeholder="sku" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="po" placeholder="po" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="upc" placeholder="upc" autocomplete="off">
+                        </div>
+                    </div>
+                    <!--                     <div class="layui-inline" style="width: 300px">-->
+                    <!--                        <div class="layui-input-inline">-->
+                    <!--                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
+                    <!--                        </div>-->
+                    <!--                    </div>-->
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="binding_tags" placeholder="鍒嗘嫞缁戝畾鏍囪" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">&emsp;
@@ -49,15 +99,15 @@
 
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
-        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+<!--        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
     </div>
 </script>
 
 <script type="text/html" id="operate">
-    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+<!--    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
+<!--    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
 </script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

--
Gitblit v1.9.1