Merge remote-tracking branch 'aliyun/lfdasrs' into lfdasrs

18516761980

2023-02-03 5b1bfdace53e5bf260b181ecc9d858649e68af8c

Merge remote-tracking branch 'aliyun/lfdasrs' into lfdasrs

# Conflicts:
#	src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

 pom.xml

@@ -15,7 +15,7 @@

    <properties>
        <java.version>1.8</java.version>
        <cool.version>3.2.0</cool.version>
        <cool.version>3.4.0</cool.version>
        <mysql-driver.version>5.1.47</mysql-driver.version>
        <mybatis-plus.version>2.3.2</mybatis-plus.version>
        <fastjson.version>1.2.58</fastjson.version>

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

@@ -91,15 +91,14 @@
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }

        if (param.getCombMats().size()>1){
            throw new CoolException("不允许混料===>>" + param.getBarcode());
        if(param.getBarcode().length()!=8){
            throw new CoolException("条码长度不是8位===>>" + param.getBarcode());
        }

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
        if (countLoc > 0 || countWrk > 0 || countwait > 0) {
            throw new CoolException("组托档/工作档/库存条码数据已存在===>>" + param.getBarcode());
        if (countLoc > 0 || countWrk > 0) {
            throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode());
        }

        Date now = new Date();

 version/bak/jkasrs.bak

Binary files differ

 version/bak/lfdasrs

Binary files differ