#

lsh

2024-05-16 0c4e325b7744012fb117ddddfd11b0e9ba26b700

#

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

@@ -380,6 +380,10 @@
        }
    }

    public synchronized void DevpTaskAndPut() throws InterruptedException {

    }



}

 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/MainProcess.java

@@ -47,8 +47,8 @@
//                    mainService.RGVDemoShow0();
//                    mainService.RGVDemoShow1();
                    mainService.RGVDemoShow2();
                    //机械臂允许取货、允许放货
//                    mainService.ExtTaskAndPut();
                    //任务生成
                    mainService.DevpTaskAndPut();


                } catch (Exception e) {

 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/webapp/views/deviceOperate/devpOperate.html

@@ -18,14 +18,14 @@
                max-height="450" style="width: 100%">
                <el-table-column property="devNo" label="站号">
                </el-table-column>
                <el-table-column property="workNo" label="工作号">
                </el-table-column>
                <el-table-column property="locType1" label="高低库位">
                </el-table-column>
                <el-table-column property="pakMk" label="入库标记">
                </el-table-column>
                <el-table-column property="barcode" label="条码">
                </el-table-column>
<!--                <el-table-column property="workNo" label="工作号">-->
<!--                </el-table-column>-->
<!--                <el-table-column property="locType1" label="高低库位">-->
<!--                </el-table-column>-->
<!--                <el-table-column property="pakMk" label="入库标记">-->
<!--                </el-table-column>-->
<!--                <el-table-column property="barcode" label="条码">-->
<!--                </el-table-column>-->
            </el-table>
        </div>

@@ -74,11 +74,11 @@
                        </div>
                        <div v-else>
                            <el-descriptions :title="currentTitle" direction="vertical" :column="2" border>
                                <el-descriptions-item label="站点">{{ tableData[currentIndex].devNo }}
                                </el-descriptions-item>
                                <el-descriptions-item label="工作号">
                                    {{ tableData[currentIndex].workNo }}
                                </el-descriptions-item>
<!--                                <el-descriptions-item label="站点">{{ tableData[currentIndex].devNo }}-->
<!--                                </el-descriptions-item>-->
<!--                                <el-descriptions-item label="工作号">-->
<!--                                    {{ tableData[currentIndex].workNo }}-->
<!--                                </el-descriptions-item>-->
                                <el-descriptions-item label="输送线 ==》 氮气1">{{ tableData[currentIndex].autoing }}
                                </el-descriptions-item>
                                <el-descriptions-item label="输送线 ==》 氮气2">{{ tableData[currentIndex].loading }}