自动化立体仓库 - WMS系统
18516761980
2022-08-13 2e586ec3808b5a6d170aba9ddcbf5ef7b69f9eef
Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

# Conflicts:
# src/main/java/com/zy/asrs/controller/MatCodeController.java
# src/main/java/com/zy/asrs/utils/VersionUtils.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
# src/main/resources/application.yml
3个文件已修改
17 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/TestMast.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/TestMastMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/TestMast.java
@@ -47,6 +47,7 @@
     * 用户码
     */
    @ApiModelProperty(value= "用户码")
    @TableField("user_id")
    private String userId;
    /**
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -611,27 +611,23 @@
        ReturnT<String> result=workLogHandler.startUpTestPACK(testMast);
        if (!result.isSuccess()) {
            log.error("测试申请失败", testMast.getBarcode());
//            throw new CoolException("测试申请失败");
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
        if (Cools.isEmpty(locMast)) {
            throw new CoolException(BaseRes.PARAM);
        }
        Date date1;
        try {
            date1 = new Date();
        }catch (Exception e){
            throw new CoolException("获取时间失败");
        }
        Date now = new Date();
        testMast.setChannel(1);
        testMast.setStatus(1);
        testMast.setModiTime(date1);
        testMast.setAppeTime(date1);
        testMast.setModiTime(now);
        testMast.setAppeTime(now);
        if (!testMastService.insert(testMast)){
            throw new CoolException("添加testMast失败");
        }
        locMast.setPackStatus(2);
        locMast.setModiTime(date1);
        locMast.setModiTime(now);
        if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
            throw new CoolException("申请测试失败");
        }
src/main/resources/mapper/TestMastMapper.xml
@@ -8,7 +8,7 @@
        <result column="channel" property="channel" />
        <result column="loc_no" property="locNo" />
        <result column="barcode" property="barcode" />
        <result column="userId" property="userId" />
        <result column="user_id" property="userId" />
        <result column="status" property="status" />
        <result column="modi_time" property="modiTime" />
        <result column="appe_time" property="appeTime" />