#

lsh

2024-01-12 634748d87913a4e56ec80dffb9e3361a6e96676a

#

 src/main/java/com/zy/asrs/controller/LocMastController.java

@@ -109,6 +109,18 @@
    @RequestMapping(value = "/locMast/update/auth")
    @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast){
        LocMast locMast1 = locMastService.selectById(locMast.getLocNo());
        if (locMast.getLocType1()==0){
            locMast.setLocType1(locMast1.getLocType1());
        }
        if (!locMast1.getLocType1().equals(locMast.getLocType1())){
            if (locMast.getRow1()!=2){
                return R.error("当前操作已被阻止，只允许第二排库位修改库位类型！！！");
            }
            if (locMast1.getLocType1()==1){
                return R.error("当前操作已被阻止，测试库位禁止修改库位类型！！！");
            }
        }
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
        }

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

@@ -604,7 +604,7 @@
            matNew.setMatnr(param.getPackNo());
            matNew.setMaktx(param.getPackName());
            matNew.setManuDate(param.getRequestTime());
            matNew.setDeadWarn(360);//6小时  360分钟
            matNew.setDeadWarn(1440);//6小时  360分钟  24小时  1440分钟
            matNew.setCreateBy(9999L);//9999表示erp下发
            matNew.setCreateTime(now);
            matNew.setUpdateBy(9999L);//9999表示erp下发

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

@@ -51,11 +51,11 @@
    @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "登录")
    public R loginAction(String username, 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 (username.equals("super") && password.equals(Cools.md5(superPwd))) {
            Map<String, Object> res = new HashMap<>();
            res.put("username", username);

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

@@ -69,6 +69,9 @@
     */
    @RequestMapping(value = "/getLicenseDays")
    public R getLicenseDays() {
        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,11 +79,11 @@

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

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

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

 src/main/webapp/static/js/locMast/locMast.js

@@ -493,6 +493,7 @@
            pltType: $('#pltType').val(),
            ctnType: $('#ctnType').val(),
            locSts: $('#locSts').val(),
            locType1: $('#loc_type1').val(),
            sheetNo: $('#sheetNo').val(),
            crnNo: $('#crnNo').val(),
            row1: $('#row1').val(),

 src/main/webapp/views/index.html

@@ -45,7 +45,7 @@
      <!--        <a ew-event="note" title="便签"><i class="layui-icon layui-icon-note"></i></a>-->
      <!--      </li>-->
      <li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;">
        <div style="color: red;">许可证有效期：<span id="licenseDays">29</span>天</div>
<!--        <div style="color: red;">许可证有效期：<span id="licenseDays">29</span>天</div>-->
      </li>
      <li class="layui-nav-item layui-hide-xs" lay-unselect>
        <a ew-event="fullScreen" title="全屏"><i class="layui-icon layui-icon-screen-full"></i></a>

 src/main/webapp/views/locMast/locMast_detail.html

@@ -99,6 +99,19 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>库位类型：</label>
            <div class="layui-input-inline">
                <select id="loc_type1" class="layui-input" type="text">
                    <!--                    <option style="display: none"></option>-->
                    <option value="0">不修改</option>
<!--                    <option value="1">待测</option>-->
                    <option value="2">静置库位</option>
                    <option value="3">测试前暂存库位</option>
                    <option value="4">NG库位</option>
                </select>
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>冻结状态：</label>
            <div class="layui-input-inline">
                <select id="freeze" class="layui-input" type="text">