From 8d3177533e3cc19bc83bd1d2258783e44d082db2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 02 八月 2022 16:43:07 +0800
Subject: [PATCH] Merge branch 'gzynwcs' of http://47.97.1.152:5880/r/zy-wcs into gzynwcs

---
 src/main/webapp/views/console.html       |  598 ++++++++++++++--------------
 src/main/webapp/static/js/console.map.js |  588 +++++-----------------------
 src/main/resources/application.yml       |   10 
 3 files changed, 418 insertions(+), 778 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f288f06..38630e7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
+    url: jdbc:sqlserver://localhost:1433;databasename=gzynasrs
     username: sa
     password: sa@123
   mvc:
@@ -39,16 +39,18 @@
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
-  doubleDeep: true
+  doubleDeep: false
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12,13,16
+  doubleLocs:
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 4
+  groupCount: 2
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
     ip: 10.10.10.10
     port: 8888
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 1c0847e..81100fd 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,214 +1,44 @@
 mapInfo = {
-    "mapName": "HYLYWCS",
-    "rackCount": 12,
-    "crnCount": 3,
-    "stbCount": 16,
+    "mapName": "GZYNWCS",
+    "rackCount": 2,
+    "crnCount": 1,
+    "stbCount": 9,
     "hpPosition": 0,
     "minBayNo": 2,
     "floors": 1,
     "racks": [{
         "type": "rack",
-        "id": "rack12",
-        "top": 484,
-        "left": 430,
-        "width": 1088,
-        "height": 24,
-        "minBayNo": 2,
-        "maxBayNo": 64
-    }, {
-        "type": "rack",
-        "id": "rack11",
-        "top": 458,
-        "left": 430,
-        "width": 1088,
-        "height": 24,
-        "minBayNo": 2,
-        "maxBayNo": 64
-    }, {
-        "type": "rack",
-        "id": "rack10",
-        "top": 399,
-        "left": 430,
-        "width": 1088,
-        "height": 24,
-        "minBayNo": 2,
-        "maxBayNo": 64
-    }, {
-        "type": "rack",
-        "id": "rack9",
-        "top": 373,
-        "left": 430,
-        "width": 1088,
-        "height": 24,
-        "minBayNo": 2,
-        "maxBayNo": 64
-    }, {
-        "type": "rack",
-        "id": "rack8",
-        "top": 344,
-        "left": 430,
-        "width": 1088,
-        "height": 24,
-        "minBayNo": 1,
-        "maxBayNo": 16
-    }, {
-        "type": "rack",
-        "id": "rack7",
-        "top": 318,
-        "left": 430,
-        "width": 1088,
-        "height": 24,
-        "minBayNo": 1,
-        "maxBayNo": 16
-    }, {
-        "type": "rack",
-        "id": "rack6",
-        "top": 263,
-        "left": 430,
-        "width": 1088,
-        "height": 24,
-        "minBayNo": 1,
-        "maxBayNo": 16
-    }, {
-        "type": "rack",
-        "id": "rack5",
-        "top": 237,
-        "left": 430,
-        "width": 1088,
-        "height": 24,
-        "minBayNo": 1,
-        "maxBayNo": 16
-    }, {
-        "type": "rack",
-        "id": "rack3",
-        "top": 180,
-        "left": 430,
-        "width": 1020,
-        "height": 24,
-        "minBayNo": 1,
-        "maxBayNo": 30
-    }, {
-        "type": "rack",
         "id": "rack1",
-        "top": 97,
-        "left": 430,
-        "width": 1020,
+        "top": 168,
+        "left": 463,
+        "width": 826,
         "height": 24,
-        "minBayNo": 1,
-        "maxBayNo": 30
-    }, {
-        "type": "rack",
-        "id": "rack4",
-        "top": 207,
-        "left": 430,
-        "width": 1020,
-        "height": 24,
-        "minBayNo": 1,
-        "maxBayNo": 30
+        "minBayNo": 2,
+        "maxBayNo": 18
     }, {
         "type": "rack",
         "id": "rack2",
-        "top": 123,
-        "left": 430,
-        "width": 1020,
+        "top": 226,
+        "left": 463,
+        "width": 826,
         "height": 24,
-        "minBayNo": 1,
-        "maxBayNo": 30
+        "minBayNo": 2,
+        "maxBayNo": 18
     }],
     "rackDescs": [{
         "type": "rackDescs",
-        "id": "lb_desc12",
-        "text": "#12",
-        "top": 485,
-        "left": 1530,
-        "width": 41,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc11",
-        "text": "#11",
-        "top": 460,
-        "left": 1530,
-        "width": 38,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc10",
-        "text": "#10",
-        "top": 399,
-        "left": 1530,
-        "width": 42,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc9",
-        "text": "#9",
-        "top": 375,
-        "left": 1530,
-        "width": 33,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc8",
-        "text": "#8",
-        "top": 349,
-        "left": 1530,
-        "width": 33,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc7",
-        "text": "#7",
-        "top": 321,
-        "left": 1530,
-        "width": 32,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc6",
-        "text": "#6",
-        "top": 264,
-        "left": 1530,
-        "width": 33,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc5",
-        "text": "#5",
-        "top": 235,
-        "left": 1530,
-        "width": 32,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc4",
-        "text": "#4",
-        "top": 206,
-        "left": 1460,
-        "width": 33,
-        "height": 23
-    }, {
-        "type": "rackDescs",
-        "id": "lb_desc3",
-        "text": "#3",
-        "top": 179,
-        "left": 1460,
-        "width": 32,
-        "height": 23
-    }, {
-        "type": "rackDescs",
         "id": "lb_desc2",
         "text": "#2",
-        "top": 123,
-        "left": 1460,
+        "top": 253,
+        "left": 1246,
         "width": 33,
         "height": 23
     }, {
         "type": "rackDescs",
         "id": "lb_desc1",
         "text": "#1",
-        "top": 95,
-        "left": 1460,
+        "top": 142,
+        "left": 1249,
         "width": 30,
         "height": 23
     }],
@@ -216,300 +46,108 @@
         "type": "crane",
         "id": "crn-1",
         "text": "1",
-        "top": 153,
-        "left": 500,
+        "top": 199,
+        "left": 606,
         "width": 93,
         "height": 22
-    }, {
-        "type": "crane",
-        "id": "crn-2",
-        "text": "2",
-        "top": 291,
-        "left": 500,
-        "width": 93,
-        "height": 22
-    }, {
-        "type": "crane",
-        "id": "crn-3",
-        "text": "3",
-        "top": 428,
-        "left": 500,
-        "width": 93,
-        "height": 22
-    }, {
-        "type": "track",
-        "id": "lb_track2",
-        "text": "",
-        "top": 300,
-        "left": 405,
-        "width": 1130,
-        "height": 2
-    }, {
-        "type": "track",
-        "id": "lb_track3",
-        "text": "",
-        "top": 438,
-        "left": 405,
-        "width": 1130,
-        "height": 2
     }, {
         "type": "track",
         "id": "lb_track1",
         "text": "",
-        "top": 164,
-        "left": 405,
-        "width": 1060,
+        "top": 210,
+        "left": 386,
+        "width": 950,
         "height": 2
     }],
-    "stns": [{
-        "type": "stn",
-        "id": "site-306",
-        "text": "306",
-        "top": 458,
-        "left": 211,
-        "width": 66,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-303",
-        "text": "303",
-        "top": 399,
-        "left": 211,
-        "width": 66,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-304",
-        "text": "304",
-        "top": 458,
-        "left": 345,
-        "width": 66,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-305",
-        "text": "305",
-        "top": 458,
-        "left": 278,
-        "width": 66,
-        "height": 24
-    },{
-        "type": "stn",
-        "id": "site-202",
-        "text": "202",
-        "top": 262,
-        "left": 202,
-        "width": 100,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-302",
-        "text": "302",
-        "top": 399,
-        "left": 278,
-        "width": 66,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-203",
-        "text": "203",
-        "top": 318,
-        "left": 303,
-        "width": 100,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-204",
-        "text": "204",
-        "top": 318,
-        "left": 202,
-        "width": 100,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-201",
-        "text": "201",
-        "top": 262,
-        "left": 303,
-        "width": 100,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-103",
-        "text": "103",
-        "top": 101,
-        "left": 327,
-        "width": 100,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-101",
-        "text": "101",
-        "top": 124,
-        "left": 327,
-        "width": 100,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-301",
-        "text": "301",
-        "top": 399,
-        "left": 345,
-        "width": 66,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-102",
-        "text": "102",
-        "top": 122,
-        "left": 154,
-        "width": 100,
-        "height": 24
-    }, {
-        "type": "stn",
-        "id": "site-104",
-        "text": "104",
-        "top": 181,
-        "left": 225,
-        "width": 100,
-        "height": 24
-    }],
-    "areas": [
-        {
-            "type": "Control_floor",
-            "id": "tabControl_floor1",
-            "text": "妤煎眰",
-            "top": 286,
+    "areas": [{
+        "type": "Control_floor",
+        "id": "tabControl_floor1",
+        "text": "妤煎眰",
+        "top": 65,
+        "left": 100,
+        "width": 1346,
+        "height": 511,
+        "floors": [{
+            "type": "floor",
+            "id": "page_floor1",
+            "text": "1F",
+            "top": 4,
             "left": 22,
-            "width": 302,
-            "height": 403,
-            "floors": [
-                {
-                    "type": "floor",
-                    "id": "page_floor1",
-                    "text": "1F",
-                    "top": 4,
-                    "left": 22,
-                    "width": 276,
-                    "height": 395,
-                    "stns": [
-                        {
-                            "type": "stn",
-                            "id": "site-306",
-                            "text": "306",
-                            "top": 458,
-                            "left": 225,
-                            "width": 66,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-303",
-                            "text": "303",
-                            "top": 399,
-                            "left": 225,
-                            "width": 66,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-304",
-                            "text": "304",
-                            "top": 458,
-                            "left": 360,
-                            "width": 66,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-305",
-                            "text": "305",
-                            "top": 458,
-                            "left": 293,
-                            "width": 66,
-                            "height": 24
-                        },{
-                            "type": "stn",
-                            "id": "site-202",
-                            "text": "202",
-                            "top": 264,
-                            "left": 225,
-                            "width": 100,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-302",
-                            "text": "302",
-                            "top": 399,
-                            "left": 293,
-                            "width": 66,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-203",
-                            "text": "203",
-                            "top": 320,
-                            "left": 327,
-                            "width": 100,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-204",
-                            "text": "204",
-                            "top": 320,
-                            "left": 225,
-                            "width": 100,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-201",
-                            "text": "201",
-                            "top": 264,
-                            "left": 327,
-                            "width": 100,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-103",
-                            "text": "103",
-                            "top": 181,
-                            "left": 327,
-                            "width": 100,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-101",
-                            "text": "101",
-                            "top": 124,
-                            "left": 327,
-                            "width": 100,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-301",
-                            "text": "301",
-                            "top": 399,
-                            "left": 360,
-                            "width": 66,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-102",
-                            "text": "102",
-                            "top": 124,
-                            "left": 225,
-                            "width": 100,
-                            "height": 24
-                        }, {
-                            "type": "stn",
-                            "id": "site-104",
-                            "text": "104",
-                            "top": 181,
-                            "left": 225,
-                            "width": 100,
-                            "height": 24
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-
+            "width": 1320,
+            "height": 503,
+            "stns": [{
+                "type": "stn",
+                "id": "site-109",
+                "text": "109",
+                "top": 99,
+                "left": 1168,
+                "width": 57,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-108",
+                "text": "108",
+                "top": 157,
+                "left": 1168,
+                "width": 118,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-106",
+                "text": "106",
+                "top": 157,
+                "left": 190,
+                "width": 75,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-107",
+                "text": "107",
+                "top": 157,
+                "left": 266,
+                "width": 74,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-105",
+                "text": "105",
+                "top": 157,
+                "left": 114,
+                "width": 75,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-103",
+                "text": "103",
+                "top": 99,
+                "left": 240,
+                "width": 100,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-101",
+                "text": "101",
+                "top": 99,
+                "left": 38,
+                "width": 100,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-102",
+                "text": "102",
+                "top": 99,
+                "left": 139,
+                "width": 100,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-104",
+                "text": "104",
+                "top": 157,
+                "left": 38,
+                "width": 75,
+                "height": 24
+            }]
+        }]
+    }]
 }
\ No newline at end of file
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fde6b24..f7ac512 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -14,318 +14,318 @@
 
 </head>
 <body>
-    <div id="main">
-        <div class="head">
-            <div class="head-left">
-                <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
-                <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
-            </div>
-            <div class="head-right">
-                <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
-            </div>
+<div id="main">
+    <div class="head">
+        <div class="head-left">
+            <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
+            <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
         </div>
-        <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
-        <div class="main-part">
+        <div class="head-right">
+            <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
+        </div>
+    </div>
+    <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
+    <div class="main-part">
 
+    </div>
+    <div id="body">
+        <!-- 鎬诲紑鍏� -->
+        <div class="system-state">
+            <div class="body-head">鎬诲紑鍏�</div>
+            <div class="switch">
+                <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
+                <div class="switch_r">
+                    <p>绯荤粺鐘舵��</p>
+                    <p id="system-run-desc">绯荤粺杩愯涓�</p>
+                </div>
+            </div>
         </div>
-        <div id="body">
-            <!-- 鎬诲紑鍏� -->
-            <div class="system-state">
-                <div class="body-head">鎬诲紑鍏�</div>
-                <div class="switch">
-                    <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
-                    <div class="switch_r">
-                        <p>绯荤粺鐘舵��</p>
-                        <p id="system-run-desc">绯荤粺杩愯涓�</p>
-                    </div>
+        <!-- 鍫嗗灈鏈虹姸鎬� -->
+        <div class="machine-status">
+            <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
+            <div class="state">
+                <span>鍫嗗灈鏈� 1</span>
+                <span class="state-ss machine-put-flag	">鍏ュ簱</span>
+            </div>
+            <div class="state">
+                <span>鍫嗗灈鏈� 2</span>
+                <span class="state-ss machine-auto-flag	">鑷姩</span>
+
+            </div>
+            <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
+            <div class="button item-group">
+                <span class="machine-put-flag">鍏ュ簱</span>
+                <span class="machine-take-flag">鍑哄簱</span>
+                <span class="machine-stock-move-flag">搴撳埌搴�</span>
+                <span class="machine-site-move-flag">绔欏埌绔�</span>
+                <span class="machine-p-move-flag">PToP</span>
+                <span class="machine-error-flag">寮傚父</span>
+                <span class="machine-auto-flag">鑷姩</span>
+                <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
+            </div>
+        </div>
+        <div class="line-status">
+            <div class="body-head">杈撻�佺嚎鐘舵��</div>
+            <div class="state states">
+                <span>杩愯緭绾挎�绘暟</span>
+                <span id="line-total" class="line-ss"></span>
+            </div>
+            <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
+            <div class="button item-group">
+                <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
+                <span class="site-auto-run">鑷姩+鏈夌墿</span>
+                <span class="site-auto-id">鑷姩+ID</span>
+                <span class="site-auto">鑷姩</span>
+                <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+            </div>
+        </div>
+        <div class="bar-code">
+            <div class="body-head" id="code">鏉$爜鎵弿鍣�</div>
+            <div class="tablebox">
+                <div class="table-head">
+                    <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+                </div>
+                <div id="barcode1" class="table-body">
+
+                </div>
+            </div>
+            <div class="tablebox">
+                <div class="table-head">
+                    <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+                </div>
+                <div id="barcode2" class="table-body">
+
+                </div>
+            </div>
+            <div class="tablebox">
+                <div class="table-head">
+                    <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+                </div>
+                <div id="barcode3" class="table-body">
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 鍫嗗灈鏈哄脊绐� -->
+    <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
+        <div id="crnWindow-head">
+            <div class='detailed'></div>
+            <button></button>
+        </div>
+        <form>
+            <!-- 鍫嗗灈鏈哄彿 -->
+            <div class="form-item">
+                <div class="form-item-label" style>
+                    <span>鍫嗗灈鏈哄彿锛�</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="crnNo" value="">
+                </div>
+            </div>
+            <!-- 宸ヤ綔鍙� -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>宸ヤ綔鍙凤細</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="workNo" value="">
+                </div>
+            </div>
+            <!-- 绔欐簮 -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>绔欐簮锛�</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="sourceStaNo" value="">
+                </div>
+            </div>
+            <!-- 鐩爣绔� -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>鐩爣绔欙細</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="staNo" value="">
+                </div>
+            </div>
+            <!-- 宸ヤ綔鐘舵�� -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>宸ヤ綔鐘舵�侊細</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="wrkSts" value="">
+                </div>
+            </div>
+            <!-- 鍑哄叆绫诲瀷 -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>鍑哄叆绫诲瀷锛�</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="ioType" value="">
+                </div>
+            </div>
+            <!-- 婧愬簱浣� -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>婧愬簱浣嶏細</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="sourceLocNo" value="">
+                </div>
+            </div>
+            <!-- 鐩爣搴撲綅 -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>鐩爣搴撲綅锛�</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="locNo" value="">
                 </div>
             </div>
             <!-- 鍫嗗灈鏈虹姸鎬� -->
-            <div class="machine-status">
-                <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
-                <div class="state">
-                    <span>鍫嗗灈鏈� 1</span>
-                    <span class="state-ss machine-put-flag	">鍏ュ簱</span>
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>鍫嗗灈鏈虹姸鎬侊細</span>
                 </div>
-                <div class="state">
-                    <span>鍫嗗灈鏈� 2</span>
-                    <span class="state-ss machine-auto-flag	">鑷姩</span>
-
-                </div>
-                <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
-                <div class="button item-group">
-                    <span class="machine-put-flag">鍏ュ簱</span>
-                    <span class="machine-take-flag">鍑哄簱</span>
-                    <span class="machine-stock-move-flag">搴撳埌搴�</span>
-                    <span class="machine-site-move-flag">绔欏埌绔�</span>
-                    <span class="machine-p-move-flag">PToP</span>
-                    <span class="machine-error-flag">寮傚父</span>
-                    <span class="machine-auto-flag">鑷姩</span>
-                    <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
+                <div class="form-item-input">
+                    <input type="text" name="crnStatus" value="">
                 </div>
             </div>
-            <div class="line-status">
-                <div class="body-head">杈撻�佺嚎鐘舵��</div>
-                <div class="state states">
-                    <span>杩愯緭绾挎�绘暟</span>
-                    <span id="line-total" class="line-ss"></span>
+            <!-- 寮傚父 -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>寮傚父锛�</span>
                 </div>
-                <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
-                <div class="button item-group">
-                    <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
-                    <span class="site-auto-run">鑷姩+鏈夌墿</span>
-                    <span class="site-auto-id">鑷姩+ID</span>
-                    <span class="site-auto">鑷姩</span>
-                    <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+                <div class="form-item-input">
+                    <input type="text" name="error" value="">
                 </div>
             </div>
-            <div class="bar-code">
-                <div class="body-head" id="code">鏉$爜鎵弿鍣�</div>
-                <div class="tablebox">
-                    <div class="table-head">
-                        <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
-                    </div>
-                    <div id="barcode1" class="table-body">
-
-                    </div>
-                </div>
-                <div class="tablebox">
-                    <div class="table-head">
-                        <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
-                    </div>
-                    <div id="barcode2" class="table-body">
-
-                    </div>
-                </div>
-                <div class="tablebox">
-                    <div class="table-head">
-                        <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
-                    </div>
-                    <div id="barcode3" class="table-body">
-
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!-- 鍫嗗灈鏈哄脊绐� -->
-        <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
-            <div id="crnWindow-head">
-                <div class='detailed'></div>
-                <button></button>
-            </div>
-            <form>
-                <!-- 鍫嗗灈鏈哄彿 -->
-                <div class="form-item">
-                    <div class="form-item-label" style>
-                        <span>鍫嗗灈鏈哄彿锛�</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="crnNo" value="">
-                    </div>
-                </div>
-                <!-- 宸ヤ綔鍙� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>宸ヤ綔鍙凤細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="workNo" value="">
-                    </div>
-                </div>
-                <!-- 绔欐簮 -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>绔欐簮锛�</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="sourceStaNo" value="">
-                    </div>
-                </div>
-                <!-- 鐩爣绔� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>鐩爣绔欙細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="staNo" value="">
-                    </div>
-                </div>
-                <!-- 宸ヤ綔鐘舵�� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>宸ヤ綔鐘舵�侊細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="wrkSts" value="">
-                    </div>
-                </div>
-                <!-- 鍑哄叆绫诲瀷 -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>鍑哄叆绫诲瀷锛�</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="ioType" value="">
-                    </div>
-                </div>
-                <!-- 婧愬簱浣� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>婧愬簱浣嶏細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="sourceLocNo" value="">
-                    </div>
-                </div>
-                <!-- 鐩爣搴撲綅 -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>鐩爣搴撲綅锛�</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="locNo" value="">
-                    </div>
-                </div>
-                <!-- 鍫嗗灈鏈虹姸鎬� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>鍫嗗灈鏈虹姸鎬侊細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="crnStatus" value="">
-                    </div>
-                </div>
-                <!-- 寮傚父 -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>寮傚父锛�</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="error" value="">
-                    </div>
-                </div>
-            </form>
-        </div>
-        <!-- 杈撻�佽澶囧脊绐� -->
-        <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
-            <!-- 琛ㄥご -->
-            <div id="siteWindow-head">
-                <div class='detailed'></div>
-                <button></button>
-            </div>
-            <form>
-                <!-- 璁惧鍙� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>璁惧鍙凤細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="siteId" value="">
-                    </div>
-                </div>
-                <!-- 宸ヤ綔鍙� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>宸ヤ綔鍙凤細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="workNo" value="">
-                    </div>
-                </div>
-                <!-- 宸ヤ綔鐘舵�� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>宸ヤ綔鐘舵�侊細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="wrkSts" value="">
-                    </div>
-                </div>
-                <!-- 鑷姩 -->
-                <div class="form-item-checkbox">
-                    <div class="form-item-label-checkbox">
-                        <span>鑷姩</span>
-                    </div>
-                    <div class="form-item-input-checkbox">
-                        <input type="checkbox" name="autoing">
-                    </div>
-                </div>
-                <!-- 鏈夌墿 -->
-                <div class="form-item-checkbox">
-                    <div class="form-item-label-checkbox">
-                        <span>鏈夌墿</span>
-                    </div>
-                    <div class="form-item-input-checkbox">
-                        <input type="checkbox" name="loading">
-                    </div>
-                </div>
-                <!-- 鑳藉叆 -->
-                <div class="form-item-checkbox">
-                    <div class="form-item-label-checkbox">
-                        <span>鑳藉叆</span>
-                    </div>
-                    <div class="form-item-input-checkbox">
-                        <input type="checkbox" name="canining">
-                    </div>
-                </div>
-                <!-- 鑳藉嚭 -->
-                <div class="form-item-checkbox">
-                    <div class="form-item-label-checkbox">
-                        <span>鑳藉嚭</span>
-                    </div>
-                    <div class="form-item-input-checkbox">
-                        <input type="checkbox" name="canouting">
-                    </div>
-                </div>
-                <!-- 鍑哄叆绫诲瀷 -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>鍑哄叆绫诲瀷锛�</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="ioType" value="">
-                    </div>
-                </div>
-                <!-- 婧愮珯 -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>婧愮珯锛�</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="sourceStaNo" value="">
-                    </div>
-                </div>
-                <!-- 鐩爣绔� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>鐩爣绔欙細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="staNo" value="">
-                    </div>
-                </div>
-                <!-- 婧愬簱浣� -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>婧愬簱浣嶏細</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="sourceLocNo" value="">
-                    </div>
-                </div>
-                <!-- 鐩爣搴撲綅 -->
-                <div class="form-item">
-                    <div class="form-item-label">
-                        <span>鐩爣搴撲綅锛�</span>
-                    </div>
-                    <div class="form-item-input">
-                        <input type="text" name="locNo" value="">
-                    </div>
-                </div>
-
-            </form>
-        </div>
+        </form>
     </div>
+    <!-- 杈撻�佽澶囧脊绐� -->
+    <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
+        <!-- 琛ㄥご -->
+        <div id="siteWindow-head">
+            <div class='detailed'></div>
+            <button></button>
+        </div>
+        <form>
+            <!-- 璁惧鍙� -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>璁惧鍙凤細</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="siteId" value="">
+                </div>
+            </div>
+            <!-- 宸ヤ綔鍙� -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>宸ヤ綔鍙凤細</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="workNo" value="">
+                </div>
+            </div>
+            <!-- 宸ヤ綔鐘舵�� -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>宸ヤ綔鐘舵�侊細</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="wrkSts" value="">
+                </div>
+            </div>
+            <!-- 鑷姩 -->
+            <div class="form-item-checkbox">
+                <div class="form-item-label-checkbox">
+                    <span>鑷姩</span>
+                </div>
+                <div class="form-item-input-checkbox">
+                    <input type="checkbox" name="autoing">
+                </div>
+            </div>
+            <!-- 鏈夌墿 -->
+            <div class="form-item-checkbox">
+                <div class="form-item-label-checkbox">
+                    <span>鏈夌墿</span>
+                </div>
+                <div class="form-item-input-checkbox">
+                    <input type="checkbox" name="loading">
+                </div>
+            </div>
+            <!-- 鑳藉叆 -->
+            <div class="form-item-checkbox">
+                <div class="form-item-label-checkbox">
+                    <span>鑳藉叆</span>
+                </div>
+                <div class="form-item-input-checkbox">
+                    <input type="checkbox" name="canining">
+                </div>
+            </div>
+            <!-- 鑳藉嚭 -->
+            <div class="form-item-checkbox">
+                <div class="form-item-label-checkbox">
+                    <span>鑳藉嚭</span>
+                </div>
+                <div class="form-item-input-checkbox">
+                    <input type="checkbox" name="canouting">
+                </div>
+            </div>
+            <!-- 鍑哄叆绫诲瀷 -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>鍑哄叆绫诲瀷锛�</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="ioType" value="">
+                </div>
+            </div>
+            <!-- 婧愮珯 -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>婧愮珯锛�</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="sourceStaNo" value="">
+                </div>
+            </div>
+            <!-- 鐩爣绔� -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>鐩爣绔欙細</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="staNo" value="">
+                </div>
+            </div>
+            <!-- 婧愬簱浣� -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>婧愬簱浣嶏細</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="sourceLocNo" value="">
+                </div>
+            </div>
+            <!-- 鐩爣搴撲綅 -->
+            <div class="form-item">
+                <div class="form-item-label">
+                    <span>鐩爣搴撲綅锛�</span>
+                </div>
+                <div class="form-item-input">
+                    <input type="text" name="locNo" value="">
+                </div>
+            </div>
+
+        </form>
+    </div>
+</div>
 
 </body>
 

--
Gitblit v1.9.1