#

LSH

2023-05-11 96296b1d8fc9351b97cb1840a6bf04b481b20ae9

#

 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java

@@ -79,6 +79,11 @@
        try {
            Integer wrkNo = null;
            String orderNo = null;
            String matnr = null;
            String specs = null;
            String zpallet = null;
            String batch = null;
            Double anfme = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
@@ -93,11 +98,21 @@
                    wrkNo = Integer.parseInt(val);
                } else if (entry.getKey().equals("order_no")) {
                    orderNo = val;
                } else if (entry.getKey().equals("specs")) {
                    specs = val;
                } else if (entry.getKey().equals("zpallet")) {
                    zpallet = val;
                } else if (entry.getKey().equals("batch")) {
                    batch = val;
                } else if (entry.getKey().equals("anfme")) {
                    anfme = Double.parseDouble(val);
                }else if (entry.getKey().equals("matnr")) {
                    matnr = val;
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, modiTimeStart, modiTimeEnd, curr, limit);
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
            Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo, modiTimeStart, modiTimeEnd));
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd));
            return R.ok(page1);
        } catch (Exception e) {
            return R.error("异常" + e);

 src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java

@@ -17,9 +17,27 @@
    @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
    int save(Integer workNo);

    List<WrkDetlLog> selectWrkDetlLogs(@Param("wrkNo") Integer wrkNo, @Param("orderNo") String orderNo, @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd, @Param("pageNumber") Integer curr, @Param("pageSize") Integer limit);
    List<WrkDetlLog> selectWrkDetlLogs(@Param("wrkNo") Integer wrkNo,
                                       @Param("orderNo") String orderNo,
                                       @Param("matnr") String matnr,
                                       @Param("specs") String specs,
                                       @Param("zpallet") String zpallet,
                                       @Param("batch") String batch,
                                       @Param("anfme") Double anfme,
                                       @Param("modiTimeStart") Date modiTimeStart,
                                       @Param("modiTimeEnd") Date modiTimeEnd,
                                       @Param("pageNumber") Integer curr,
                                       @Param("pageSize") Integer limit);

    Long selectWrkDetlLogsTotal(@Param("wrkNo") Integer wrkNo, @Param("orderNo") String orderNo, @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd);
    Long selectWrkDetlLogsTotal(@Param("wrkNo") Integer wrkNo,
                                @Param("orderNo") String orderNo,
                                @Param("matnr") String matnr,
                                @Param("specs") String specs,
                                @Param("zpallet") String zpallet,
                                @Param("batch") String batch,
                                @Param("anfme") Double anfme,
                                @Param("modiTimeStart") Date modiTimeStart,
                                @Param("modiTimeEnd") Date modiTimeEnd);


}

 src/main/java/com/zy/asrs/service/WrkDetlLogService.java

@@ -10,8 +10,8 @@

    boolean save(Integer workNo);

    List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
    List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);

    Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo, Date modiTimeStart, Date modiTimeEnd);
    Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd);

}

 src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java

@@ -18,12 +18,12 @@
    }

    @Override
    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo, modiTimeStart, modiTimeEnd, curr, limit);
    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
    }

    @Override
    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo, modiTimeStart, modiTimeEnd);
    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd);
    }
}

 src/main/resources/mapper/ViewWorkInMapper.xml

@@ -11,21 +11,24 @@
        <if test="matnr!=null and matnr!='' ">
            and matnr like '%' + #{matnr} + '%'
        </if>
        <if test="maktx!=null and maktx!='' ">
            and (maktx like '%' + #{maktx} + '%'
            or matnr like '%' + #{maktx} + '%'
            or lgnum like '%' + #{maktx} + '%'
            or tbnum like '%' + #{maktx} + '%'
            or tbpos like '%' + #{maktx} + '%'
            or zmatid like '%' + #{maktx} + '%'
            or maktx like '%' + #{maktx} + '%'
            or werks like '%' + #{maktx} + '%'
            or anfme like '%' + #{maktx} + '%'
            or altme like '%' + #{maktx} + '%'
            or zpallet like '%' + #{maktx} + '%'
            or bname like '%' + #{maktx} + '%'
            )
        <if test="anfme != null and anfme != ''">
            and anfme = #{anfme}
        </if>
<!--        <if test="maktx!=null and maktx!='' ">-->
<!--            and (maktx like '%' + #{maktx} + '%'-->
<!--            or matnr like '%' + #{maktx} + '%'-->
<!--            or lgnum like '%' + #{maktx} + '%'-->
<!--            or tbnum like '%' + #{maktx} + '%'-->
<!--            or tbpos like '%' + #{maktx} + '%'-->
<!--            or zmatid like '%' + #{maktx} + '%'-->
<!--            or maktx like '%' + #{maktx} + '%'-->
<!--            or werks like '%' + #{maktx} + '%'-->
<!--            or anfme like '%' + #{maktx} + '%'-->
<!--            or altme like '%' + #{maktx} + '%'-->
<!--            or zpallet like '%' + #{maktx} + '%'-->
<!--            or bname like '%' + #{maktx} + '%'-->
<!--            )-->
<!--        </if>-->
        <if test="begin_date!=null and begin_date!='' ">
            <![CDATA[
            and io_time >= #{begin_date}
@@ -36,6 +39,15 @@
            and io_time <= #{end_date}
            ]]>
        </if>
        <if test="batch != null and batch != ''">
            and batch like concat('%',#{batch},'%')
        </if>
        <if test="zpallet != null and zpallet != ''">
            and zpallet like concat('%',#{zpallet},'%')
        </if>
        <if test="specs != null and specs != ''">
            and specs like concat('%',#{specs},'%')
        </if>
</sql>

<sql id="viewWorkOutConditionSql">

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -51,17 +51,28 @@
        <if test="wrkNo != null and wrkNo != ''">
            and a.wrk_no = #{wrkNo}
        </if>
        <if test="anfme != null and anfme != ''">
            and a.anfme = #{anfme}
        </if>
        <if test="modiTimeStart != null ">
            <if test="modiTimeEnd != null ">
                and a.modi_time between #{modiTimeStart} and #{modiTimeEnd}
            </if>
        </if>
        <if test="orderNo != null and orderNo != ''">
            and ( a.order_no like concat('%',#{orderNo},'%')
            or a.batch like concat('%',#{orderNo},'%')
            or a.matnr like concat('%',#{orderNo},'%')
            or a.zpallet like concat('%',#{orderNo},'%')
            )
            and a.order_no like concat('%',#{orderNo},'%')
        </if>
        <if test="batch != null and batch != ''">
            and a.batch like concat('%',#{batch},'%')
        </if>
        <if test="matnr != null and matnr != ''">
            and a.matnr like concat('%',#{matnr},'%')
        </if>
        <if test="zpallet != null and zpallet != ''">
            and a.zpallet like concat('%',#{zpallet},'%')
        </if>
        <if test="specs != null and specs != ''">
            and a.specs like concat('%',#{specs},'%')
        </if>
    </sql>

@@ -82,7 +93,7 @@
    </select>

    <select id="selectWrkDetlLogsTotal" resultType="Long">
        select count(*) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
        select count(1) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
        where 1=1
        and a.io_time=b.io_time
        and a.wrk_no=b.wrk_no

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

</mapper>

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

@@ -256,22 +256,30 @@
                        </div>

                        <table class="layui-table" lay-skin="nob" style="width: 80%">
                            <thead>
                            <tr style="background: none">
                                <td>No.</td>
                                <td>商品编号</td>
<!--                                <td>规格</td>-->
                                <td>数量</td>
                                <td>条码</td>
                            </tr>
                            </thead>
                            <tbody>
                            {{#  layui.each(item.wrkDetls, function(idx, wrkDetl){ }}
                            <tr>
                            <tr style="background: none">
                                <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>
<!--                                <td>{{ wrkDetl.specs }}</td>-->
                            </tr>
                            <tr style="background: none">
                                <td>品名：</td>
                                <td>{{ wrkDetl.maktx }}</td>
                            </tr>
                            <tr style="background: none">
                                <td>规格：</td>
                                <td>{{ wrkDetl.specs }}</td>
                            </tr>
                            <tr style="background: none">
                                <td>数量：</td>
                                <td style="font-weight: bold">{{ wrkDetl.anfme }}</td>
                            </tr>
                            <tr style="background: none">
                                <td>条码：</td>
                                <td style="font-weight: bold">{{ wrkDetl.zpallet }}</td>
                            </tr>
                            {{#  }); }}

 src/main/webapp/views/report/viewWorkIn.html

@@ -26,7 +26,27 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="品号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="specs" placeholder="规格" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="batch" placeholder="货品特征" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="anfme" placeholder="数量" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

 src/main/webapp/views/report/viewWorkOut.html

@@ -26,7 +26,27 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="品号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="specs" placeholder="规格" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="batch" placeholder="货品特征" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="anfme" placeholder="数量" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

 src/main/webapp/views/wrkDetlLog/wrkDetlLog.html

@@ -26,7 +26,32 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="order_no" placeholder="订单编号/规格/托盘码/货品特征" autocomplete="off">
            <input class="layui-input" type="text" name="order_no" placeholder="订单编号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="品号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="specs" placeholder="规格" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="batch" placeholder="货品特征" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="anfme" placeholder="数量" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->