#

luxiaotao1123

2022-05-07 e24058037ecd9e05758333296d5fcdd95d94c496

#

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

@@ -108,7 +108,7 @@
    // 出库 ---------------------------------------------------------------------------------------------------

    @RequestMapping("/pakout/query/auth")
    @ManagerAuth
//    @ManagerAuth
    public R pakoutQuery(@RequestParam(required = false) String barcode,
                         @RequestParam(required = false) Integer staNo,
                         @RequestParam(required = false) String matnr){
@@ -121,19 +121,15 @@
        }
        if (!Cools.isEmpty(matnr)) {
            if (!Cools.isEmpty(staNo)) {
                List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).eq("wrk_sts", 14L));
                if (!Cools.isEmpty(wrkMasts)) {
                    WrkMast wrkMast = wrkMasts.get(0);
                    List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                    return R.ok().add(wrkDetls);
                }
                List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
                return R.ok().add(wrkDetls);
            }
        }
        return R.ok();
    }

    @RequestMapping("/pakout/confirm/auth")
    @ManagerAuth
//    @ManagerAuth
    @Transactional
    public R pakoutConfirm(@RequestBody List<WrkDetl> list) {
        if (Cools.isEmpty(list)) {

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

@@ -22,4 +22,5 @@

    int updateInspect( @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);

    List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);
}

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

@@ -18,4 +18,6 @@

    boolean updateInspect(Integer wrkNo, String matnr, String batch);

    List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr);

}

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

@@ -75,4 +75,9 @@
    public boolean updateInspect(Integer wrkNo, String matnr, String batch) {
        return this.baseMapper.updateInspect(wrkNo, matnr, batch) > 0;
    }

    @Override
    public List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr) {
        return this.baseMapper.selectPakoutQuery(staNo, matnr);
    }
}

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -96,4 +96,15 @@
        <include refid="batchSeq"></include>
    </update>

    <select id="selectPakoutQuery" resultMap="BaseResultMap">
        select
        awd.*
        from asr_wrk_detl awd
        left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no
        where 1=1
        and awm.wrk_sts = 14
        and awm.sta_no = #{staNo}
        and awd.matnr + '-' + awd.batch = #{matnr}
    </select>

</mapper>