#

lsh

2024-05-16 3a59034076378b9c3e8e928ea433219f3fffaebe

#

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

@@ -296,8 +296,9 @@
                if (rgvComplete){
                    rgvThread.setPakMk(true);
                }
                WrkMastSta wrkMastSta = wrkMastStaMapper.selectById(rgvProtocol.getTaskNo1());
                if (!Cools.isEmpty(wrkMastSta)){
                List<WrkMastSta> wrkMastStas = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>().eq("wrk_no", rgvProtocol.getTaskNo1()));
                if (!Cools.isEmpty(wrkMastStas) || wrkMastStas.size()<=0){
                    WrkMastSta wrkMastSta = wrkMastStas.get(0);
                    wrkMastSta.setWrkSts(3);
                    wrkMastStaMapper.updateById(wrkMastSta);
                }
@@ -486,7 +487,7 @@
                return;
            }
            // 只有当RGV空闲、自动,工位一无物//rgv可用
            if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
            if (rgvProtocol.getStatusType1() == RgvStatusType.IDLE
                    && rgvProtocol.getModeType() == RgvModeType.AUTO
                    && rgvProtocol.getLoaded1()==0
                    && rgvProtocol.getTaskNo1() == 0
@@ -494,7 +495,7 @@
            ) {
                List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>());
                for (WrkMastSta wrkMastSta : wrkMastStaList){
                    if (wrkMastSta.getType()!=0 || wrkMastSta.getWrkType()!=3){//1:满版   3：取放
                    if (wrkMastSta.getType()!=1 || wrkMastSta.getWrkType()!=3 || wrkMastSta.getWrkSts()!=0){//1:满版   3：取放
                        continue;
                    }
                    boolean sign = rgvTakeFullAll(1, wrkMastSta); //命令下发

 src/main/java/com/zy/common/web/AuthController.java

@@ -54,11 +54,11 @@
    @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "登录")
    public R loginAction(String mobile, String password){
        //验证许可证是否有效
//        LicenseVerify licenseVerify = new LicenseVerify();
//        boolean verify = licenseVerify.verify();
//        if (!verify) {//许可证已失效
//            return R.parse(CodeRes.SYSTEM_20001);
//        }
        LicenseVerify licenseVerify = new LicenseVerify();
        boolean verify = licenseVerify.verify();
        if (!verify) {//许可证已失效
            return R.parse(CodeRes.SYSTEM_20001);
        }
        if (mobile.equals("super") && password.equals(Cools.md5(superPwd))) {
            Map<String, Object> res = new HashMap<>();
            res.put("username", mobile);

 src/main/java/com/zy/core/enums/RgvStatusType.java

@@ -14,7 +14,8 @@
    WAITING(90, "任务完成等待WCS确认"),
    FETCHWAITING(91, "取货任务完成等待WCS确认"),

    error(99,"报警")
    error(99,"报警"),
    error100(100,"其他100")
    ;



 src/main/java/com/zy/system/controller/LicenseCreatorController.java

@@ -61,9 +61,9 @@
     */
    @RequestMapping(value = "/getLicenseDays")
    public R getLicenseDays() {
        if (true){
            return R.ok().add(0);
        }
//        if (true){
//            return R.ok().add(0);
//        }
        LicenseVerify licenseVerify = new LicenseVerify();
        LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
        if (verifyInfo == null) {

 src/main/java/com/zy/system/entity/license/LicenseCheckListener.java

@@ -79,12 +79,12 @@

                LicenseVerify licenseVerify = new LicenseVerify();
                //安装证书
//                LicenseContent install = licenseVerify.install(param);
                LicenseContent install = licenseVerify.install(param);

                logger.info("++++++++ 许可证加载结束 ++++++++");

//                return install != null;
                return true;
                return install != null;
//                return true;
            } catch (Exception e) {
                return false;
            }

 src/main/resources/application.yml

@@ -37,7 +37,7 @@

#License相关配置
license:
  subject: ssdwcs
  subject: ssdasrs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic

 src/main/resources/license.lic

Binary files differ