From 99936813d924346e12bf1299a7bdcdbe485ea375 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 12:44:43 +0800
Subject: [PATCH] #v2.0

---
 src/main/java/com/zy/asrs/controller/SiteController.java    |   15 ++++---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |    6 ++-
 src/main/webapp/views/crn.html                              |   27 ++++++-------
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    9 ++--
 src/main/webapp/views/console.html                          |   16 ++++----
 src/main/resources/mapper/WrkMastMapper.xml                 |    2 
 src/main/webapp/static/css/console.css                      |   16 ++++----
 src/main/java/com/zy/core/thread/CrnThread.java             |    2 
 src/main/java/com/zy/core/thread/DevpThread.java            |   10 ++++-
 9 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index ef9a2c0..0cd69e5 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -73,7 +73,7 @@
                 return R.error("鍙d护閿欒");
             }
         }
-        Thread.sleep(2000L);
+        Thread.sleep(200L);
         SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
         return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
     }
@@ -126,7 +126,7 @@
 //            Short totalBay = locMastMapper.selectTotalBay();
 
             vo.setOffset((double) new Random().nextInt(560));     //  鍫嗗灈鏈哄亸绉婚噺
-            vo.setBay(crnProtocol.getBay());    //  褰撳墠鍒�
+            vo.setBay((short) (crnProtocol.getBay() - crn.getOffset()));    //  褰撳墠鍒�
             /**
              * 鍫嗗灈鏈虹姸鎬佸垽鏂�
              */
@@ -134,6 +134,8 @@
                 WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                 if (wrkMast != null) {
                     vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
+                } else {
+                    vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
                 }
             } else {
                 vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 0a5d393..0b606bf 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -68,12 +68,15 @@
             Map<Integer, StaProtocol> station = devpThread.getStation();
 
             for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
-                PlcErrorTableVo vo = new PlcErrorTableVo();
-                vo.setNo(entry.getKey());   //  搴忓彿
-
-                vo.setPlcDesc("");  //  todo:luxiaotao plc閿欒鎻忚堪
-                vo.setError("");    //  todo:luxiaotao 寮傚父淇℃伅
-                list.add(vo);
+                StaProtocol staProtocol = entry.getValue();
+//                if (staProtocol) {
+//                    PlcErrorTableVo vo = new PlcErrorTableVo();
+//                    vo.setNo(entry.getKey());   //  搴忓彿
+//
+//                    vo.setPlcDesc("");  //  todo:luxiaotao plc閿欒鎻忚堪
+//                    vo.setError("");    //  todo:luxiaotao 寮傚父淇℃伅
+//                    list.add(vo);
+//                }
             }
 
         }
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 f1fe7db..08d07d0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -82,7 +82,7 @@
                 StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                 // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
                 if (staProtocol.isAutoing() && staProtocol.isLoading()
-                        && !staProtocol.isEmptyMk() && staProtocol.isInreq1() && staProtocol.getWorkNo()==0
+                        && !staProtocol.isEmptyMk() && staProtocol.getWorkNo() == 0
                         && staProtocol.isPakMk() && !Cools.isEmpty(barcode)) {
                     // 鍒ゆ柇閲嶅宸ヤ綔妗�
                     WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
@@ -441,7 +441,7 @@
                 continue;
             }
             // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
-            if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting().equals("Y")
+            if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
                     && staProtocol.getWorkNo() == 0) {
                 // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
 
@@ -542,8 +542,9 @@
                 if (wrkMast.getWrkSts() == 3 || (wrkMast.getWrkSts() == 12 && wrkMast.getIoType() == 11)){
                     wrkMast.setWrkSts(4L);
                 // 鍑哄簱 + 鎷f枡/鐩樼偣/骞舵澘鍑哄簱涓細12.鍚婅溅鍑哄簱涓� ==> 14.鍑哄簱瀹屾垚
-                } else if (wrkMast.getWrkSts() == 12) {
-                    wrkMast.setWrkSts(14L);
+                    // todo:luxiaotao
+//                } else if (wrkMast.getWrkSts() == 12) {
+//                    wrkMast.setWrkSts(14L);
                 } else  {
                     continue;
                 }
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 8272811..3986acb 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -183,7 +183,7 @@
         // 澶嶄綅淇″彿
         if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
             if (resetFlag) {
-                if (melsecMcNet.Write("D2218", 1).IsSuccess) {
+                if (melsecMcNet.Write("D2218", (short) 1).IsSuccess) {
                     resetFlag = false;
                 }
             }
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 362c164..8bd2a9c 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -245,7 +245,13 @@
         slave.setPort(6000);
         DevpThread devpThread = new DevpThread(slave);
         devpThread.connect();
-        devpThread.read();
+        OperateResult d1021 = devpThread.melsecMcNet.Write("D102", (short) 234);
+        if (d1021.IsSuccess) {
+            System.out.println("success");
+        }
+        OperateResultExOne<Short> d102 = devpThread.melsecMcNet.ReadInt16("D102");
+        System.out.println(d102.Content);
+//        devpThread.read();
         System.out.println("绗竴娆¤");
         // 鍐�
 //        StaProtocol staProtocol = devpThread.getStation().get(1);
@@ -258,7 +264,7 @@
 //        System.out.println("----------------------------------------");
         Thread.sleep(400);
         // 璇�
-        devpThread.read();
+//        devpThread.read();
         System.out.println("绗簩娆¤");
         System.out.println(JSON.toJSONString(devpThread.station));
 
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index a203f45..73f9ebd 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -100,7 +100,7 @@
     </select>
 
     <select id="selectLocMove" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no
+        select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
     </select>
 
 </mapper>
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 9a038bd..a14069d 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -266,37 +266,37 @@
 
 
 /* 鍏ュ簱 */
-.machine-put {
+.machine-put-flag {
     background-color: #90d0f3;
 }
 /* 鍑哄簱 */
-.machine-take {
+.machine-take-flag {
     background-color: yellow;
 }
 /* 搴撳埌搴� */
-.machine-stock-move {
+.machine-stock-move-flag {
     background-color: #0c24fb;
     color: #fff;
 }
 /* 绔欏埌绔� */
-.machine-site-move {
+.machine-site-move-flag {
     background-color: #faa328;
 }
 /* PToP */
-.machine-p-move {
+.machine-p-move-flag {
     background-color: #128014;
     color: #fff;
 }
 /* 寮傚父 */
-.machine-error {
+.machine-error-flag {
     background-color: red;
 }
 /* 鑷姩 */
-.machine-auto {
+.machine-auto-flag {
     background-color: rgb(42,253,47);
 }
 /* 闈炶嚜鍔�/鏀跺埌 */
-.machine-unauto {
+.machine-unauto-flag {
     background-color: #aaaaaa;
 }
 
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index b5f6220..8ab9945 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -51,14 +51,14 @@
             <div class="tips-item">
                 <label>鍫嗗灈鏈虹姸鎬侀鑹�:&nbsp;</label>
                 <div class="item-group">
-                    <span class="machine-put">鍏ュ簱</span>
-                    <span class="machine-take">鍑哄簱</span>
-                    <span class="machine-stock-move">搴撳埌搴�</span>
-                    <span class="machine-site-move">绔欏埌绔�</span>
-                    <span class="machine-p-move">PToP</span>
-                    <span class="machine-error">寮傚父</span>
-                    <span class="machine-auto">鑷姩</span>
-                    <span class="machine-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+                    <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="tips-item">
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 1dc9e5a..699c792 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -39,7 +39,6 @@
             <thead>
                 <tr>
                     <th>鍫嗗灈鏈�</th>
-                    <th>浠诲姟鍙�</th>
                     <th>妯″紡</th>
                     <th>鐘舵��</th>
                     <th>鏈夌墿</th>
@@ -257,19 +256,18 @@
                     for (var i=1;i<=table.length;i++){
                         var tr = tableEl.find("tr").eq(i);
                         setVal(tr.children("td").eq(0), table[i-1].crnNo);
-                        setVal(tr.children("td").eq(1), table[i-1].workNo);
-                        setVal(tr.children("td").eq(2), table[i-1].statusType);
-                        setVal(tr.children("td").eq(3), table[i-1].status);
-                        setVal(tr.children("td").eq(4), table[i-1].loading);
-                        setVal(tr.children("td").eq(5), table[i-1].bay);
-                        setVal(tr.children("td").eq(6), table[i-1].lev);
-                        setVal(tr.children("td").eq(7), table[i-1].xorigin);
-                        setVal(tr.children("td").eq(8), table[i-1].yorigin);
-                        setVal(tr.children("td").eq(9), table[i-1].forkOffset);
-                        setVal(tr.children("td").eq(10), table[i-1].xlocation);
-                        setVal(tr.children("td").eq(11), table[i-1].ylocation);
-                        setVal(tr.children("td").eq(12), table[i-1].stop);
-                        setVal(tr.children("td").eq(13), table[i-1].warnCode);
+                        setVal(tr.children("td").eq(1), table[i-1].statusType);
+                        setVal(tr.children("td").eq(2), table[i-1].status);
+                        setVal(tr.children("td").eq(3), table[i-1].loading);
+                        setVal(tr.children("td").eq(4), table[i-1].bay);
+                        setVal(tr.children("td").eq(5), table[i-1].lev);
+                        setVal(tr.children("td").eq(6), table[i-1].xorigin);
+                        setVal(tr.children("td").eq(7), table[i-1].yorigin);
+                        setVal(tr.children("td").eq(8), table[i-1].forkOffset);
+                        setVal(tr.children("td").eq(9), table[i-1].xlocation);
+                        setVal(tr.children("td").eq(10), table[i-1].ylocation);
+                        setVal(tr.children("td").eq(11), table[i-1].stop);
+                        setVal(tr.children("td").eq(12), table[i-1].warnCode);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -466,7 +464,6 @@
         var html = "";
         for (var i = 0; i < line; i ++){
             html += " <tr>\n" +
-                "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +

--
Gitblit v1.9.1