From 18827ae1fab72c4e2e2814d00544269c0d4c310e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 28 四月 2023 09:00:38 +0800
Subject: [PATCH] 修复订单系统
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 ++++--
src/main/webapp/views/order/order.html | 16 +++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8407805..a73f28f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -672,7 +672,9 @@
for (int i = 0; i < combMats.size(); i++) {
OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
- .eq("order_no", jsonOrderNo));
+ .eq("order_no", jsonOrderNo)
+ .and()
+ .eq("maktx",jsonOrderDetl.getMaktx()));
if (Cools.isEmpty(orderDetl)) {
return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
}
@@ -681,7 +683,7 @@
}
ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
.eq("loc_no", jsonLocNo)
- .eq("matnr", orderDetl.getMatnr()));
+ .eq("maktx", jsonOrderDetl.getMaktx()));
if (manLocDetl == null) {
return R.error("璇ュ簱浣嶆病鏈夊嚭搴撶殑鐗╂枡淇℃伅");
}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 2a3836c..2490ca9 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -252,7 +252,7 @@
</script>
<!-- 妯℃澘寮曟搸 -->
<!-- 妯℃澘3 -->
-<script type="text/template" id="templatePreview3" class="template-qrcode">/orderDetl/list/auth
+<script type="text/template" id="templatePreview3" class="template-qrcode">
{{#each data}}
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
<thead></thead>
@@ -271,21 +271,19 @@
<td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
</tr>
<tr style="height: 30px">
- <td align="center" scope="col" colspan="1">鏃ユ湡</td>
- <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.createTime$}}</td>
+ <td align="center" scope="col" colspan="1">鎵瑰彿</td>
+ <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.batch}}</td>
</tr>
<tr style="height: 30px">
- <td align="center" scope="col" colspan="1">鎵瑰彿</td>
- <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.batch}}</td>
<td align="center" scope="col" colspan="1">瑙勬牸</td>
<td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.specs}}</td>
- </tr>
- <tr style="height: 30px">
<td align="center" scope="col" colspan="1">鏁伴噺</td>
<td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.anfme}}</td>
</tr>
-
-
+ <tr style="height: 30px">
+ <td align="center" scope="col" colspan="1">鏃ユ湡</td>
+ <td align="lift" colspan="7 " style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.createTime$}}</td>
+ </tr>
</tbody>
</table>
<div style="height: 20px">
--
Gitblit v1.9.1