From 7ef5eefdd323227effb58c00c6748bbaa1bcc96f Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Sat, 19 Nov 2022 15:49:01 +0800
Subject: [PATCH] AGV

---
 .../zzjee/md/controller/MdBinController.java  |  6 +-
 .../webpage/com/zzjee/md/mdbinagvlist.jsp     | 79 +++++++++++++------
 2 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/zzjee/md/controller/MdBinController.java b/src/main/java/com/zzjee/md/controller/MdBinController.java
index 0f5352e5..1dc0f002 100644
--- a/src/main/java/com/zzjee/md/controller/MdBinController.java
+++ b/src/main/java/com/zzjee/md/controller/MdBinController.java
@@ -424,7 +424,7 @@ public class MdBinController extends BaseController {
         String hxstepNum = "1";
         xstepNum =  Integer.toString(xStep);
         ystepNum =  Integer.toString(yStep);
-        if(!"no".equals(startcom)){
+        if(!"no".equals(startcom)&&StringUtil.isNotEmpty(startcom)){
             hxstepNum = "1";
             System.out.println("startcom,startcom:"+startcom);
             wmsPlcController.run("",startcom,hxstepNum);
@@ -447,7 +447,7 @@ public class MdBinController extends BaseController {
 //
 //            wmsPlcController.run("","change",hxstepNum);
 //        }
-        if(!"no".equals(midcom)){
+        if(!"no".equals(midcom)&&StringUtil.isNotEmpty(midcom)){
             hxstepNum = "1";
             System.out.println("midcom,midcom:"+midcom);
             wmsPlcController.run("",midcom,hxstepNum);
@@ -461,7 +461,7 @@ public class MdBinController extends BaseController {
 
             wmsPlcController.run("","runx",xstepNum);
         }
-        if(!"no".equals(endcom)){
+        if(!"no".equals(endcom)&&StringUtil.isNotEmpty(endcom)){
             hxstepNum = "1";
             System.out.println("endcom,endcom:"+endcom);
             wmsPlcController.run("",endcom,hxstepNum);
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdbinagvlist.jsp b/src/main/webapp/webpage/com/zzjee/md/mdbinagvlist.jsp
index 1e2d2ba4..63584a15 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdbinagvlist.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdbinagvlist.jsp
@@ -3,13 +3,27 @@
 <t:base type="jquery,easyui,tools,DatePicker"></t:base>
 <div class="easyui-layout" fit="true">
     <div style="padding:0px;border:0px">
-<%--        <div style="margin-left:100px"> 桃红色标识此储位有货，淡绿色标识此储位为空</div>--%>
-        <div name="searchColums" style="float: left; padding-left: 0px;padding-top: 5px;">
-            <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 50px;text-align:right;"
-                  title="仓库">仓库: </span>
-            <input type="text" name="cangku" value="agv"  style="width: 50px; height: 30px;">
+        <div style="float: left; padding-left: 0px;padding-top: 5px;">
+             <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 55px;text-align:left;"
+                   title="仓库">仓库: </span>
+            <input type="text" name="cangku" value="agv"  style="width: 55px; height: 30px;">
+            </span>
+            <span  style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 55px;text-align:right;"
+                                                  title="层数">层数: </span>
+            <input type="text" name="cengshu" value="01" style="width: 55px; height: 30px;">
             </span>
             <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 55px;text-align:right;"
+                  title="行数">行数: </span>
+            <input type="text" name="hangshu" value="03" style="width: 55px; height: 30px;">
+            </span>
+            <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 55px;text-align:right;"
+                  title="列数">列数: </span>
+            <input type="text" name="lieshu"  value="03"  style="width: 55px; height: 30px;">
+            </span>
+        </div>
+        <div name="searchColums" style="float: left; padding-left: 0px;padding-top: 5px;">
+
+            <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 55px;text-align:left;"
                   title="开始">开始: </span>
             <input type="text" id = "chuweiid" name="chuwei" style="width: 55px; height: 30px;">
             </span>
@@ -17,35 +31,31 @@
                   title="结束">结束: </span>
             <input type="text" id = "desid" name="des" style="width: 55px; height: 30px;">
             </span>
-            <span  style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 30px;text-align:right;"
-                  title="层数">层数: </span>
-            <input type="text" name="cengshu" value="01" style="width: 20px; height: 30px;">
-            </span>
-            <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 30px;text-align:right;"
-                  title="行数">行数: </span>
-            <input type="text" name="hangshu" value="03" style="width: 20px; height: 30px;">
-            </span>
-            <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 30px;text-align:right;"
-                  title="列数">列数: </span>
-            <input type="text" name="lieshu"  value="03"  style="width: 20px; height: 30px;">
-            </span>
+
             <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 75px;text-align:right;"
                   title="开始指令">开始指令: </span>
-            <input type="text" name="startcom" value="no" style="width: 70px; height: 30px;">
+             <t:dictSelect id="startcom" field="startcom" type="list" extendJson="{class:'form-control'}"
+                          dictTable="wms_plc" dictField="com_no" dictText="com_remark" hasLabel="false"   ></t:dictSelect>
+
             </span>
             <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 75px;text-align:right;"
                   title="中间指令">中间指令: </span>
-            <input type="text" name="midcom" value="no" style="width: 70px; height: 30px;">
+            <t:dictSelect id="midcom" field="midcom" type="list" extendJson="{class:'form-control'}"
+                          dictTable="wms_plc" dictField="com_no" dictText="com_remark" hasLabel="false"    ></t:dictSelect>
             </span>
             <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 75px;text-align:right;"
                   title="结束指令">结束指令: </span>
-            <input type="text" name="endcom"  value="no"  style="width: 70px; height: 30px;">
-            </span>
+            <t:dictSelect id="endcom" field="endcom" type="list" extendJson="{class:'form-control'}"
+                          dictTable="wms_plc" dictField="com_no" dictText="com_remark" hasLabel="false"   ></t:dictSelect>
+
+             </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('diaodu')">调度</button>  </span>
+
+
         </div>
 
 
@@ -147,9 +157,30 @@
         var lieshu = $('input[name="lieshu"]').attr("value") * 1;
         var cengshu = $('input[name="cengshu"]').attr("value");
         des = $('input[name="des"]').attr("value");
-        startcom = $('input[name="startcom"]').attr("value");
-        midcom = $('input[name="midcom"]').attr("value");
-        endcom = $('input[name="endcom"]').attr("value");
+        startcom = 'no';
+        midcom = 'no';
+        endcom = 'no';
+        var countstartcom=$("#startcom option").length;
+        var countmidcom=$("#midcom option").length;
+        var countendcom=$("#endcom option").length;
+        for(var i=0;i<countstartcom;i++) {
+            if ($("#startcom").get(0).options[i].selected) {
+                startcom = $("#startcom").get(0).options[i].value;
+            }
+        }
+        for(var i=0;i<countmidcom;i++) {
+
+            if ($("#midcom").get(0).options[i].selected) {
+                midcom = $("#midcom").get(0).options[i].value;
+            }
+        }
+            for(var i=0;i<countendcom;i++) {
+
+                if ($("#endcom").get(0).options[i].selected) {
+                    endcom = $("#endcom").get(0).options[i].value;
+                }
+            }
+
         //加载消息
         var url = "mdBinController.do?getbinallagv&binstore=" +
             cangku +