From 2037e1609c4bba6ec05e05c2cc574fa7c6eeacb7 Mon Sep 17 00:00:00 2001 From: pjb <pjb123456> Date: 星期一, 21 七月 2025 00:00:04 +0800 Subject: [PATCH] 订单任务追溯完善 --- src/main/resources/mapper/WrkDetlMapper.xml | 8 ++++---- src/main/webapp/views/orderPakout/order.html | 20 ++++++++++++++------ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml index 2d7e421..9fbdfe2 100644 --- a/src/main/resources/mapper/WrkDetlMapper.xml +++ b/src/main/resources/mapper/WrkDetlMapper.xml @@ -115,19 +115,19 @@ </select> <select id="selectAndLogByOrderNoGroupByMatnrOfSum" resultMap="BaseResultMap"> - select awd.wrk_no, awd.io_time, awd.matnr,awd.zpallet,awd.specs,awd.maktx, sum(awd.anfme) as anfme + select awd.wrk_no, awd.io_time, awd.matnr,awd.zpallet,awd.batch,awd.maktx,awd.model,awd.volume, 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 ,awd.zpallet,awd.specs,awd.maktx + group by awd.wrk_no, awd.io_time, awd.matnr ,awd.zpallet,awd.batch,awd.maktx,awd.model,awd.volume union - select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet,awdl.specs,awdl.maktx, sum(awdl.anfme) as anfme + select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet,awdl.batch,awdl.maktx,awdl.model,awdl.volume, 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 ,awdl.zpallet,awdl.specs,awdl.maktx + group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.batch,awdl.maktx,awdl.model,awdl.volume </select> </mapper> diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html index ef12f3e..e876b22 100644 --- a/src/main/webapp/views/orderPakout/order.html +++ b/src/main/webapp/views/orderPakout/order.html @@ -262,17 +262,25 @@ <td>No.</td> <td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td> </tr> - <tr style="background: none"> - <td>鍝佸彿锛�</td> - <td>{{ wrkDetl.matnr }}</td> - </tr> +<!-- <tr style="background: none">--> +<!-- <td>鍝佸彿锛�</td>--> +<!-- <td>{{ wrkDetl.matnr }}</td>--> +<!-- </tr>--> <tr style="background: none"> <td>鍝佸悕锛�</td> <td>{{ wrkDetl.maktx }}</td> </tr> <tr style="background: none"> - <td>瑙勬牸锛�</td> - <td>{{ wrkDetl.specs }}</td> + <td>鎵瑰彿锛�</td> + <td>{{ wrkDetl.batch }}</td> + </tr> + <tr style="background: none"> + <td>妗跺瀷锛�</td> + <td>{{ wrkDetl.model }}</td> + </tr> + <tr style="background: none"> + <td>缃愯閲忥細</td> + <td>{{ wrkDetl.volume }}</td> </tr> <tr style="background: none"> <td>鏁伴噺锛�</td> -- Gitblit v1.9.1