From db92e88a70a59437b48c9369cf1c46dba0ecb0a5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 15 十月 2023 13:25:33 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/agvBasDevpVisualized/basDevp.html |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index acec6aa..11ab93d 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -61,15 +61,16 @@
 <!--                        <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}">鎷f枡鍏ュ簱</button>-->
 <!--                    </div>-->
 
-                    {{#if agvWrkDetl}}
+                    {{#if containerMoveOutFlag}}
                     <div style=" padding-bottom: 20px">
-
                         <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="containerMoveOut">瀹瑰櫒绂诲満</button>
-                        <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="pickIn">鎷f枡鍏ュ簱</button>
-
                     </div>
                     {{/if}}
-
+                    {{#if pickInFlag}}
+                    <div style=" padding-bottom: 20px">
+                        <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="pickIn">鎷f枡/鐩樼偣鍏ュ簱</button>
+                    </div>
+                    {{/if}}
                     <div>
                         宸ヤ綔绔欑紪鐮侊細{{devNo}} </br>
                         绔欑偣鐘舵�侊細{{locSts$}}
@@ -80,7 +81,7 @@
                         {{#if agvWaitPakin.batch}}
                         搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
                         {{/if}}
-                        鎵樼洏鐮侊細{{agvWaitPakin.zpallet}} </br>
+                        鏂欑鐮侊細{{agvWaitPakin.suppCode}} </br>
                         鏁伴噺锛歿{agvWaitPakin.anfme}}
                     </div>
                     {{/if}}
@@ -97,7 +98,7 @@
                         {{#if agvWrkDetl.batch}}
                         搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
                         {{/if}}
-                        鎵樼洏鐮侊細{{agvWrkDetl.zpallet}} </br>
+                        鏂欑鐮侊細{{agvWaitPakin.suppCode}} </br>
                         鏁伴噺锛歿{agvWrkDetl.anfme}}
                     </div>
                     {{/if}}
@@ -204,7 +205,7 @@
 
         });
 
-        //鎷f枡鍏ュ簱
+        //鎷f枡/鐩樼偣鍏ュ簱
         form.on('submit(pickIn)', function () {
             var devNoList = [];
             devNoList.push(this.value);

--
Gitblit v1.9.1