输送线调用agv接口不传fromlocationcode

zyx

2023-10-30 b0a0b73b57e54a4e5e8cd5b8a5fa4fbc2f996656

输送线调用agv接口不传fromlocationcode

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

@@ -101,7 +101,7 @@
    @ManagerAuth(memo = "初始化库位")
    public R init(LocMastInitParam param) {
        //清空原有库位
        agvLockMastService.clearLoc();
        //agvLockMastService.clearLoc();
        //初始化一楼站点
        //agvLockMastService.initLocFloor1();
        //初始化三楼站点

 src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java

@@ -36,12 +36,16 @@
        //销售订单行号
        private String deadTime;

        public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime) {
        //料箱码
        private String suppCode;

        public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime, String suppCode) {
            this.matnr = matnr;
            this.batch = batch;
            this.count = count;
            this.threeCode = threeCode;
            this.deadTime = deadTime;
            this.suppCode = suppCode;
        }
    }

@@ -60,7 +64,7 @@
                }
            }
            if (!exit) {
                copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(), adjust.getThreeCode(), adjust.getDeadTime()));
                copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(), adjust.getThreeCode(), adjust.getDeadTime(),adjust.getSuppCode()));
            }
        }
        list = copyList;

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

@@ -34,19 +34,19 @@

    public void initLocFloor3() {
        //3楼 1-33排 1-14列 8层 ------>  1-33排 1-17列 8层
        this.insertBatch(getLocMastList(1, 33, 1, 17, 1, 8, 3));
//        this.insertBatch(getLocMastList(1, 33, 1, 17, 1, 8, 3));
//
//        //3楼 1-27排 15-34列 8层 ------>  1-26排 18-25列 8层
//        this.insertBatch(getLocMastList(1, 27, 18, 25, 1, 8, 3));
//
//        //3楼 1-25排 35-46列 8层 ------>  1-25排 26-35列 8层
//        this.insertBatch(getLocMastList(1, 25, 26, 35, 1, 8, 3));
//
//        //3楼 3-25排 47-60列 8层 ------>  1-23排 36-70列 8层
//        this.insertBatch(getLocMastList(1, 23, 36, 70, 1, 8, 3));

        //3楼 1-27排 15-34列 8层 ------>  1-26排 18-25列 8层
        this.insertBatch(getLocMastList(1, 27, 18, 25, 1, 8, 3));

        //3楼 1-25排 35-46列 8层 ------>  1-25排 26-35列 8层
        this.insertBatch(getLocMastList(1, 25, 26, 35, 1, 8, 3));

        //3楼 3-25排 47-60列 8层 ------>  1-23排 36-70列 8层
        this.insertBatch(getLocMastList(1, 23, 36, 70, 1, 8, 3));

        //3楼 4-25排 61-70列 8层
        //this.insertBatch(getLocMastList(4, 25, 61, 70, 1, 8, 3));
        //3楼 3-23排 71-72列 8层
        this.insertBatch(getLocMastList(3, 23, 71, 72, 1, 8, 3));

    }


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

@@ -402,6 +402,7 @@
            locDetl.setAppeTime(now);
            locDetl.setThreeCode(adjust.getThreeCode());
            locDetl.setDeadTime(adjust.getDeadTime());
            locDetl.setSuppCode(adjust.getSuppCode());
            if (!agvLocDetlService.insert(locDetl)) {
                throw new CoolException("添加" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码库存明细失败");
            }

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

@@ -162,6 +162,9 @@
            agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());

            //AgvTaskkDescribeParam
            if(agvWrkMast.getSourceLocNo().contains("C")){
                agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
            }
            agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
            agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
            agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
@@ -207,4 +210,13 @@

    }

    public static void main(String[] args) {
        String locationCode = "301-1";
        if(locationCode.contains("C")){
            System.out.println(true);
        }else {
            System.out.println(false);
        }
    }

}

 src/main/webapp/static/js/agvPakStore/stockAdjust.js

@@ -10,7 +10,7 @@
        ,{field: 'batch', align: 'center',title: '序列码', edit: true, style: 'font-weight:bold'}
        ,{field: 'threeCode', align: 'center',title: '销售订单号', edit: true, style: 'font-weight:bold'}
        ,{field: 'deadTime', align: 'center',title: '销售订单行号', edit: true, style: 'font-weight:bold'}
        ,{field: 'suppCode', align: 'center',title: '料箱码', edit: false, style: 'font-weight:bold'}
        ,{field: 'suppCode', align: 'center',title: '料箱码', edit: true, style: 'font-weight:bold'}
    ];
    arrRemove(detlCols, "field", "zpallet");
    arrRemove(detlCols, "field", "anfme");

 src/main/webapp/views/mat/mat.html

@@ -147,7 +147,7 @@
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary btn-modify" lay-event="edit" style="display: none">修改</a>
    <button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">打印</button>
</script>