双单位

zhangchao

2024-11-15 7c1af4c63e66754f0868c1a501f4895f9cbc9213

双单位

 pom.xml

@@ -112,6 +112,11 @@
            <artifactId>truelicense-core</artifactId>
            <version>1.33</version>
        </dependency>
            <dependency>
                <groupId>cn.hutool</groupId>
                <artifactId>hutool-core</artifactId>
                <version>5.8.26</version>
            </dependency>
    </dependencies>

    <build>

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

@@ -316,6 +316,8 @@
        //orderDetl.setbFree1(param.getBFree1());
        orderDetl.setId(param.getId());
        orderDetl.setIvouchrowno(param.getIvouchrowno());
        orderDetl.setINum(param.getINum());
        orderDetl.setIinvexchrate(param.getIinvexchrate());

        //添加单据明细到单据主体
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();

 src/main/java/com/zy/asrs/entity/OrderDetl.java

@@ -186,9 +186,9 @@
    private Double length;

    /**
     * 体积
     * 换算率
     */
    @ApiModelProperty(value= "体积")
    @ApiModelProperty(value= "换算率")
    private Double volume;

    /**

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

@@ -29,7 +29,11 @@
    private Double nflat;
    //单据日期
    private String ddate;
    //件数
    private Double iNum;

    //换算率
    private Double  iinvexchrate;
    //工单号
    private String orderNo;
    //工单号T
@@ -94,6 +98,9 @@
        private String cbMemo;
        //件数
        private Double iNum;

        //换算率
        private Double  iinvexchrate;
        //单据来源
        private String cSource;
        //生产订单号（销售订单号）

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

@@ -35,6 +35,11 @@
    private Integer states;
    //单据日期
    private String ddate;
    //件数
    private Double iNum;

    //换算率
    private Double  iinvexchrate;

    private List<OrderDetl> children;

@@ -59,6 +64,9 @@
        private String cbMemo;
        //件数
        private Double iNum;

        //换算率
        private Double  iinvexchrate;
        //单据来源
        private String cSource;
        //生产订单号（销售订单号）

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

@@ -284,8 +284,13 @@
        if (Cools.isEmpty(mat)) {
            throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
        }
        OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), detlDto.getBatch(), detlDto.getCsocode());
        AgvWaitPakin waitPakin = new AgvWaitPakin();
        waitPakin.sync(mat);
        if (orderDetl != null) {
            waitPakin.setWeight(orderDetl.getWeight());
            waitPakin.setVolume(orderDetl.getVolume());
        }
        waitPakin.setOrderNo(orderNo);   // 单据编号
        waitPakin.setBatch(detlDto.getBatch());     // 序列码
        //waitPakin.setZpallet(zpallet);   // 货架码

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

@@ -92,30 +92,30 @@
        Date now = new Date();

        agvBasDevpList.forEach(agvBasDevp -> {
            if(Cools.isEmpty(agvBasDevp.getBarcode())){
            if (Cools.isEmpty(agvBasDevp.getBarcode())) {
                throw new CoolException("选中的站点中含有未绑定货架的站点，请重新选择");
            }

            if(!"F".equals(agvBasDevp.getLocSts())){
            if (!"F".equals(agvBasDevp.getLocSts())) {
                throw new CoolException("选中的站点中含有货位状态不为F.在库的站点，请重新选择");
            }

            List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevp.getBarcode()));

            //检索库位，选择合适的库位
            AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(),agvBasDevp.getFloor(),false,false);
            AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(), agvBasDevp.getFloor(), false, false);
            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2(),agvLocMast.getPltType());
            AgvWrkMast wrkMast = createWrkMast(1, 201L, agvBasDevp.getDevNo(), agvLocMast.getLocNo(), agvBasDevp.getBarcode(), now, userId, agvBasDevp.getLocType2(), agvLocMast.getPltType());
            //标记是否为输送线入库
            wrkMast.setMk(isConveyor ? "Y" : "N");
            //生成工作档明细
            agvWaitPakinList.forEach(wp -> {
                createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
                createWrkDetlReWrite(wp.getMatnr(), wrkMast.getWrkNo(), wp.getOrderNo(), wp.getBatch(), wp.getAnfme(), wp.getSuppCode(), now, userId, wp.getThreeCode(), wp.getDeadTime(), wp.getProcessSts());
            });
            //更新源站点信息
            updateAgvBasDevp(agvBasDevp,"R");
            updateAgvBasDevp(agvBasDevp, "R");
            //更新目标库位状态
            updateAgvLocMast(agvLocMast,"S");
            updateAgvLocMast(agvLocMast, "S");

        });

@@ -146,9 +146,9 @@

            AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo);
            //判断是否全板出库
            int ioType = isPakOut(sourceLocNo,taskDto) ?  101 : 103;
            int ioType = isPakOut(sourceLocNo, taskDto) ? 101 : 103;
            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType());
            AgvWrkMast wrkMast = createWrkMast(ioType, wrkSts, sourceLocNo, targetLocNo, containerCode, now, userId, Short.valueOf(containerCode.substring(0, 2)), agvLocMast.getPltType());
            //生成工作档明细
            long flowId = snowflakeIdWorker.nextId();
            taskDto.getLocDtos().forEach(locDto -> {
@@ -195,7 +195,7 @@
//                        throw new CoolException("同步半成品调拨单流水记录失败");
//                    }

                }else {
                } else {
                    List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
                    orderDtoList.forEach(orderDto -> {
                        //明细档所需参数
@@ -221,10 +221,10 @@
//            modifyOrderDetl(taskDto.getLocDtos().get(0), userId);
            //更新源站点信息
            String locSts = ioType == 101 ? "R" : "P";
            updateAgvLocMast(agvLocMastService.selectById(sourceLocNo),locSts);
            updateAgvLocMast(agvLocMastService.selectById(sourceLocNo), locSts);
            //更新目标站点状态
            //locSts = ioType == 101 ? "S" : "Q";
            updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo),"S");
            updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo), "S");

        });
    }
@@ -254,7 +254,7 @@
            //判断是否全板出库
            int ioType = 107;
            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType());
            AgvWrkMast wrkMast = createWrkMast(ioType, wrkSts, sourceLocNo, targetLocNo, containerCode, now, userId, Short.valueOf(containerCode.substring(0, 2)), agvLocMast.getPltType());
            //生成工作档明细
            long flowId = snowflakeIdWorker.nextId();
            taskDto.getLocDtos().forEach(locDto -> {
@@ -300,7 +300,7 @@
//                    if (!flowLogService.insert(flowLog)) {
//                        throw new CoolException("同步半成品调拨单流水记录失败");
//                    }
                }else {
                } else {
                    List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
                    orderDtoList.forEach(orderDto -> {
                        //明细档所需参数
@@ -325,17 +325,17 @@
//            modifyOrderDetl(taskDto.getLocDtos().get(0), userId);
            //更新源站点信息
            String locSts = "R";
            updateAgvLocMast(agvLocMastService.selectById(sourceLocNo),locSts);
            updateAgvLocMast(agvLocMastService.selectById(sourceLocNo), locSts);
            //更新目标站点状态
            //locSts = ioType == 101 ? "S" : "Q";
            updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo),"S",Short.valueOf(containerCode.substring(0,2)),containerCode);
            updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo), "S", Short.valueOf(containerCode.substring(0, 2)), containerCode);

        });
    }

    //拣料入库
    @Transactional
    public void pickIn(List<AgvWrkMast> agvWrkMastList){
    public void pickIn(List<AgvWrkMast> agvWrkMastList) {
        Date now = new Date();
        agvWrkMastList.forEach(agvWrkMast -> {

@@ -361,11 +361,11 @@
            List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
            for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) {
                agvWrkDetl.setIoTime(now);
                boolean bl = agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>()
                boolean bl = agvWrkDetlService.update(agvWrkDetl, new EntityWrapper<AgvWrkDetl>()
                        .eq("wrk_no", agvWrkDetl.getWrkNo())
                        .eq("matnr",agvWrkDetl.getMatnr())
                        .eq("order_no",agvWrkDetl.getOrderNo())
                        .eq("three_code",agvWrkDetl.getThreeCode()));
                        .eq("matnr", agvWrkDetl.getMatnr())
                        .eq("order_no", agvWrkDetl.getOrderNo())
                        .eq("three_code", agvWrkDetl.getThreeCode()));
//                        .eq("dead_time",agvWrkDetl.getDeadTime()));
            }
            AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
@@ -387,9 +387,9 @@
            //    });
            //}
            //修改库位信息
            updateAgvLocMast(agvLocMast,"Q");
            updateAgvLocMast(agvLocMast, "Q");
            //修改站点信息
            updateAgvBasDevp(agvBasDevp,"R");
            updateAgvBasDevp(agvBasDevp, "R");

        });
    }
@@ -403,11 +403,11 @@

        List<TaskDto> taskDtos = new ArrayList<>();
        param.getLocDetls().forEach(locDetl -> {
            LocDto locDto = new LocDto(locDetl.getLocNo(),locDetl.getCount(),locDetl.getMatnr(),locDetl.getBatch(),locDetl.getThreeCode(),locDetl.getDeadTime(),locDetl.getSuppCode(), locDetl.getProcessSts());
            TaskDto taskDto = new TaskDto(locDetl.getLocNo(),station,locDto);
            if(TaskDto.has(taskDtos,taskDto)){
                TaskDto.find(taskDtos,taskDto).getLocDtos().add(locDto);
            }else {
            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getCount(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getThreeCode(), locDetl.getDeadTime(), locDetl.getSuppCode(), locDetl.getProcessSts());
            TaskDto taskDto = new TaskDto(locDetl.getLocNo(), station, locDto);
            if (TaskDto.has(taskDtos, taskDto)) {
                TaskDto.find(taskDtos, taskDto).getLocDtos().add(locDto);
            } else {
                taskDtos.add(taskDto);
            }
        });
@@ -417,14 +417,14 @@

            //判断是否有重复料想的工作当
            AgvWrkMast agvWrkMastList = agvWrkMastService.selectByContainerCode(taskDto.getLocDtos().get(0).getContainerCode());
            if(!Cools.isEmpty(agvWrkMastList)){
            if (!Cools.isEmpty(agvWrkMastList)) {
                return;
            }

            int containerType = getContainerTypeByloc(taskDto.getLocNo());

            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType,null);
            AgvWrkMast wrkMast = createWrkMast(107, 21L, taskDto.getLocNo(), taskDto.getAgvStaNo(), taskDto.getLocDtos().get(0).getContainerCode(), now, userId, containerType, null);
            //生成工作档明细
            taskDto.getLocDtos().forEach(locDto -> {
                //明细档所需参数
@@ -440,10 +440,10 @@
                        locDto.getIsoseq(),
                        locDto.getProcessSts());
            });
            updateAgvLocMast(agvLocMastService.selectById(wrkMast.getSourceLocNo()),"P");
            updateAgvLocMast(agvLocMastService.selectById(wrkMast.getSourceLocNo()), "P");
            //更新目标站点状态
            //locSts = ioType == 101 ? "S" : "Q";
            updateAgvBasDevp(agvBasDevpService.selectById(wrkMast.getLocNo()),"S");
            updateAgvBasDevp(agvBasDevpService.selectById(wrkMast.getLocNo()), "S");
        });

    }
@@ -457,30 +457,30 @@
        AgvLocMast targetLocMast = agvLocMastService.selectById(targetLocNo);
        AgvLocDetl sourceLocDetl = agvLocDetlService.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", sourceLocMast.getLocNo()));

        if(!sourceLocMast.getLocSts().equals("F")){
            throw new CoolException(sourceLocMast.getLocNo() + "源库位出库失败，状态："+sourceLocMast.getLocSts$());
        if (!sourceLocMast.getLocSts().equals("F")) {
            throw new CoolException(sourceLocMast.getLocNo() + "源库位出库失败，状态：" + sourceLocMast.getLocSts$());
        }
        if(!targetLocMast.getLocSts().equals("O")){
            throw new CoolException("移转失败，目标库位状态："+targetLocMast.getLocSts$());
        if (!targetLocMast.getLocSts().equals("O")) {
            throw new CoolException("移转失败，目标库位状态：" + targetLocMast.getLocSts$());
        }

        Date now = new Date();

        //生成移库工作档
        AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo),targetLocMast.getPltType());
        AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId, getContainerTypeByloc(sourceLocNo), targetLocMast.getPltType());
        //生成工作党明细
        createWrkDetlReWrite(sourceLocDetl.getMatnr(),wrkMast.getWrkNo(),null,sourceLocDetl.getBatch(),sourceLocDetl.getAnfme(),sourceLocDetl.getZpallet(),now,userId,sourceLocDetl.getThreeCode(),sourceLocDetl.getDeadTime(),sourceLocDetl.getProcessSts());
        createWrkDetlReWrite(sourceLocDetl.getMatnr(), wrkMast.getWrkNo(), null, sourceLocDetl.getBatch(), sourceLocDetl.getAnfme(), sourceLocDetl.getZpallet(), now, userId, sourceLocDetl.getThreeCode(), sourceLocDetl.getDeadTime(), sourceLocDetl.getProcessSts());
        //修改目标库位状态
        updateAgvLocMast(targetLocMast,"S");
        updateAgvLocMast(targetLocMast, "S");
        //修改原库位状态
        updateAgvLocMast(sourceLocMast,"R");
        updateAgvLocMast(sourceLocMast, "R");
    }

    /*
    入库
     */
    @Transactional
    public String emptyPlateIn(String station,String containerCode,Short containerType, Long userId, boolean emptyAutoIn) {
    public String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn) {

        Date now = new Date();

@@ -488,7 +488,7 @@

        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
        if (Cools.isEmpty(agvBasDevp)) {
            throw new CoolException("暂无"+ station + "站点");
            throw new CoolException("暂无" + station + "站点");
        }
        int br = 0;
        if (containerType == 21 && agvBasDevp.getFloor() == 2) {
@@ -529,13 +529,13 @@
            locType = agvBasDevp.getLocType1();
        }

        if(!Cools.eq(agvBasDevp.getBarcode(),containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn){
            throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts()+",无法进行入库");
        if (!Cools.eq(agvBasDevp.getBarcode(), containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn) {
            throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts() + ",无法进行入库");
        }

        //查询工作档
        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
        if(!Cools.isEmpty(agvWrkMast) && !emptyAutoIn){
        if (!Cools.isEmpty(agvWrkMast) && !emptyAutoIn) {
            throw new CoolException("当前货架已有入库任务，无法进行入库");
        }

@@ -550,7 +550,7 @@

        //查询入库通知档
        List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
        if(!Cools.isEmpty(agvWaitPakinList)){
        if (!Cools.isEmpty(agvWaitPakinList)) {
            AtomicBoolean isCurrLev = new AtomicBoolean(false);
            agvWaitPakinList.forEach(agvWaitPakin -> {
                if (!Cools.isEmpty(agvWaitPakin.getProcessSts())) {
@@ -564,19 +564,19 @@
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "elevatorTasks"));
            if (Cools.isEmpty(config)) {
                if (isCurrLev.get()) {
                    agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
                    agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
                } else {
                    agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
                    agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
                }
            } else {
                List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
                if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
                    agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
                    agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
                } else {
                    if (isCurrLev.get()) {
                        agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
                        agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
                    } else {
                        agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
                        agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
                    }
                    //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
                }
@@ -586,31 +586,31 @@
            String locNo = agvLocMast.getLocNo();

            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType,agvLocMast.getPltType());
            AgvWrkMast wrkMast = createWrkMast(1, 201L, devNo, locNo, containerCode, now, userId, containerType, agvLocMast.getPltType());
            //生成工作档明细
            long flowId = snowflakeIdWorker.nextId();
            agvWaitPakinList.forEach(wp -> {
                createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
                createWrkDetlReWrite(wp.getMatnr(), wrkMast.getWrkNo(), wp.getOrderNo(), wp.getBatch(), wp.getAnfme(), wp.getSuppCode(), now, userId, wp.getThreeCode(), wp.getDeadTime(), wp.getProcessSts());
            });
            //修改入库通知档状态
            agvWaitPakinService.updateIoStatus(containerCode,"Y");
            agvWaitPakinService.updateIoStatus(containerCode, "Y");
            //更新源站点状态
            updateAgvBasDevp(agvBasDevp,"R",containerType);
        }else {
            updateAgvBasDevp(agvBasDevp, "R", containerType);
        } else {
            //查询工作档
            AgvWrkMast agvWrkMast1 = agvWrkMastService.selectByContainerCode(containerCode);
            if (!Cools.isEmpty(agvWrkMast1)) {
                throw new CoolException("当前货架已有入库任务，无法进行入库");
            }
            agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),true,true);
            agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), true, true);
            // 生成工作档 10.空板入库
            createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType,agvLocMast.getPltType());
            createWrkMast(10, 201L, agvBasDevp.getDevNo(), agvLocMast.getLocNo(), containerCode, now, userId, containerType, agvLocMast.getPltType());
            //更新源站点状态
            updateAgvBasDevp(agvBasDevp,"R",containerType,containerCode);
            updateAgvBasDevp(agvBasDevp, "R", containerType, containerCode);
        }

        //更新目标库位状态和信息
        updateAgvLocMast(agvLocMast,"S");
        updateAgvLocMast(agvLocMast, "S");
        return agvLocMast.getLocNo();
    }

@@ -623,17 +623,17 @@

        // 站点检测
        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
        if(!agvBasDevp.getLocSts().equals("O")){
            throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts()+",无法进行空板出库");
        if (!agvBasDevp.getLocSts().equals("O")) {
            throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts() + ",无法进行空板出库");
        }
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvBasDevp.getDevNo()));
        if(!Cools.isEmpty(agvWrkMast)){
            throw new CoolException("有货架在往站点搬运" + agvBasDevp.getDevNo()+",无法进行空板出库");
        if (!Cools.isEmpty(agvWrkMast)) {
            throw new CoolException("有货架在往站点搬运" + agvBasDevp.getDevNo() + ",无法进行空板出库");
        }

        //寻找相应类型的空货架
        AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType,agvBasDevp.getFloor());
        if(containerType == 0){
        AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, agvBasDevp.getFloor());
        if (containerType == 0) {
            //空板自动出库，根据站点类型选择
            agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());

@@ -643,13 +643,13 @@
            throw new CoolException("暂无当前出库站点类型的空货架！");
        }
        //生成工作档
        createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType,agvLocMast.getPltType());
        createWrkMast(110, 21L, agvLocMast.getLocNo(), agvBasDevp.getDevNo(), agvLocMast.getBarcode(), now, userId, containerType, agvLocMast.getPltType());

        //修改源库位状态
        updateAgvLocMast(agvLocMast,"R");
        updateAgvLocMast(agvLocMast, "R");

        //修改站点状态
        updateAgvBasDevp(agvBasDevp,"S",(short)containerType,agvLocMast.getBarcode());
        updateAgvBasDevp(agvBasDevp, "S", (short) containerType, agvLocMast.getBarcode());

    }

@@ -677,12 +677,14 @@
            Iterator<LocDetlAdjustParam.LocDetlAdjust> iterator1 = list.iterator();
            while (iterator1.hasNext()) {
                LocDetlAdjustParam.LocDetlAdjust adjust = iterator1.next();
                if (adjust.getCount() == 0) { continue; }
                if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch()) && Cools.eq(locDetl.getSuppCode(),adjust.getSuppCode()) && Cools.eq(locDetl.getThreeCode(),adjust.getThreeCode()) && Cools.eq(locDetl.getDeadTime(),adjust.getDeadTime())) {
                if (adjust.getCount() == 0) {
                    continue;
                }
                if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch()) && Cools.eq(locDetl.getSuppCode(), adjust.getSuppCode()) && Cools.eq(locDetl.getThreeCode(), adjust.getThreeCode()) && Cools.eq(locDetl.getDeadTime(), adjust.getDeadTime())) {
                    if (!locDetl.getAnfme().equals(adjust.getCount()) || !locDetl.getProcessSts().equals(adjust.getProcessSts())) {
                        // todo 盘点记录
                        // 修改库存
                        if (!agvLocDetlService.updateAnfmeProcess(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getThreeCode(),locDetl.getDeadTime(),adjust.getProcessSts())) {
                        if (!agvLocDetlService.updateAnfmeProcess(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getThreeCode(), locDetl.getDeadTime(), adjust.getProcessSts())) {
                            throw new CoolException(locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码修改数量失败");
                        }
                        // 保存调整记录
@@ -714,7 +716,7 @@
        // 删除库存
        for (AgvLocDetl locDetl : locDetls) {
            // todo 盘点记录
            if (!agvLocDetlService.updateAnfmeProcess(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getThreeCode(),locDetl.getDeadTime(),locDetl.getProcessSts())) {
            if (!agvLocDetlService.updateAnfmeProcess(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getThreeCode(), locDetl.getDeadTime(), locDetl.getProcessSts())) {
                throw new CoolException("删除" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码库存明细失败");
            }
            // 保存调整记录
@@ -736,7 +738,9 @@

        // 添加库存
        for (LocDetlAdjustParam.LocDetlAdjust adjust : list) {
            if (adjust.getCount() == 0.0D) { continue; }
            if (adjust.getCount() == 0.0D) {
                continue;
            }
            Mat mat = matService.selectByMatnr(adjust.getMatnr());
            AgvLocDetl locDetl = new AgvLocDetl();
            locDetl.sync(mat);
@@ -796,17 +800,17 @@
    @Transactional
    public void completeWrkMast(String workNo, Long userId) {
        AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo);
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException(workNo + "工作档不存在");
        }
        if (wrkMast.getIoType() == 113 && (wrkMast.getWrkSts() != 212L || wrkMast.getWrkSts() != 213L || wrkMast.getWrkSts() != 214L)) {
            throw new CoolException(workNo+"不支持手动维护");
            throw new CoolException(workNo + "不支持手动维护");
        }
        if (wrkMast.getIoType()==121){
            if (wrkMast.getWrkSts()<12L){
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
            }else if (wrkMast.getWrkSts()==12L){
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),12,"手动完成",userId);
        if (wrkMast.getIoType() == 121) {
            if (wrkMast.getWrkSts() < 12L) {
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 205, "手动完成", userId);
            } else if (wrkMast.getWrkSts() == 12L) {
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 12, "手动完成", userId);

                WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", workNo));
                wrkMastExecute.setWrkSts(3L);
@@ -815,47 +819,47 @@
            }
            return;

        } else  {
            if(wrkMast.getIoType() == 110){
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),206,"手动完成",userId);
        } else {
            if (wrkMast.getIoType() == 110) {
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 206, "手动完成", userId);
            } else {
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 205, "手动完成", userId);
            }
        }

        //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库
        if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 111){
        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 111) {
            //修改出库站点状态
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(), "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
        }
        if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 ){
        if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53) {
            //修改出库站点状态
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O","",wrkMast.getWhsType().shortValue());
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(), "O", "", wrkMast.getWhsType().shortValue());
        }
        //出库任务 110.空板出库

        if (wrkMast.getIoType() == 10) {
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(), "O", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
        }

    }

    @Transactional
    public void cancelWrkMast(String workNo, Long userId,Integer type) {
    public void cancelWrkMast(String workNo, Long userId, Integer type) {
        AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo);
        long flowId = snowflakeIdWorker.nextId();
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException(workNo + "工作档不存在");
        }
        if (wrkMast.getIoType()==121){
            if (wrkMast.getWrkSts()<12L){
        if (wrkMast.getIoType() == 121) {
            if (wrkMast.getWrkSts() < 12L) {
                //源库位
                String locNo = wrkMast.getSourceLocNo();

                // 目标库位
                String targetLocNo = wrkMast.getLocNo();
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
                agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);

                wrkMast.setModiUser(userId);
                wrkMast.setModiTime(new Date());
@@ -872,7 +876,7 @@


                //删除工作档以及明细
                if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
                if (!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())) {
                    throw new CoolException("删除失败，请联系管理员");
                }

@@ -880,26 +884,26 @@
                    //调用agv取消任务接口
                    agvWrkMastService.callCancelTask(wrkMast.getWrkNo());
                }
            }else {
            } else {
                throw new CoolException("当前任务正在执行，不可取消");
            }
        }else {
        } else {
            //拣料入库 盘点入库不可取消
            if(wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){
            if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
                throw new CoolException("当前任务不可取消");
            }

            //入库取消
            if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 58){
            if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 58) {
                //源站点
                String devNo = wrkMast.getSourceLocNo();
                //目标库位
                String locNo = wrkMast.getLocNo();
                agvLocMastService.updateLocStsByLocNo(locNo,"O","",null);
                agvLocMastService.updateLocStsByLocNo(locNo, "O", "", null);
                if (wrkMast.getIoType() == 58) {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
                } else {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",wrkMast.getWhsType().shortValue());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "O", "", wrkMast.getWhsType().shortValue());
                }

                if (wrkMast.getIoType() == 1) {
@@ -941,7 +945,7 @@
//                            throw new CoolException("同步半成品调拨单流水记录失败");
//                        }
                        // 删除组托档
                        if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSuppCode()).eq("matnr",agvWaitPakin.getMatnr()).eq("three_code",agvWaitPakin.getThreeCode()))) {
                        if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvWaitPakin.getSuppCode()).eq("matnr", agvWaitPakin.getMatnr()).eq("three_code", agvWaitPakin.getThreeCode()))) {
                            throw new CoolException("入库通知档取消失败");
                        }
                    }
@@ -951,14 +955,14 @@


                // 移库取消
            } else if( wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
            } else if (wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
                //源库位
                String locNo = wrkMast.getSourceLocNo();

                // 目标库位
                String targetLocNo = wrkMast.getLocNo();
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
                agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
                // 源库位 库位主档
                AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
                AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
@@ -1004,7 +1008,7 @@
                }

                // 自动调拨出库取消
            } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111 || wrkMast.getIoType() == 112) {
            } else if (wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111 || wrkMast.getIoType() == 112) {
                if (wrkMast.getIoType() == 112) {
                    throw new CoolException("当前作业不能取消！");
                }
@@ -1072,8 +1076,8 @@
                String locNo = wrkMast.getSourceLocNo();
                // 目标库位
                String targetLocNo = wrkMast.getLocNo();
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
                agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
                // 源库位 库位主档
                AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
                AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
@@ -1093,61 +1097,61 @@
                //目标站点
                String devNo = wrkMast.getLocNo();
                if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 109) {
                    if (wrkMast.getIoType() == 109){
                    if (wrkMast.getIoType() == 109) {
                        // 源库位是站点
                        if ("DB".equals(locNo.substring(0,2))) {
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                            agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
                        if ("DB".equals(locNo.substring(0, 2))) {
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
                            agvLocMastService.updateLocStsByLocNo(devNo, "O", "", null);
                            // 源库位是库位 目标库位是站点
                        } else if ("DB".equals(devNo.substring(0,2))) {
                            agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"O","",null);
                        } else if ("DB".equals(devNo.substring(0, 2))) {
                            agvLocMastService.updateLocStsByLocNo(locNo, "D", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "O", "", null);
                            // 源库位是库位
                        } else {
                            agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                            agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
                            agvLocMastService.updateLocStsByLocNo(locNo, "D", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
                            agvLocMastService.updateLocStsByLocNo(devNo, "O", "", null);
                        }

                    }else {
                        agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
                    } else {
                        agvLocMastService.updateLocStsByLocNo(locNo, "D", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "O", "", null);
                    }
                } else if (wrkMast.getIoType() == 113) {
                    if (wrkMast.getWrkSts() == 212 || wrkMast.getWrkSts() == 213) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
                    } else {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
                        if (!Cools.isEmpty(devNo)) {
                            agvLocMastService.updateLocStsByLocNo(devNo,"0","",null);
                            agvLocMastService.updateLocStsByLocNo(devNo, "0", "", null);
                        }
                    }

                } else  {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
                    agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                } else {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "O", "", null);
                    agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
                }

            }

            if(wrkMast.getIoType() != 114 && wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){
            if (wrkMast.getIoType() != 114 && wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType() != 111 && wrkMast.getIoType() != 108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11) {
                //订单回滚
                //List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                agvWrkDetlList1.forEach(agvWrkDetl -> {

                    if(!Cools.isEmpty(agvWrkDetl.getOrderNo())){
                    if (!Cools.isEmpty(agvWrkDetl.getOrderNo())) {
                        String orderNo = agvWrkDetl.getOrderNo();
                        if(orderNo.contains("{")){
                        if (orderNo.contains("{")) {
                            JSONArray orderArray = JSON.parseArray(orderNo);
                            for (Object o : orderArray){
                            for (Object o : orderArray) {
                                JSONObject jsonobject = (JSONObject) o;
                                OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                                OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                                orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
                                orderDetlService.updateById(orderDetl);
                            }

                        }else {
                            OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                        } else {
                            OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                            orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
                            orderDetlService.updateById(orderDetl);
                        }
@@ -1169,7 +1173,7 @@


            //删除工作档以及明细
            if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
            if (!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())) {
                throw new CoolException("删除失败，请联系管理员");
            }

@@ -1183,7 +1187,7 @@
    /*
    更新目标库位信息
     */
    private void updateAgvLocMast(AgvLocMast locMast, String locSts){
    private void updateAgvLocMast(AgvLocMast locMast, String locSts) {
        locMast.setLocSts(locSts);
        locMast.setModiTime(new Date());
        agvLocMastService.updateById(locMast);
@@ -1192,7 +1196,7 @@
    /*
    更新目标库位信息和库位货架类型
     */
    private void updateAgvLocMast(AgvLocMast locMast, String locSts, short type){
    private void updateAgvLocMast(AgvLocMast locMast, String locSts, short type) {
        locMast.setLocSts(locSts);
        locMast.setLocType2(type);
        locMast.setModiTime(new Date());
@@ -1202,8 +1206,8 @@
    /*
    更新源站点信息
     */
    private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts){
        if(!Cools.isEmpty(agvBasDevp)){
    private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts) {
        if (!Cools.isEmpty(agvBasDevp)) {
            agvBasDevp.setLocSts(locSts);
            agvBasDevpService.updateById(agvBasDevp);
        }
@@ -1212,16 +1216,16 @@
    /*
    更新源站点信息和库位货架类型
     */
    private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType){
        if(!Cools.isEmpty(agvBasDevp)){
    private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType) {
        if (!Cools.isEmpty(agvBasDevp)) {
            agvBasDevp.setLocSts(locSts);
            agvBasDevp.setLocType2(continerType);
            agvBasDevpService.updateById(agvBasDevp);
        }
    }

    private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
        if(!Cools.isEmpty(agvBasDevp)){
    private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode) {
        if (!Cools.isEmpty(agvBasDevp)) {
            agvBasDevp.setLocSts(locSts);
            agvBasDevp.setLocType2(continerType);
            agvBasDevp.setBarcode(containerCode);
@@ -1232,13 +1236,18 @@
    /*
    生成工作档明细
     */
    private void createWrkDetlReWrite(String matnr, int wrkNo, String orderNo,String batch, double anfme, String zpallet, Date now, Long userId, String csocode, String isoseq,Integer processSts){
    private void createWrkDetlReWrite(String matnr, int wrkNo, String orderNo, String batch, double anfme, String zpallet, Date now, Long userId, String csocode, String isoseq, Integer processSts) {
        Mat mat = matService.selectByMatnr(matnr);
        if (Cools.isEmpty(mat)) {
            throw new CoolException(matnr + "商品维护失败");
        }
        OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), batch, csocode);
        AgvWrkDetl wrkDetl = new AgvWrkDetl();
        wrkDetl.sync(mat);
        if (orderDetl != null) {
            wrkDetl.setWeight(orderDetl.getWeight());
            wrkDetl.setVolume(orderDetl.getVolume());
        }
        wrkDetl.setWrkNo(wrkNo);
        wrkDetl.setOrderNo(orderNo);
        wrkDetl.setIoTime(now);
@@ -1262,7 +1271,7 @@
    生成工作档明细
     */
    @Deprecated
    private void createWrkDetlReWrite(List<AgvWaitPakin> agvWaitPakinList, AgvWrkMast wrkMast, Long userId){
    private void createWrkDetlReWrite(List<AgvWaitPakin> agvWaitPakinList, AgvWrkMast wrkMast, Long userId) {
        Date now = new Date();
        agvWaitPakinList.stream().forEach(agvWaitPakin -> {
            Mat mat = matService.selectByMatnr(agvWaitPakin.getMatnr());
@@ -1271,6 +1280,9 @@
            }
            AgvWrkDetl wrkDetl = new AgvWrkDetl();
            wrkDetl.sync(mat);
            wrkDetl.setWeight(agvWaitPakin.getWeight());
            wrkDetl.setVolume(agvWaitPakin.getVolume());

            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setOrderNo(agvWaitPakin.getOrderNo());
            wrkDetl.setIoTime(now);
@@ -1290,7 +1302,7 @@
    /*
    生成工作档
     */
    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode,  Date now, Long userId, int containerType,Integer pltType){
    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, Integer pltType) {
        AgvWrkMast wrkMast = new AgvWrkMast();
        //工作状态
        wrkMast.setWrkSts(wrkSts);
@@ -1322,19 +1334,19 @@
        //暂存位任务+1
        addInQty(locNo);

        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo));

        return wrkMast;
    }

    private boolean isPakOut(String locNo, TaskDto taskDto){
    private boolean isPakOut(String locNo, TaskDto taskDto) {
        Double allAnfme = agvLocDetlService.selectSumAnfmeByLocNo(locNo);
        Double pakOutAnfme = 0.0;
        for (LocDto locDto : taskDto.getLocDtos()){
        for (LocDto locDto : taskDto.getLocDtos()) {
            pakOutAnfme += locDto.getAnfme();
        }

        if(allAnfme > pakOutAnfme){
        if (allAnfme > pakOutAnfme) {
            return false;
        }
        return true;
@@ -1344,19 +1356,19 @@
    AGV生成出库工作档后修改订单信息
    TODO 与四项库生成出库工作档后修改订单信息整合到一起
     */
    private void modifyOrderDetl(LocDto locDto, Long userId){
    private void modifyOrderDetl(LocDto locDto, Long userId) {

        if (!BaseController.isJSON(locDto.getOrderNo())) {
            //非合并出库
            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
            if (orderDetl == null) {
                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getCsocode(), locDto.getIsoseq());
            }
            if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(),locDto.getCsocode(),locDto.getIsoseq())) {
            if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(), locDto.getCsocode(), locDto.getIsoseq())) {
                throw new CoolException("修改订单明细数量失败");
            }
            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
        }else {
        } else {
            //合并出库
            List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);

@@ -1366,20 +1378,20 @@
            Double orderAnfme;

            for (OrderDto orderDto : orderDtoList) {
                OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
                OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                if (orderDetl == null) {
                    orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
                    orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null, locDto.getCsocode(), locDto.getIsoseq());
                }

                orderAnfme = orderDetl.getAnfme() - orderDetl.getQty();

                if(locAnfme > orderAnfme){
                if (locAnfme > orderAnfme) {
                    locAnfme -= orderAnfme;
                }else {
                } else {
                    orderAnfme = locAnfme;
                }

                if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderAnfme,orderDetl.getThreeCode(),orderDetl.getDeadTime())) {
                if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderAnfme, orderDetl.getThreeCode(), orderDetl.getDeadTime())) {
                    throw new CoolException("修改订单明细数量失败");
                }
                orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
@@ -1400,30 +1412,30 @@
        if (wrkMast.getIoType() == 108) {
            wrkMast.setIoType(111);
            wrkMast.setModiTime(new Date());
            agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
        } else if(wrkMast.getIoType() == 111) {
            agvWrkMastService.update(wrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
        } else if (wrkMast.getIoType() == 111) {
            wrkMast.setIoType(108);
            wrkMast.setModiTime(new Date());
            agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
            agvWrkMastService.update(wrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
        }


    }

    private void addInQty(String devno){
    private void addInQty(String devno) {
        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devno);
        if(!Cools.isEmpty(agvBasDevp)){
            if(Cools.isEmpty(agvBasDevp.getInQty())){
        if (!Cools.isEmpty(agvBasDevp)) {
            if (Cools.isEmpty(agvBasDevp.getInQty())) {
                agvBasDevp.setInQty(1);
            }else {
            } else {
                agvBasDevp.setInQty(agvBasDevp.getInQty() + 1);
            }
        }
    }

    private int getContainerTypeByloc(String locNo){
    private int getContainerTypeByloc(String locNo) {

        return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no",locNo)).getLocType2();
        return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo)).getLocType2();

    }


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

@@ -1021,7 +1021,11 @@
        //销售订单号
        od.setThreeCode(odParam.getCDefine22());
        //自由项
        od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
        if (!Cools.isEmpty(odParam.getBatch()) || !Cools.isEmpty(odParam.getBFree1())) {
            od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
        }
        od.setWeight(odParam.getINum());
        od.setVolume(odParam.getIinvexchrate());
        //IDs
        od.setSku(odParam.getId());


 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -81,9 +81,9 @@
    }

    //@Scheduled(cron = "* 0/5 * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    public void reportOrder() {
    public synchronized void  reportOrder() {
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
        orderList.forEach(order -> {
            orderSyncHandler.timelyStart(order);

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -1,5 +1,7 @@
package com.zy.asrs.task.handler;

import cn.hutool.core.util.NumberUtil;
import com.alibaba.excel.util.NumberUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
@@ -22,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -150,8 +153,11 @@
                if (s.length > 1) {
                    childInfo.setCBatch(s[0]);
                    childInfo.setBFree1(s[1]);
                } else {
                } else if (s.length == 1) {
                    childInfo.setCBatch(s[0]);
                    childInfo.setBFree1("");
                } else {
                    childInfo.setCBatch("");
                    childInfo.setBFree1("");
                }
            }
@@ -161,7 +167,13 @@
            childInfo.setCOrderCode(orderDetl.getOrderNo());
            childInfo.setIvouchrowno(orderDetl.getItemNum());
            childInfo.setDefine22(orderDetl.getThreeCode());

            if (!Cools.isEmpty(orderDetl.getWeight()) && !Cools.isEmpty(orderDetl.getVolume())) {
                BigDecimal mul = NumberUtil.div(childInfo.getIQuantity(), orderDetl.getVolume() + "");
                childInfo.setINum(mul.toString());
            } else {
                childInfo.setINum("1");
            }
            childInfo.setIinvexchrate(Cools.isEmpty(orderDetl.getVolume()) ? "" : orderDetl.getVolume() + "");
            paramChild.add(childInfo);
        }


 src/main/resources/application-dev.yml

@@ -37,7 +37,7 @@
  path: /stock/out/@pom.build.finalName@/logs

super:
  pwd: xltys1995
  pwd: xltys2024

swagger:
  enable: false

 src/main/resources/application-loc.yml

@@ -37,7 +37,7 @@
  path: stock/out/@pom.build.finalName@/logs

super:
  pwd: xltys1995
  pwd: xltys2024

swagger:
  enable: false

 src/main/resources/application-prod.yml

@@ -37,7 +37,7 @@
  path: /stock/out/@pom.build.finalName@/logs

super:
  pwd: xltys1995
  pwd: xltys2024

swagger:
  enable: false

 src/main/resources/application.yml

@@ -1,4 +1,4 @@
spring:
  profiles:
    #dev loc prod
    active: dev
    active: loc

 src/main/webapp/static/js/orderLog/order.js

@@ -44,22 +44,24 @@
        cellMinWidth: 100,
        cols: [[
            {type: 'numbers'},
            {field: 'defNumber', align: 'center', title: '操作系统号', hide: false, width: 120},
            {field: '操作单据', align: 'center', title: '操作单据', hide: true},
            {field: '操作类型', align: 'center', title: '操作类型', hide: true},
            {field: 'orderNo', title: '单据编号', templet: '#orderNoTpl'},
            {field: 'itemName', align: 'center', title: '核算主体'},
            //{field: 'itemName', align: 'center', title: '核算主体'},
            {field: 'docType$', align: 'center', title: '单据类型'},
            {field: 'defNumber', align: 'center', title: '业务类型'},
            //{field: 'defNumber', align: 'center', title: '业务类型'},
            //{field: 'postFee', align: 'center', title: '总数量',  minWidth: 130, width: 130},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160},
            {field: 'createTime$', title: '创建时间'},
            {field: 'createTime$', title: '创建时间', hide: true},
            {field: 'orderTime', align: 'center',title: '单据日期'},
            {field: 'shipCode', align: 'center',title: '制单人', hide: false},
            {field: 'settle$', align: 'center', title: '状态', templet: '#settleTpl',  minWidth: 160, width: 160},
            {field: 'memo', align: 'center',title: '备注', hide: true},
            {field: 'orderTime', align: 'center',title: '单据日期', hide: true},
            {field: 'cstmrName', align: 'center',title: '供应商/客户编码', hide: true},
            {field: 'tel', align: 'center',title: '仓库', hide: true},
            {field: 'operMemb', align: 'center',title: '出入库类别', hide: true},
            {field: 'salesman', align: 'center',title: '部门', hide: true},
            {field: 'shipCode', align: 'center',title: '制单人', hide: true},
            //{align: 'center', title: '操作', toolbar: '#operate', width: 180}
        ]],
        request: {
            pageName: 'curr',
@@ -139,9 +141,9 @@
                        page: true,
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matnr', title: '商品编码', width: 160},
                            {field: 'maktx', title: '商品名称', width: 160},
                            //{type: 'numbers'},
                            {field: 'matnr', title: '商品编码', width: 140},
                            {field: 'maktx', title: '商品名称', width: 150},
                            {field: 'batch', title: '批号'},
                            {field: 'anfme', title: '数量'},
                            {field: 'qty', title: '作业数量', style: 'font-weight: bold'},
@@ -153,12 +155,15 @@
                            // },
                            // {field: 'inQty', title: '已入库量'},
                            // {field: 'color', title: '颜色'},
                            {field: 'specs', title: '规格型号'},
                            //{field: 'specs', title: '规格型号'},
                            {field: 'unit', title: '计量单位'},
                            {field: 'manu', title: '行号'},
                            {field: 'threeCode', title: '销售订单号'},
                            {field: 'deadTime', title: '销售订单行号'},
                            {field: 'itemNum', title: '行唯一标识'}
                            //{field: 'manu', title: '行号'},
                            {field: 'threeCode', title: '销售单号'},
                            //{field: 'deadTime', title: '自由项'},
                            {field: 'processSts$', title: '工序'},
                            //{field: 'specs', title: '规格'},
                            {field: 'reportQty', title: '上报数量'},
                            //{field: 'itemNum', title: '行唯一标识'}
                        ]],
                        request: {
                            pageName: 'curr',
@@ -185,336 +190,7 @@
        }
    });

    // 显示表单弹窗
    function showEditModel(expTpe) {
        admin.open({
            type: 1,
            title: (expTpe ? '修改' : '添加') + '单据',
            content: $('#editDialog').html(),
            area: '1300px',
            success: function (layero, dIndex) {
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                var isExpAdd = !expTpe;
                // 回显数据
                form.val('editForm', expTpe);
                if (expTpe) {
                    $('#orderNo').attr("disabled", "disabled");
                }
                // 表单提交事件
                form.on('submit(orderEditSubmit)', function (data) {
                    // 组装数据
                    if (xxDataList.length <= 0) {
                        layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
                        return false;
                    }
                    let nList = admin.util.deepClone(xxDataList);
                    for (let xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].anfme <= 0){
                            layer.msg('明细修改数量不合法', {icon: 2});
                            return false;
                        }
                    }
                    layer.load(2);
                    $.ajax({
                        url: baseUrl+"/orderLog/form/" + (isExpAdd?"add":"modify") + "/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify({
                            orderId: Number(data.field.id),
                            docType: Number(data.field.docType),
                            orderNo: data.field.orderNo,
                            orderDetlList: nList
                        }),
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll('loading');
                            if (res.code === 200){
                                layer.close(dIndex);
                                $(".layui-laypage-btn")[0].click();
                                layer.msg(res.msg, {icon: 1});
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                // 明细表格
                var xxDataList = [];
                var tbOptions = {
                    elem: '#formSSXMTable',
                    headers: {token: localStorage.getItem('token')},
                    data: xxDataList,
                    page: true,
                    height: '350px;',
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers', title: '#'},
                        {field: 'matnr', title: '商品编码', width: 160},
                        {field: 'maktx', title: '商品名称', width: 200},
                        {field: 'batch', title: '序列码', edit: true},
                        {field: 'specs', title: '规格'},
                        {field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        {field: 'threeCode', title: '销售订单号(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        {field: 'deadTime', title: '销售订单行号(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        // {field: 'inQty', title: '已入库量',  minWidth: 100, width: 100},
                        // {field: 'unit', title: '单位', width: 80},
                        {field: 'memo', title: '备注' , edit: true},
                        {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
                    ]],
                    done: function (res) {
                        $(layero).find('.layui-table-view').css('margin', '0');
                    },
                    size: ''
                };
                if (!isExpAdd) {
                    $.ajax({
                        url: baseUrl+"/orderLog/detl/all/auth?orderId=" + expTpe.id,
                        headers: {'token': localStorage.getItem('token')},
                        method: 'GET',
                        async: false,
                        success: function (res) {
                            if (res.code === 200){
                                xxDataList = res.data;
                                tbOptions.data = xxDataList;
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    })
                }
                var insTbSSXM = table.render(tbOptions);
                // 工具条点击事件
                table.on('tool(formSSXMTable)', function (obj) {
                    var data = obj.data;
                    var layEvent = obj.event;
                    if (layEvent === 'edit') {
                        showEditModel2(data);
                    } else if (layEvent === 'del') {
                        layer.confirm('确定要删除吗？', {
                            shade: .1,
                            skin: 'layui-layer-admin'
                        }, function (i) {
                            layer.close(i);
                            for (var j = 0; j < xxDataList.length; j++) {
                                if (xxDataList[j].matnr === data.matnr && xxDataList[j].batch === data.batch) {
                                    xxDataList.splice(j, 1);
                                    break;
                                }
                            }
                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                        });
                    }
                });
                // 明细数据修改
                table.on('edit(formSSXMTable)', function (obj) {
                    let index = obj.tr.attr("data-index");
                    let data = xxDataList[index];
                    if (obj.field === 'anfme'){
                        let vle = Number(obj.value);
                        if (isNaN(vle)) {
                            layer.msg("请输入数字", {icon: 2});
                            return false;
                        } else {
                            if (vle <= 0) {
                                layer.msg("数量必须大于零", {icon: 2});
                                return false;
                            }
                        }
                    }
                    data[obj.field] = obj.value;
                    insTbSSXM.reload({data: xxDataList});
                });

                $('#matAddBtnComment').click(function () {
                    showEditModel2();
                });

                // 显示添加明细表单弹窗
                function showEditModel2(exp) {
                    admin.open({
                        type: 1,
                        offset: '150px',
                        area: '680px',
                        title: (exp ? '修改' : '添加') + '明细',
                        content: $('#matEditDialog').html(),
                        success: function (layero, dIndex) {
                            // 回显数据
                            form.val('matEditForm', exp);
                            // 表单提交事件
                            form.on('submit(matEditSubmit)', function (data) {
                                let selectList = matXmSelect.getValue();
                                for (let i = 0; i<selectList.length; i++) {
                                    let item = selectList[i];
                                    // 查询物料详情
                                    $.ajax({
                                        url: baseUrl+"/mat/covert/"+item.value+"/auth",
                                        headers: {'token': localStorage.getItem('token')},
                                        method: 'GET',
                                        async: false,
                                        success: function (res) {
                                            if (res.code === 200){
                                                xxDataList.push(res.data);
                                                insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                                            } else if (res.code === 403){
                                                top.location.href = baseUrl+"/";
                                            }else {
                                                layer.msg(res.msg, {icon: 2})
                                            }
                                        }
                                    })
                                }
                                layer.close(dIndex);
                                return false;
                            });
                            // 渲染物料选择
                            var matXmSelect = xmSelect.render({
                                el: '#mat',
                                style: {
                                    width: '340px',
                                },
                                autoRow: true,
                                toolbar: { show: true },
                                filterable: true,
                                remoteSearch: true,
                                remoteMethod: function(val, cb, show){
                                    $.ajax({
                                        url: baseUrl+"/mat/all/get/kv",
                                        headers: {'token': localStorage.getItem('token')},
                                        data: {
                                            condition: val
                                        },
                                        method: 'POST',
                                        success: function (res) {
                                            if (res.code === 200){
                                                cb(res.data)
                                            } else {
                                                cb([]);
                                                layer.msg(res.msg, {icon: 2});
                                            }
                                        }
                                    });
                                }
                            })
                            // 弹窗不出现滚动条
                            $(layero).children('.layui-layer-content').css('overflow', 'visible');
                            layui.form.render('select');
                        }
                    });
                }

            }
        });
    }

    // 删除单据
    function doDel(orderId) {
        layer.confirm('确定要删除吗？', {
            shade: .1,
            skin: 'layui-layer-admin'
        }, function (i) {
            layer.close(i);
            layer.load(2);
            $.ajax({
                url: baseUrl+"/orderLog/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {
                    orderId: orderId
                },
                method: 'POST',
                success: function (res) {
                    layer.closeAll('loading');
                    if (res.code === 200){
                        if (insTbCount === 0) {
                            insTb.reload({page: {curr: 1}});
                        } else {
                            $(".layui-laypage-btn")[0].click();
                        }
                        layer.msg(res.msg, {icon: 1});
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 上传审核单据
    function doReport(orderId) {
        layer.confirm('确定要上传单据吗？', {
            shade: .1,
            skin: 'layui-layer-admin'
        }, function (i) {
            layer.close(i);
            layer.load(2);
            $.ajax({
                url: baseUrl+"/orderLog/report/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {
                    orderId: orderId
                },
                method: 'POST',
                success: function (res) {
                    layer.closeAll('loading');
                    if (res.code === 200){
                        if (insTbCount === 0) {
                            insTb.reload({page: {curr: 1}});
                        } else {
                            $(".layui-laypage-btn")[0].click();
                        }
                        layer.msg(res.msg, {icon: 1});
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 修改订单状态
    function doModify(orderId, settle) {
        layer.confirm('确定要手动完结吗？', {
            shade: .1,
            skin: 'layui-layer-admin'
        }, function (i) {
            layer.close(i);
            layer.load(2);
            console.log(orderId);
            console.log(settle);
            $.ajax({
                url: baseUrl+"/orderLog/update/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {
                    id: orderId,
                    settle: settle
                },
                method: 'POST',
                success: function (res) {
                    layer.closeAll('loading');
                    if (res.code === 200){
                        if (insTbCount === 0) {
                            insTb.reload({page: {curr: 1}});
                        } else {
                            $(".layui-laypage-btn")[0].click();
                        }
                        layer.msg(res.msg, {icon: 1});
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 任务追溯
    function showWrkTrace(orderId) {

 src/main/webapp/views/orderLog/orderLog.html

@@ -100,17 +100,7 @@
        </div>
    </div>
</div>
<!-- 表格操作列 -->
<script type="text/html" id="operate">
    {{# if (d.settle == 1 || d.settle == 2) { }}
        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
        {{# if (d.settle == 2) { }}
            <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">完结</a>
        {{# } }}
    {{# } }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">删除</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-report" lay-event="report">上报</a>
</script>

<!-- 表格操作列 -->
<script type="text/html" id="tbLook">
    <span class="layui-text">
@@ -297,7 +287,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/orderLog/order.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/orderLog/order.js?v=1" charset="utf-8"></script>

<script type="text/template" id="docTypeTpl">
    <option value="">选择类型</option>