#

zjj

2024-06-07 6bc656ba921ced073cb9c25dff334df065e71a91

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/license/CustomLicenseManager.java

@@ -130,24 +130,24 @@

        if(expectedCheckModel != null && serverCheckModel != null){
            //校验IP地址
            if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
                throw new LicenseContentException("当前服务器的IP没在授权范围内");
            }

            //校验Mac地址
            if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
                throw new LicenseContentException("当前服务器的Mac地址没在授权范围内");
            }

            //校验主板序列号
            if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
                throw new LicenseContentException("当前服务器的主板序列号没在授权范围内");
            }

            //校验CPU序列号
            if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
                throw new LicenseContentException("当前服务器的CPU序列号没在授权范围内");
            }
//            if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
//                throw new LicenseContentException("当前服务器的IP没在授权范围内");
//            }
//
//            //校验Mac地址
//            if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
//                throw new LicenseContentException("当前服务器的Mac地址没在授权范围内");
//            }
//
//            //校验主板序列号
//            if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
//                throw new LicenseContentException("当前服务器的主板序列号没在授权范围内");
//            }
//
//            //校验CPU序列号
//            if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
//                throw new LicenseContentException("当前服务器的CPU序列号没在授权范围内");
//            }
        }else{
//            throw new LicenseContentException("不能获取服务器硬件信息");
        }

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java

@@ -2,13 +2,16 @@

import lombok.Data;

import java.io.Serializable;

/**
 * 日出入库次数统计
 * @author admin
 * @date 2018年11月24日
 */
@Data
public class ViewInOutBean {
public class ViewInOutBean implements Serializable {
    private static final long serialVersionUID = 1L;
    private String ymd;
    private String sourceStaNo;
    private Long stoQty;

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java

@@ -313,7 +313,7 @@
                .eq(LocMast::getLocSts, "O")
                .eq(LocMast::getHostId, hostId)
                .in(LocMast::getRow1, curRow)
                .orderByAsc(LocMast::getLev1);
                .orderByDesc(LocMast::getLev1);
        //库位搜索范围
        LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();
        if (locRangeDto != null) {

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

@@ -80,13 +80,25 @@
        return R.ok();
    }

    @RequestMapping(value = "/locMast/update/auth")
    @ManagerAuth
    @RequestMapping(value = "/locMast/update/auth")
    @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast){
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
        }
        locMastService.updateById(locMast);
        LocMast oldLocMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locMast.getLocNo()).eq(LocMast::getHostId, getHostId()));
        if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
            return R.error("当前操作已被阻止，请联系管理员");
        }
        // 有物料时修改为空库位或者空板库位，则删除库存明细
        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
                locDetlService.remove(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locMast.getLocNo()));
            }
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());
        locMastService.update(locMast,new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locMast.getLocNo()).eq(LocMast::getHostId, getHostId()));
        return R.ok();
    }


 zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js

@@ -429,7 +429,7 @@
            shade: [0.5,'#000'] //0.1透明度的背景
        });
        var data = {
//            id: $('#id').val(),
           id: $('#id').val(),
            locNo: $('#locNo').val(),
            whsType: $('#whsType').val(),
            pltType: $('#pltType').val(),
@@ -443,13 +443,8 @@
            fullPlt: $('#fullPlt').val(),
            locType: $('#locType').val(),
            outEnable: $('#outEnable').val(),
            ioTime: top.strToDate($('#ioTime\\$').val()),
            firstTime: top.strToDate($('#firstTime\\$').val()),
            modiUser: $('#modiUser').val(),
            modiTime: top.strToDate($('#modiTime\\$').val()),
            appeUser: $('#appeUser').val(),
            appeTime: top.strToDate($('#appeTime\\$').val()),
            errorTime: top.strToDate($('#errorTime\\$').val()),
            errorMemo: $('#errorMemo').val(),
            ctnKind: $('#ctnKind').val(),
            scWeight: $('#scWeight').val(),
@@ -464,7 +459,6 @@
            url: baseUrl+"/locMast/"+name+"/auth",
            headers: {'token': localStorage.getItem('token')},
            data: top.reObject(data),
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    parent.layer.closeAll();

 zy-asrs-wms/src/main/webapp/static/js/report/inOut.js

@@ -19,10 +19,10 @@
        cols: [[
            // {type: 'checkbox'}
            {field: 'ymd', align: 'center', title: '日期'}
            ,{field: 'source_sta_no', align: 'center',title: '站点'}
            ,{field: 'sto_qty', align: 'center',title: '入库次数'}
            ,{field: 'ret_qty', align: 'center',title: '出库次数'}
            ,{field: 'total_qty', align: 'center',title: '入出总数'}
            ,{field: 'sourceStaNo', align: 'center',title: '站点'}
            ,{field: 'stoQty', align: 'center',title: '入库次数'}
            ,{field: 'retQty', align: 'center',title: '出库次数'}
            ,{field: 'totalQty', align: 'center',title: '入出总数'}
        ]],
        request: {
            pageName: 'curr',