#

LSH

2023-03-25 8591a55c2703f64a4ea3d8d6867f2cccdf08bd54

#

 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,awd.zpallet, sum(awd.anfme) as anfme
        select awd.wrk_no, awd.io_time, awd.matnr,awd.zpallet,awd.specs, 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
        group by awd.wrk_no, awd.io_time, awd.matnr ,awd.zpallet,awd.specs
        union
        select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet, sum(awdl.anfme) as anfme
        select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet,awdl.specs, 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
        group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.specs
    </select>

</mapper>

 src/main/webapp/views/order/order.html

@@ -255,11 +255,12 @@
                            {{ item.wrkMast.ioTime$ }}
                        </div>

                        <table class="layui-table" lay-skin="nob" style="width: 80%">
                        <table class="layui-table" lay-skin="nob" style="width: 100%">
                            <thead>
                            <tr style="background: none">
                                <td>No.</td>
                                <td>商品编号</td>
<!--                                <td>规格</td>-->
                                <td>数量</td>
                                <td>条码</td>
                            </tr>
@@ -269,6 +270,7 @@
                            <tr>
                                <td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td>
                                <td>{{ wrkDetl.matnr }}</td>
<!--                                <td>{{ wrkDetl.specs }}</td>-->
                                <td style="font-weight: bold">{{ wrkDetl.anfme }}</td>
                                <td style="font-weight: bold">{{ wrkDetl.zpallet }}</td>
                            </tr>