订单任务追溯完善

pjb

3 天以前 2037e1609c4bba6ec05e05c2cc574fa7c6eeacb7

订单任务追溯完善

 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>

 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>