兼容四期

zhangc

2025-02-13 b25fc15afed603c0c874e77d37bf93f08d5398c9

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

@@ -11,6 +11,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.OrderServiceImpl;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.slf4j.Logger;
@@ -55,6 +56,8 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private FlowLogService flowLogService;
    @Autowired
    private OrderServiceImpl orderService;


    /*
@@ -62,6 +65,9 @@
     */
    @PostMapping("/comb/auth")
    public R comb(@RequestBody CombParam combParam) {
        if (combParam == null) {
            return R.error("缺少参数");
        }
        agvMobileService.comb(combParam, getUserId());

        return R.ok();
@@ -71,6 +77,9 @@
    @RequestMapping("/pick/again/auth")
    @ManagerAuth(memo = "再次拣料")
    public R pickAgain(@RequestBody PickParam pickParams) {
        if (pickParams == null) {
            return R.error("缺少参数");
        }
        agvMobileService.pickAgain(pickParams, 1l);
        return R.ok("拣料成功");
    }
@@ -80,6 +89,9 @@
     */
    @PostMapping("/combBinging/auth")
    public R combBinding(@RequestBody Map<String, Object> map) {
        if (map == null || Cools.isEmpty(map.get("barcode")) || Cools.isEmpty(map.get("stationCode"))) {
            return R.error("缺少参数");
        }
        String barcode = map.get("barcode").toString();
        String stationCode = map.get("stationCode").toString();
        Short containerType = Short.valueOf(barcode.substring(0, 2));
@@ -92,6 +104,9 @@
     */
    @PostMapping("/getBasDevp/auth")
    public R getBasDevpByFloor(@RequestBody Map<String, Object> map) {
        if (map == null || Cools.isEmpty(map.get("floor"))) {
            return R.error("缺少参数");
        }
        String floor = map.get("floor").toString();
        if ("1".equals(floor) || "3".equals(floor)) {
            return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
@@ -113,12 +128,17 @@
    @PostMapping("/pakin/auth")
    @Synchronized
    public R pakin(@RequestBody Map<String, Object> map) {
        if (map == null || Cools.isEmpty(map.get("devNo"))) {
            return R.error("缺少参数");
        }
        List<String> devNos = (List<String>) map.get("devNo");

        List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
            return agvBasDevpService.selectById(devNo);
        }).collect(Collectors.toList());

        if (agvBasDevpList == null) {
            return R.error("暂存位不存在");
        }
        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(), false);

        return R.ok("生成工作档成功");
@@ -132,6 +152,9 @@
    @Transactional
    @ManagerAuth(memo = "启动入库")
    public R startPakin(@RequestBody AgvMobileStartPakin params) {
        if (params == null) {
            return R.error("缺少参数");
        }
        log.info("启动入库,{}", JSON.toJSONString(params));
        // 组托
        params.getCombParams().forEach(combParam -> {
@@ -144,14 +167,41 @@
    }

    /*
    启动入库，组托 + 生成工作档,主要用于吸塑一楼的入库
    */
    @PostMapping("/start/pakin/auth/v2")
    @Synchronized
    @Transactional
    @ManagerAuth(memo = "启动入库v2")
    public R startPakinV2(@RequestBody AgvMobileStartPakin params) {
        if (params == null) {
            return R.error("缺少参数");
        }
        log.info("启动入库v2,{}", JSON.toJSONString(params));
        // 组托
        params.getCombParams().forEach(combParam -> {
            agvMobileService.comb(combParam, getUserId());
        });
        params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
        workService.emptyPlateInV2(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false, params.getFactory());

        return R.ok("生成工作档成功");
    }

    /*
    入库
     */
    @PostMapping("/pakin/empty/auth")
    @Synchronized
    @ManagerAuth(memo = "空板入库")
    public R pakinEmpty(@RequestBody AgvMobileStartParam params) {

        if (params == null) {
            return R.error("缺少参数");
        }
        for (AgvMobileStartParam.Pda pda : params.getPad()) {
            if (pda == null || Cools.isEmpty(pda.getContainerCode())) {
                return R.error("缺少容器参数");
            }
            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
            workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
        }
@@ -166,8 +216,13 @@
    @Synchronized
    @ManagerAuth(memo = "空板出库")
    public R pakoutEmpty(@RequestBody AgvMobileStartParam params) {

        if (params == null) {
            return R.error("缺少参数");
        }
        for (AgvMobileStartParam.Pda pda : params.getPad()) {
            if (pda == null || Cools.isEmpty(pda.getDevNo()) || Cools.isEmpty(pda.getContainerType())) {
                return R.error("缺少站点信息");
            }
            workService.emptyPlateOut(pda.getDevNo(), pda.getContainerType(), getUserId());
        }

@@ -179,8 +234,13 @@
     */
    @PostMapping("/pakout/empty/container/selector/auth")
    public R containerType(@RequestBody HashMap<String, String> params) {

        if (params == null) {
            return R.error("缺少参数");
        }
        String devNo = params.get("devNo");
        if (Cools.isEmpty(devNo)) {
            return R.error("缺少站点数据");
        }
        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);

        return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
@@ -243,7 +303,9 @@
        String threeCode = params.get("threeCode");
        String matnr = params.get("matnr");
        String floor = params.get("floor");

        if (Cools.isEmpty(matnr)) {
            return R.error("参数缺失");
        }
        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);


@@ -284,7 +346,9 @@
        String threeCode = params.get("threeCode");
        String matnr = params.get("matnr");
        String floor = params.get("floor");

        if (Cools.isEmpty(orderNo, threeCode, matnr)) {
            return R.error("参数缺失");
        }
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("three_code", threeCode).eq("matnr", matnr));
        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);

@@ -377,7 +441,9 @@

        AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
        AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));

        if (agvLocMastByLocNo == null) {
            return R.error("库位不存在");
        }
        String barcode1 = agvLocMastByLocNo.getBarcode();


@@ -406,6 +472,9 @@
                agvLocMastByContainerCode.setBarcode(barcode1);
                agvLocMastService.updateById(agvLocMastByContainerCode);
            }
            // 保存调整记录
            AdjDetl adjDetl = new AdjDetl();


            return R.ok("维护成功");
        }
@@ -481,6 +550,7 @@
    @Transactional
    @ManagerAuth(memo = "调拨单任务下发")
    @Synchronized
    @Deprecated //不用了
    public R agvLocMove(@RequestBody HashMap<String, Object> params) {
        String fl = String.valueOf(params.get("floor"));
        short floor = (short) Integer.parseInt(fl.substring(0, 1));
@@ -497,6 +567,9 @@
            String locNo = map.get("locNo");
            Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo);
            AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
            if (agvLocMast == null) {
                return R.error("库位不存在");
            }
            agvLocMast.setLocType(moveType);
            agvLocMast.setLocType3(floor);
            agvLocMastService.update(agvLocMast, wrapper);
@@ -505,6 +578,9 @@
            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()));
                if (orderDetl == null) {
                    throw new CoolException("调拨单明细不存在");
                }
                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());
@@ -525,6 +601,7 @@
        List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        params.get("dbList");
        Object mT = params.get("moveType");
        String orderNo = params.get("orderNo").toString();
        String moveType = "";
        Integer ioType = 0;
        if (mT.equals("unAuto")) {
@@ -550,7 +627,7 @@
            if (Cools.isEmpty(locMastS)) {
                throw new CoolException("当前库位非在库状态！库位号=" + locNo);
            }
            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30, floor);
            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), Integer.parseInt(barcode.substring(0,2)), floor);
            // 同步调拨单
            long flowId = snowflakeIdWorker.nextId();
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
@@ -559,6 +636,7 @@
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetl.sync(agvLocDetl);
                wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
                wrkDetl.setModel(orderNo);
                wrkDetl.setIoTime(now);
                wrkDetl.setAppeUser(getUserId());
                wrkDetl.setAppeTime(now);
@@ -567,10 +645,13 @@
                if (!agvWrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作明细失败");
                }

                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
//                FlowLog flowLog = new FlowLog();
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
                // 判断订单是否超量
                if (orderDetl.getQty() >= orderDetl.getAnfme()) {
                    throw new CoolException("调拨单:" + orderNo + "的<" + agvLocDetl.getMatnr() + ">已完成调拨数量,请检查!");
                }
                //                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setSpare2(wrkMast.getWrkNo().toString());
//                flowLog.setLocNo(wrkMast.getSourceLocNo());
@@ -597,8 +678,16 @@
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
                    throw new CoolException("修改订单明细失败，请联系管理员" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
                    throw new CoolException("订单号：{" + orderNo + "}更新订单明细失败！ 异常物料:" + agvLocDetl.getMatnr() + "(半成品调拨单任务)");
                }
                // 更新订单状态
                Order order = orderService.selectByNo(orderDetl.getOrderNo());
                Long settle = order.getSettle();
                if (settle == 1L) {
                    if (!orderService.updateSettle(order.getId(), 2L, getUserId())) {
                        throw new CoolException("订单号：{" + order.getOrderNo() + "}更新订单状态：1-->2 失败！(半成品调拨单任务)");
                    }
                }
            }
            // 更新源库位
@@ -617,6 +706,7 @@
        Date now = new Date();
        List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        params.get("dbList");
        String orderNo = params.get("orderNo").toString();
        for (HashMap<String, String> map : dbList) {
            String locNo = map.get("locNo");
            String barcode = map.get("suppCode");
@@ -647,10 +737,18 @@
                // 更新订单
                // 先查询库订单明细 所属的订单

                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source", 36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("source", 36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
                    throw new CoolException("修改订单明细失败，请联系管理员" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
                }
                // 更新订单状态
                Order order = orderService.selectByNo(orderNo);
                Long settle = order.getSettle();
                if (settle == 1L) {
                    if (!orderService.updateSettle(order.getId(), 2L, getUserId())) {
                        throw new CoolException("订单号：{" + order.getOrderNo() + "}更新订单状态：1-->2 失败！(半成品调拨单任务)");
                    }
                }
            }
            // 更新源库位
@@ -736,6 +834,15 @@
        return R.ok();
    }

    @PostMapping("/hand/control/processed/v2")
    @Transactional
    @ManagerAuth(memo = "确认加工完成V2")
    @Synchronized
    public R processedV2(@RequestBody AgvMobileStartPakin param) {
        agvMobileService.processedV2(param, getUserId());
        return R.ok();
    }


    public static void main(String[] args) {
        List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();