From 5a3853747d15a63690bd172230f613ccb8a3a7c1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 25 三月 2023 13:27:22 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlMapper.xml | 8 ++++----
src/main/webapp/views/order/order.html | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 9ec480f..dcc5cf2 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -109,19 +109,19 @@
</select>
<select id="selectAndLogByOrderNoGroupByMatnrOfSum" resultMap="BaseResultMap">
- select awd.wrk_no, awd.io_time, awd.matnr, sum(awd.anfme) as anfme
+ select awd.wrk_no, awd.io_time, awd.matnr,awd.zpallet, sum(awd.anfme) as anfme
from asr_wrk_detl awd
left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no and awd.io_time = awm.io_time
where order_no = #{orderNo}
- group by awd.wrk_no, awd.io_time, awd.matnr
+ group by awd.wrk_no, awd.io_time, awd.matnr ,awd.zpallet
union
- select distinct awdl.wrk_no, awdl.io_time, awdl.matnr, sum(awdl.anfme) as anfme
+ select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet, sum(awdl.anfme) as anfme
from asr_wrk_detl_log awdl
left join asr_wrk_mast_log awml on awdl.wrk_no = awml.wrk_no and awdl.io_time = awml.io_time
where awdl.order_no = #{orderNo}
and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
and awml.io_type != 103
- group by awdl.wrk_no, awdl.io_time, awdl.matnr
+ group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet
</select>
</mapper>
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index a3a7753..0d8cb16 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -261,6 +261,7 @@
<td>No.</td>
<td>鍟嗗搧缂栧彿</td>
<td>鏁伴噺</td>
+ <td>鏉＄爜</td>
</tr>
</thead>
<tbody>
@@ -269,6 +270,7 @@
<td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td>
<td>{{ wrkDetl.matnr }}</td>
<td style="font-weight: bold">{{ wrkDetl.anfme }}</td>
+ <td style="font-weight: bold">{{ wrkDetl.zpallet }}</td>
</tr>
{{# }); }}
</tbody>
--
Gitblit v1.9.1