#

whycq

2024-05-18 076611c29cfbe624a5ee4d21c454785bc5c79021

#

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

@@ -16,10 +16,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -42,6 +39,8 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private AgvLocDetlService agvLocDetlService;
    @Autowired
    private AgvWrkMastService agvWrkMastService;


    /*
@@ -396,6 +395,70 @@
        return R.ok();
    }

    @PostMapping("/agv/v2/locMove")
    @Transactional
    @ManagerAuth(memo = "调拨单任务下发")
    public R agvLocMove2(@RequestBody HashMap<String,Object> params){
        Date now = new Date();
        String fl = String.valueOf(params.get("floor"));
        Integer floor = Integer.parseInt(fl.substring(0, 1));
        List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        params.get("dbList");
        Object mT = params.get("moveType");
        String moveType = "";
        Integer ioType = 0;
        if (mT.equals("unAuto")) {
            moveType = "2";
            ioType = 111;
        } else {
            moveType = "1";
            ioType = 108;
        }
        for (HashMap<String, String> map : dbList) {
            String locNo = map.get("locNo");
            String barcode = map.get("barcode");
            //生成工作档
            AgvWrkMast mast = new AgvWrkMast();
            //工作状态
            mast.setWrkSts(22L);
            //入出库类型
            mast.setIoType(ioType);
            mast.setIoTime(now);
            //优先级
            mast.setIoPri(300.0);
            //源站点
            mast.setSourceLocNo(locNo);
            //目标站点
            mast.setLocNo("");
            //容器编码
            mast.setBarcode(barcode);
            //容器类型
            mast.setWhsType(30);
            // 目标楼层
            mast.setCrnNo(floor);
            mast.setAppeUser(getUserId());
            mast.setAppeTime(now);
            mast.setModiUser(getUserId());
            mast.setModiTime(now);
            if (!agvWrkMastService.insertByIncrease(mast)) {
                throw new CoolException("保存工作档失败");
            }
            // 同步调拨单
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
            for (AgvLocDetl agvLocDetl : agvLocDetls) {
                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                }
            }
            // 更新源库位

        }
        return R.ok();
    }

    @PostMapping("/hand/control/locMove")
    @Transactional
    @ManagerAuth(memo = "手动库位转移")

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

@@ -162,7 +162,8 @@
                        .or().eq("io_type", 103)
                        .or().eq("io_type", 11)
                        .or().eq("io_type", 110)
                        .or().eq("io_type", 107)).getRecords();
                        .or().eq("io_type", 107)
                        .or().eq("io_type", 108)).getRecords();

        if(!Cools.isEmpty(agvWrkMastList)){
            List<String> devNos = new ArrayList<>();