From 52e8041a8e229aac4e9200e13060083f99cec6cb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 25 八月 2020 14:31:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    1 
 src/main/webapp/views/console.html                          |  179 +++++++++++++++++++++++++++++++++--
 src/main/webapp/static/css/console.css                      |   52 +++------
 src/main/java/com/zy/common/service/CommonService.java      |    9 +
 4 files changed, 193 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 1b76bc0..5487306 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -10,6 +10,7 @@
 import com.zy.asrs.mapper.WrkMastMapper;
 import com.zy.asrs.service.*;
 import com.zy.common.model.StartupDto;
+import com.zy.common.service.CommonService;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.*;
diff --git a/src/main/java/com/zy/asrs/service/impl/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
similarity index 96%
rename from src/main/java/com/zy/asrs/service/impl/CommonService.java
rename to src/main/java/com/zy/common/service/CommonService.java
index 48ab58c..d1e5681 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.service.impl;
+package com.zy.common.service;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -89,6 +89,13 @@
      * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
      */
     public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
+        if (sourceStaNo == 3) {
+            whsType = 1;
+        } else if (sourceStaNo == 7) {
+            whsType = 2;
+        } else {
+            throw new CoolException("鏃犳晥鍏ュ簱绔�");
+        }
         StartupDto startupDto = new StartupDto();
         RowLastno rowLastno = rowLastnoService.selectById(whsType);
         if (Cools.isEmpty(rowLastno)) {
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 8ca258a..fac613f 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -118,7 +118,7 @@
 }
 /* 杈撻�佺嚎绗竴鍒� */
 .site-row-1 {
-    left: 200px;
+    left: 100px;
 }
 .site-row-1 .site {
     width: 100px;
@@ -162,40 +162,15 @@
     background-color: yellow;
 }
 
-/* ------------------ 鍙拌溅 ------------------ */
-/* 杞ㄩ亾 */
-.car-track {
-    position: absolute;
-    background: url(../image/bg.jpg);
-}
-#car-track-1 {
-    top: 122px;
-    left: 100px;
-    width: 100px;
-    height: 200px;
-}
-
-/* 杞� */
-.car {
-    position: absolute;
-}
-#site-8 {
-    top: 122px;
-    left: 100px;
-    width: 100px;
-    height: 40px;
-    line-height: 40px
-}
-
 
 /* ------------------ 璐ф灦鎬绘垚 ------------------ */
 .main-part {
     position: absolute;
     top: 100px;
-    left: 300px;
+    left: 200px;
 }
 .main-part .lane {
-    margin-bottom: 30px;
+    /*margin-bottom: 30px;*/
 }
 /* 鎺掑彿 */
 .row-no {
@@ -343,9 +318,9 @@
 
 /* 鍏ュ簱鍙� */
 .cargo-put {
-    transform: rotateY(180deg);
-    top: 285px;
-    left: 313px;
+    /*transform: rotateY(180deg);*/
+    top: 160px;
+    left: 43px;
     position: absolute;
     width: 50px;
     height: 40px;
@@ -373,8 +348,8 @@
 }
 /* 鎵爜鍣�1 */
 #code-decoder-1 {
-    top: 320px;
-    left: 200px;
+    top: 144px;
+    left: 100px;
 }
 /* 鎵爜鍣ㄦ暟鎹�1 */
 #code-decoder-data-1 {
@@ -382,6 +357,17 @@
     margin-left: 35px;
 }
 
+/* 鎵爜鍣�1 */
+#code-decoder-2 {
+    top: 204px;
+    left: 100px;
+}
+/* 鎵爜鍣ㄦ暟鎹�1 */
+#code-decoder-data-2 {
+    font-size: xx-small;
+    margin-left: 35px;
+}
+
 /* 寮圭獥 */
 form .form-item {
     display: inline-block;
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fd024c3..6b1f177 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -84,22 +84,20 @@
         <span id="code-decoder-data-1" class="code-decoder-data">0</span>
     </div>
 
+    <!-- 鎵爜鍣� -->
+    <div id="code-decoder-2" class="code-decoder">
+        <span id="code-decoder-data-2" class="code-decoder-data">0</span>
+    </div>
+
 
     <!----------- 宸﹁緭閫佺嚎 ---------->
 
-    <!-- 鍙拌溅杞ㄩ亾 -->
-    <div id="car-track-1" class="car-track"></div>
-
-    <!-- 鍙拌溅瀹炰緥 -->
-    <div id="site-8" class="site car">8</div>
-
     <!-- 绗竴鍒楋紙瀹藉害 100px锛� -->
     <div class="site-row site-row-1">
-        <div id="site-7" class="site" style="height: 40px;line-height: 40px">7</div>
-        <div id="site-4" class="site" style="height: 40px;line-height: 40px">4</div>
-        <div id="site-3" class="site" style="height: 40px;line-height: 40px;">3</div>
-        <div id="site-2" class="site" style="height: 40px;line-height: 40px">2</div>
-        <div id="site-1" class="site" style="height: 40px;line-height: 40px">1</div>
+        <div id="site-1" class="site" style="height: 20px;line-height: 20px;">1</div>
+        <div id="site-3" class="site" style="height: 20px;line-height: 20px; margin-top: 20px">3</div>
+        <div id="site-5" class="site" style="height: 20px;line-height: 20px; margin-top: 0px">5</div>
+        <div id="site-7" class="site" style="height: 20px;line-height: 20px; margin-top: 20px">7</div>
     </div>
 
     <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
@@ -107,6 +105,125 @@
         <!--绗竴鎺�-->
         <div class="lane">
             <span class="row-no">1#</span>
+            <!-- 璐ф灦 -->
+            <div class="stock-group">
+                <div id="site-2" class="site" style="">2</div>
+                <button class="item">1</button>
+                <button class="item">2</button>
+                <button class="item">3</button>
+                <button class="item">4</button>
+                <button class="item">5</button>
+                <button class="item">6</button>
+                <button class="item">7</button>
+                <button class="item">8</button>
+                <button class="item">9</button>
+                <button class="item">10</button>
+                <button class="item">11</button>
+                <button class="item">12</button>
+                <button class="item">13</button>
+                <button class="item">14</button>
+                <button class="item">15</button>
+                <button class="item">16</button>
+                <button class="item">17</button>
+                <button class="item">18</button>
+                <button class="item">19</button>
+                <button class="item">20</button>
+                <button class="item">21</button>
+                <button class="item">22</button>
+                <button class="item">23</button>
+                <button class="item">24</button>
+                <button class="item">25</button>
+                <button class="item">26</button>
+                <button class="item">27</button>
+                <button class="item">28</button>
+                <button class="item">29</button>
+                <button class="item">30</button>
+                <button class="item">31</button>
+                <button class="item">32</button>
+                <button class="item">33</button>
+                <button class="item">34</button>
+                <button class="item">35</button>
+                <button class="item">36</button>
+                <button class="item">37</button>
+                <button class="item">38</button>
+                <button class="item">39</button>
+                <button class="item">40</button>
+                <button class="item">41</button>
+                <button class="item">42</button>
+                <button class="item">43</button>
+                <button class="item">44</button>
+                <button class="item">45</button>
+                <button class="item">46</button>
+                <button class="item">47</button>
+                <button class="item">48</button>
+                <button class="item">49</button>
+                <button class="item">50</button>
+                <button class="item">51</button>
+                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+            </div>
+            <!-- 鍫嗗灈鏈� -->
+            <div class="crn">
+                <hr class="pathway">
+                <div id="crn-1" class="machine"></div>
+            </div>
+            <!-- 璐ф灦 -->
+            <div class="stock-group">
+                <div id="site-4" class="site" style="">4</div>
+                <button class="item">1</button>
+                <button class="item">2</button>
+                <button class="item">3</button>
+                <button class="item">4</button>
+                <button class="item">5</button>
+                <button class="item">6</button>
+                <button class="item">7</button>
+                <button class="item">8</button>
+                <button class="item">9</button>
+                <button class="item">10</button>
+                <button class="item">11</button>
+                <button class="item">12</button>
+                <button class="item">13</button>
+                <button class="item">14</button>
+                <button class="item">15</button>
+                <button class="item">16</button>
+                <button class="item">17</button>
+                <button class="item">18</button>
+                <button class="item">19</button>
+                <button class="item">20</button>
+                <button class="item">21</button>
+                <button class="item">22</button>
+                <button class="item">23</button>
+                <button class="item">24</button>
+                <button class="item">25</button>
+                <button class="item">26</button>
+                <button class="item">27</button>
+                <button class="item">28</button>
+                <button class="item">29</button>
+                <button class="item">30</button>
+                <button class="item">31</button>
+                <button class="item">32</button>
+                <button class="item">33</button>
+                <button class="item">34</button>
+                <button class="item">35</button>
+                <button class="item">36</button>
+                <button class="item">37</button>
+                <button class="item">38</button>
+                <button class="item">39</button>
+                <button class="item">40</button>
+                <button class="item">41</button>
+                <button class="item">42</button>
+                <button class="item">43</button>
+                <button class="item">44</button>
+                <button class="item">45</button>
+                <button class="item">46</button>
+                <button class="item">47</button>
+                <button class="item">48</button>
+                <button class="item">49</button>
+                <button class="item">50</button>
+                <button class="item">51</button>
+                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+            </div>
+        </div>
+        <div class="lane">
             <!-- 璐ф灦 -->
             <div class="stock-group">
                 <div id="site-6" class="site" style="">6</div>
@@ -144,16 +261,33 @@
                 <button class="item">32</button>
                 <button class="item">33</button>
                 <button class="item">34</button>
+                <button class="item">35</button>
+                <button class="item">36</button>
+                <button class="item">37</button>
+                <button class="item">38</button>
+                <button class="item">39</button>
+                <button class="item">40</button>
+                <button class="item">41</button>
+                <button class="item">42</button>
+                <button class="item">43</button>
+                <button class="item">44</button>
+                <button class="item">45</button>
+                <button class="item">46</button>
+                <button class="item">47</button>
+                <button class="item">48</button>
+                <button class="item">49</button>
+                <button class="item">50</button>
+                <button class="item">51</button>
                 <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             </div>
             <!-- 鍫嗗灈鏈� -->
             <div class="crn">
                 <hr class="pathway">
-                <div id="crn-1" class="machine"></div>
+                <div id="crn-2" class="machine"></div>
             </div>
             <!-- 璐ф灦 -->
             <div class="stock-group">
-                <div id="site-5" class="site" style="">5</div>
+                <div id="site-8" class="site" style="">8</div>
                 <button class="item">1</button>
                 <button class="item">2</button>
                 <button class="item">3</button>
@@ -188,9 +322,26 @@
                 <button class="item">32</button>
                 <button class="item">33</button>
                 <button class="item">34</button>
+                <button class="item">35</button>
+                <button class="item">36</button>
+                <button class="item">37</button>
+                <button class="item">38</button>
+                <button class="item">39</button>
+                <button class="item">40</button>
+                <button class="item">41</button>
+                <button class="item">42</button>
+                <button class="item">43</button>
+                <button class="item">44</button>
+                <button class="item">45</button>
+                <button class="item">46</button>
+                <button class="item">47</button>
+                <button class="item">48</button>
+                <button class="item">49</button>
+                <button class="item">50</button>
+                <button class="item">51</button>
                 <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             </div>
-            <span class="row-no">2#</span>
+            <span class="row-no">4#</span>
         </div>
     </div>
 </main>

--
Gitblit v1.9.1