From d592e47bb0aad0327ff1a3cecbe017783b50a6ea Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 20 十二月 2025 09:15:00 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java       |    8 
 src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java      |    2 
 src/main/webapp/static/js/basArmMastExp/basArmMastExp.js                |  265 ++++++++++++++++++++++++++
 src/main/webapp/views/basArmMastExp/basArmMastExp.html                  |  270 +++++++++++++++++++++++++++
 src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java             |   14 
 src/main/resources/application.yml                                      |    4 
 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java |    2 
 7 files changed, 550 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
index ea3f25d..88eba6e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -65,7 +65,7 @@
                         if(wrkMast.getIoType() == 57 || wrkMast.getIoType() == 53){
                             switch (wrkMast.getCrnNo()) {
                                 case 1:
-                                    if (wrkMast.getSourceStaNo() < 2000) {
+                                    if (wrkMast.getStaNo() < 2000) {
                                         wrkMastSta1.setStaEnd(1004);
                                         break;
                                     } else {
@@ -73,7 +73,7 @@
                                         break;
                                     }
                                 case 2:
-                                    if (wrkMast.getSourceStaNo() < 2000) {
+                                    if (wrkMast.getStaNo() < 2000) {
                                         wrkMastSta1.setStaEnd(1014);
                                         break;
                                     } else {
@@ -81,7 +81,7 @@
                                         break;
                                     }
                                 case 4:
-                                    if (wrkMast.getSourceStaNo() < 2000) {
+                                    if (wrkMast.getStaNo() < 2000) {
                                         wrkMastSta1.setStaEnd(1028);
                                         break;
                                     } else {
@@ -89,7 +89,7 @@
                                         break;
                                     }
                                 case 5:
-                                    if (wrkMast.getSourceStaNo() < 2000) {
+                                    if (wrkMast.getStaNo() < 2000) {
                                         wrkMastSta1.setStaEnd(1035);
                                         break;
                                     } else {
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index 69a6144..144dd31 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -44,7 +44,7 @@
             List<Order> orders = orderService.selectComplete();
             if(orders.size() > 0){
                 for (Order order : orders) {
-                    if(order.getDocType() == 3 || order.getDocType() == 16 || order.getDocType() == 18 || order.getDocType() == 19){ //璧版柊澧炴彁浜ゅ鏍告祦绋�
+                    if(order.getDocType() == 3 || order.getDocType() == 16){ //璧版柊澧炴彁浜ゅ鏍告祦绋�
                         ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
                         if (!result.isSuccess()) {
                             log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index be3ece9..a64f5fc 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -174,7 +174,7 @@
                     jsonObject.put("modify_starttime",  latestUpdateTime);//涓氬姟璧峰鏃ユ湡
                     jsonObject.put("billstatus",  "B");//鍗曟嵁鐘舵��
                     jsonObject.put("modify_endtime",  sdf1.format(now));//涓氬姟璧峰鏃ユ湡
-                    jsonObject.put("billtype_number",  "im_SalOutBill_STD_BT_S_R");//鍗曟嵁绫诲瀷   閫�璐х被鍨嬪緟瀹�
+                    jsonObject.put("billtype_number",  "im_SalOutBill_STD_BT_S_R");//鍗曟嵁绫诲瀷
                     break;
                 case "PRD_PickMtrl"://鐢熶骇棰嗘枡鍗�
                     path = imMdcMftproorder;
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index 1fde2e6..efb0982 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -3,16 +3,16 @@
 public enum KingDeeUtilType {
     BD_MATERIAL(0, "鐗╂枡妗f","BD_MATERIAL","","","",1),
     BD_RRGANIZATION(2, "渚涘簲鍟�","BD_RRGANIZATION","","","",1),
-//    PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
-//    SAL_OUTSTOCK(7, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",0),
+    PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
+    SAL_OUTSTOCK(7, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",0),
 //    STK_MisDelivery(19, "鍏朵粬鍑哄簱鍗�","STK_MisDelivery","FQty","","",0),
 //    STK_MISCELLANEOUS(18, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS","FQty","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1),
 
-//    SAL_RETURNSTOCK(9, "閿�鍞��璐у崟","SAL_RETURNSTOCK","FRealQty","","",1),
-//    PRD_PickMtrl(10, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","","","",0),
-    PRD_ReturnMtrl(12, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","FQty","","",1),
-//    PRD_FeedMtrl(14, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","FActualQty","","",0),
-//    PRD_MORPT(16, "鐢熶骇姹囨姤鍗�","PRD_MORPT","FFinishQty","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1),
+    SAL_RETURNSTOCK(9, "閿�鍞��璐у崟","SAL_RETURNSTOCK","","","",1),
+    PRD_PickMtrl(10, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","","","",0),
+    PRD_ReturnMtrl(12, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","","","",1),
+    PRD_FeedMtrl(14, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","","","",0),
+    PRD_MORPT(16, "鐢熶骇姹囨姤鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","",1),
 //    STK_InspectionForm(20, "浜у搧妫�楠屽崟","STK_InspectionForm","","","",0),
 
     //    PUR_MRB(2, "閲囪喘閫�鏂欏崟","PUR_MRB","FRMREALQTY","","",1),
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1056e2d..6be88d0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8888
+  port: 8081
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -98,7 +98,7 @@
     #鐧诲綍鎺ュ彛寮�鍏�
     LoginAuthenticationSwitch: true
     #涓婃姤銆佸鏍稿崟鎹紑鍏�
-    ReviewOrderSwitch: false
+    ReviewOrderSwitch: true
   #  鍦板潃
   address:
     URL: https://shyucheng.test.kdgalaxy.com
diff --git a/src/main/webapp/static/js/basArmMastExp/basArmMastExp.js b/src/main/webapp/static/js/basArmMastExp/basArmMastExp.js
new file mode 100644
index 0000000..d7db239
--- /dev/null
+++ b/src/main/webapp/static/js/basArmMastExp/basArmMastExp.js
@@ -0,0 +1,265 @@
+var pageCurr;
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#basArmMast',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/basArmMast/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {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: '鍟嗗搧缂栧彿',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: 'barcode', align: 'center',title: '鎵樼洏鐮�',hide: false}
+            // ,{field: 'armError', align: 'center',title: '寮傚父浠g爜',hide: true}
+            // ,{field: 'armMsg', align: 'center',title: '寮傚父淇℃伅',hide: true}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(basArmMast)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(basArmMast)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               del(checkStatus.map(function (d) {
+                   return d.id;
+               }));
+               break;
+            case 'exportData':
+                admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'basArmMast': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/basArmMast/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(basArmMast)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.id]);
+                break;
+        }
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                layDateRender(mData);
+                form.val('detail', mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/basArmMast/"+(mData?'update':'add')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/basArmMast/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender(data) {
+        setTimeout(function () {
+            layDate.render({
+                elem: '.layui-laydate-range'
+                ,type: 'datetime'
+                ,range: true
+            });
+
+        }, 300);
+    }
+    layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    tableIns.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+     });
+}
diff --git a/src/main/webapp/views/basArmMastExp/basArmMastExp.html b/src/main/webapp/views/basArmMastExp/basArmMastExp.html
new file mode 100644
index 0000000..cbf4533
--- /dev/null
+++ b/src/main/webapp/views/basArmMastExp/basArmMastExp.html
@@ -0,0 +1,270 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <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="arm_no" placeholder="鏈烘鑷傜紪鍙�" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <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="barcode" 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>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="basArmMast" lay-filter="basArmMast"></table>
+        </div>
+    </div>
+</div>
+
+<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-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>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/basArmMast/basArmMast.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+        <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="bindingTags" placeholder="璇疯緭鍏ュ垎鎷g粦瀹氭爣璁�" 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-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="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="barcode" placeholder="璇疯緭鍏ユ墭鐩樼爜" lay-vertype="tips" lay-verify="required">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">寮傚父浠g爜: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="armError" placeholder="璇疯緭鍏ュ紓甯镐唬鐮�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">寮傚父淇℃伅: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="armMsg" placeholder="璇疯緭鍏ュ紓甯镐俊鎭�">
+                    </div>
+                </div>
+
+             </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </form>
+</script>
+</html>
+

--
Gitblit v1.9.1