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 @@
-<%--
桃红色标识此储位有货,淡绿色标识此储位为空
--%> -
- 仓库: - +
+ 仓库: + + + 层数: + 行数: + + + 列数: + + +
+
+ + 开始: @@ -17,35 +31,31 @@ title="结束">结束: - 层数: - - - 行数: - - - 列数: - - + 开始指令: - + + 中间指令: - + 结束指令: - - + + + <%-- --%> + +
@@ -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