Merge remote-tracking branch 'origin/bfasrs' into bfasrs

whycq

2023-01-08 30b2d8dde49639824f2a9c8f5b3e9b99b4b09e80

Merge remote-tracking branch 'origin/bfasrs' into bfasrs

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

@@ -27,4 +27,6 @@

    WrkMast selectOfPick(@Param("wrkNo") Integer wrkNo, @Param("ioType") Integer ioType);

    WrkMast selectPakoutOfStaNo(@Param("staNo")Integer staNo);

}

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

@@ -27,4 +27,7 @@
    Boolean setSteEmpty(Integer wrkNo);

    WrkMast selectOfPick(Integer wrkNo, Integer ioType);

    WrkMast selectPakoutOfStaNo(Integer staNo);

}

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

@@ -100,6 +100,12 @@
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo());

                if (Cools.isEmpty(detlDto.getBatch())){
                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
                    detlDto.setBatch(batch);
                }

                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;

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

@@ -111,4 +111,9 @@
        return this.baseMapper.selectOfPick(wrkNo, ioType);
    }

    @Override
    public WrkMast selectPakoutOfStaNo(Integer staNo) {
        return this.baseMapper.selectPakoutOfStaNo(staNo);
    }

}

 src/main/java/com/zy/common/config/AdminInterceptor.java

@@ -24,6 +24,7 @@
import java.util.Date;

/**
 * 拦截器
 * Created by vincent on 2019-06-13
 */
@Component
@@ -116,7 +117,7 @@
//            String deToken = Cools.deTokn(token, user.getPassword());
//            long timestamp = Long.parseLong(deToken.substring(0, 13));
            // 15分钟后过期
            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 86400000){
                Http.response(response, BaseRes.DENIED);
                return false;
            }

 src/main/java/com/zy/common/service/CommonService.java

@@ -115,16 +115,25 @@
        StartupDto startupDto = new StartupDto();
        int start;
        int end;
        Integer theCrnNo = null;
        switch (sourceStaNo) {
            case 103:
                whsType = 1;
                start = 1;
                end = 14;
                if (null != wrkMastService.selectPakoutOfStaNo(104)) {
                    start = 8;
                    theCrnNo = 2;
                }
                break;
            case 203:
                whsType = 2;
                start = 8;
                end = 21;
                if (null != wrkMastService.selectPakoutOfStaNo(204)) {
                    end = 14;
                    theCrnNo = 2;
                }
                break;
            default:
                throw new CoolException("检索库位失败，请联系管理员");
@@ -218,9 +227,17 @@
                    switch (curRow) {
                        case 1:
                            curRow = 1;
                            if (null != theCrnNo) {
                                curRow = 8;
                                crnNo1 = crnNo1 + 1;
                            }
                            break;
                        case 2:
                            curRow = 7;
                            if (null != theCrnNo) {
                                curRow = 14;
                                crnNo1 = crnNo1 + 1;
                            }
                            break;
                        case 3:
                            curRow = 8;
@@ -241,9 +258,17 @@
                            break;
                        case 3:
                            curRow = 15;
                            if (null != theCrnNo) {
                                curRow = 8;
                                crnNo1 = crnNo1 - 1;
                            }
                            break;
                        case 4:
                            curRow = 21;
                            if (null != theCrnNo) {
                                curRow = 14;
                                crnNo1 = crnNo1 - 1;
                            }
                            break;
                        default:
                            throw new CoolException("检索库位失败，请联系管理员");

 src/main/resources/mapper/WrkMastMapper.xml

@@ -100,4 +100,22 @@
        select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=17 and io_type = #{ioType}
    </select>

    <select id="selectPakoutOfStaNo" resultMap="BaseResultMap">
        select top 1 * from (
            select top 1 * from asr_wrk_mast where 1=1
            and crn_no = 2
            and wrk_sts in (11,12,13,14,15,16,17)
            and source_sta_no = #{staNo}
            and io_type in (101.103,104,107,110)
            union
            select top 1 * from asr_wrk_mast where 1=1
            and wrk_sts in (17,18)
            and io_type in (101.103,104,107,110)
            and wrk_no in (
                select wrk_no from asr_bas_devp where 1=1 and dev_no = #{staNo}
            )
        ) a

    </select>

</mapper>

 src/main/webapp/static/js/checkRecord/checkRecord.js

@@ -21,8 +21,8 @@
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'locNo', align: 'center',title: '库位号'}
            //{type: 'checkbox'}
            {field: 'locNo', align: 'center',title: '库位号'}
            ,{field: 'barcode', align: 'center',title: '托盘码'}
            ,{field: 'matnr', align: 'center',title: '物料代码'}
            ,{field: 'maktx', align: 'center',title: '物料名称'}

 src/main/webapp/views/checkRecord/checkRecord.html

@@ -17,11 +17,11 @@
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                    <!--<div class="layui-inline">-->
                    <!--    <div class="layui-input-inline">-->
                    <!--        <input class="layui-input" type="text" name="loc_no" placeholder="编号" autocomplete="off">-->
                    <!--    </div>-->
                    <!--</div>-->
                     <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">