From b034d508a25aa3e29b14262edcf3f36e1720d381 Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Sat, 22 Oct 2022 13:16:31 +0800
Subject: [PATCH] =?UTF-8?q?PLC=E8=B0=83=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zzjee/md/controller/MdBinController.java   | 18 ++++++++++++++++--
 .../webpage/com/zzjee/md/mdbinagvlist.jsp      |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zzjee/md/controller/MdBinController.java b/src/main/java/com/zzjee/md/controller/MdBinController.java
index 55a8227a..73f30f17 100644
--- a/src/main/java/com/zzjee/md/controller/MdBinController.java
+++ b/src/main/java/com/zzjee/md/controller/MdBinController.java
@@ -356,7 +356,21 @@ public class MdBinController extends BaseController {
                     jsonParts.put("des", resultt.get(i).get("des"));
                     jsonParts.put("tincount", resultt.get(i).get("tincount"));
                     try {
+                        if ("fanxiang".equals(type)) {
+                            try {
+                                int hangshuint = Integer.parseInt(hangshu);
+                                int xnode = Integer.parseInt(resultt.get(i).get("xnode").toString());
 
+                                jsonParts.put("xnode", hangshuint + 1 - xnode);
+                            } catch (Exception e) {
+
+                            }
+
+
+                        } else {
+                            jsonParts.put("xnode", resultt.get(i).get("xnode"));
+
+                        }
 
                         jsonParts.put("xnode", resultt.get(i).get("xnode"));
                         jsonParts.put("ynode", resultt.get(i).get("ynode"));
@@ -407,7 +421,7 @@ public class MdBinController extends BaseController {
         String hxstepNum = "1";
         xstepNum =  Integer.toString(xStep);
         ystepNum =  Integer.toString(yStep);
-           if(y0.equals("1")){
+           if(y0.equals("01")){
                wmsPlcController.run("","runx",xstepNum);
            }else{
                wmsPlcController.run("","runy",ystepNum);
@@ -419,7 +433,7 @@ public class MdBinController extends BaseController {
             wmsPlcController.run("","change",hxstepNum);
         }
 
-        if(y0.equals("1")){
+        if(y0.equals("01")){
             wmsPlcController.run("","runy",ystepNum);
         }else{
             wmsPlcController.run("","runx",xstepNum);
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdbinagvlist.jsp b/src/main/webapp/webpage/com/zzjee/md/mdbinagvlist.jsp
index 02e0a376..b0780008 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdbinagvlist.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdbinagvlist.jsp
@@ -31,7 +31,7 @@
             </span>
             <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 90px;text-align:right;">
           <button onclick="chaxun('zhengxiang')">查询</button>  </span>
-          <button onclick="chaxun('fanxiang')">调度</button>  </span>
+          <button onclick="chaxun('diaodu')">调度</button>  </span>
         </div>