From e6ed9e8a9f24683e8ea4e9fc2c82b1d4e24bb00a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 十月 2023 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index b016b59..a7d7137 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -77,6 +77,9 @@
</div>
{{#if agvWaitPakin}}
<div style="padding-top: 10px;">
+ {{#if agvWaitPakin.orderNo}}
+ 璁㈠崟鍙凤細{{agvWaitPakin.orderNo}} </br>
+ {{/if}}
鐗╂枡鍙凤細{{agvWaitPakin.matnr}} </br>
{{#if agvWaitPakin.batch}}
搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
@@ -94,12 +97,15 @@
{{/if}}
{{#if agvWrkDetl}}
<div style="padding-top: 10px;">
+ {{#if agvWrkDetl.orderNo}}
+ 璁㈠崟鍙凤細{{agvWrkDetl.orderNo}} </br>
+ {{/if}}
鐗╂枡鍙凤細{{agvWrkDetl.matnr}} </br>
{{#if agvWrkDetl.batch}}
搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
{{/if}}
- 鏂欑鐮侊細{{agvWaitPakin.suppCode}} </br>
- 鏁伴噺锛歿{agvWrkDetl.anfme}}
+ 鏂欑鐮侊細{{agvWrkDetl.suppCode}} </br>
+ 鍙栬揣鏁伴噺锛歿{agvWrkDetl.anfme}} 缁撲綑鏁伴噺锛歿{agvWrkDetl.volume}}
</div>
{{/if}}
</div>
--
Gitblit v1.9.1