From ef1a6adb261a5c30fed6361676dcd54cbbda02e4 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期二, 20 二月 2024 22:16:29 +0800
Subject: [PATCH] #
---
src/main/webapp/views/agvWrkMast/wrkMast.html | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index ce8b861..76c58fc 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -686,6 +686,9 @@
public R containerMove(@RequestBody ReplenishmentParam param){
String devNo = param.getDevNo();
+ if(Cools.isEmpty(currentContainerMap)){
+ currentContainerMap = new HashMap<>();
+ }
String containerCode = currentContainerMap.get(devNo);
AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
@@ -723,10 +726,10 @@
agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
}
- System.out.println("currentContainerMap: " + currentContainerMap);
+ //System.out.println("currentContainerMap: " + currentContainerMap);
- System.out.println("agvBasDevpDto: " + agvBasDevpDto);
+ //System.out.println("agvBasDevpDto: " + agvBasDevpDto);
return R.ok(agvBasDevpDto);
}
diff --git a/src/main/webapp/views/agvWrkMast/wrkMast.html b/src/main/webapp/views/agvWrkMast/wrkMast.html
index 2af8353..0f57944 100644
--- a/src/main/webapp/views/agvWrkMast/wrkMast.html
+++ b/src/main/webapp/views/agvWrkMast/wrkMast.html
@@ -104,7 +104,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon"></i>澧炲姞浼樺厛绾�</button>
<button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon"></i>闄嶄綆浼樺厛绾�</button>
- <button class="layui-btn layui-btn-primary" id="btn-startWrk" lay-event="startWrk">寮�濮嬩换鍔�</button>
+ <button class="layui-btn layui-btn-primary" id="btn-startWrk" lay-event="startWrk" style="display: none">寮�濮嬩换鍔�</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
--
Gitblit v1.9.1