第一版

野心家

2024-09-26 2e3716054aa57e2a41ee39c4ea0cd776fd74f260

第一版

 pom.xml

@@ -115,7 +115,7 @@
    </dependencies>

    <build>
        <finalName>wms</finalName>
        <finalName>dlzwms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

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

@@ -44,7 +44,7 @@
//            log.error("{}号堆垛机不存在", crnNo);
            return false;
        }
        if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3){
        if (crnp.getCrnErr() != null && crnp.getCrnSts() != 1){
            log.error("{}号堆垛机非自动连线状态，无法作业!", crnNo);
            return false;
        }

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

@@ -85,9 +85,6 @@
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        if(param.getCombMats().size()>1){
            throw new CoolException("请提取一个商品，或者刷新重新组托！");
        }
        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
@@ -96,9 +93,6 @@

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

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));

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

@@ -216,10 +216,6 @@
            LocMast locMast = locMastService.selectById(dto.getLocNo());

            Integer outSta = staNo.getDevNo();
//            //2号堆垛机全板出库站指定为204站，拣料站指定为202
//            if(locMast.getCrnNo()==2){
//                outSta = ioType == 101 ? 204 : 202;
//            }

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -311,11 +311,11 @@
            if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
                throw new CoolException("库位排号异常：排号：" + curRow);
            }
            if ((curRow - sRow) % 4 == 0) {
            if ((curRow - sRow) % 4 == 0) {//1\5\9\13
                necessaryParameters[1] = curRow;    //curRow   最深库位排
                necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1;     //crnNo     堆垛机号
                necessaryParameters[2] = (curRow + 3) / 4 + sCrnNo - 1;     //crnNo     堆垛机号
                necessaryParameters[3] = curRow + 1;    //nearRow  最浅库位排
            } else if ((curRow - sRow + 1) % 4 == 0) {
            } else if ((curRow - sRow + 1) % 4 == 0) {//4\8\12\16
                necessaryParameters[1] = curRow;    //curRow   最深库位排
                necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1;     //crnNo     堆垛机号
                necessaryParameters[3] = curRow - 1;    //nearRow  最浅库位排

 src/main/java/com/zy/common/service/CommonService.java

@@ -224,7 +224,7 @@
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
                for (LocMast locMast1:locMasts){
                    //获取巷道
                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow<nearRow);
                    //获取目标库位所在巷道最浅非空库位
                    LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn);
                    if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8080
  port: 8081
  servlet:
    context-path: /@pom.build.finalName@

@@ -39,7 +39,7 @@

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

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/wms";
var baseUrl = "/dlzwms";

// 详情窗口-高度
var detailHeight = '80%';

 src/main/webapp/views/pakStore/locDetlCheckQuery.html

@@ -121,8 +121,8 @@

    function getCol() {
        let cols = [
            {type: 'checkbox', merge: ['locNo']}
            ,{field: 'locNo', align: 'center',title: '库位号', merge: true, style: 'font-weight: bold'}
            {type: 'checkbox'}
            ,{field: 'locNo', align: 'center',title: '库位号', style: 'font-weight: bold'}
        ];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}

 src/main/webapp/views/pakStore/locDetlQuery.html

@@ -111,8 +111,8 @@

    function getCol() {
        var cols = [
            {type: 'checkbox', merge: ['locNo']}
            ,{field: 'locNo', align: 'center',title: '库位号', merge: true, style: 'font-weight: bold'}
            {type: 'checkbox'}
            ,{field: 'locNo', align: 'center',title: '库位号',style: 'font-weight: bold'}
            // ,{field: 'locNo$', align: 'center',title: '库位号'}
        ];
        cols.push.apply(cols, detlCols);