自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhangc
2024-12-27 499ee6d6eb0e0c38cdc23ebe3c320f46dd498d0a 
 src/main/java/com/zy/asrs/controller/AgvMobileController.java


@@ -11,6 +11,8 @@


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.asrs.utils.OrderUtils;


import com.zy.common.web.BaseController;


import lombok.Synchronized;


import org.slf4j.Logger;


@@ -55,6 +57,8 @@


    private SnowflakeIdWorker snowflakeIdWorker;


    @Autowired


    private FlowLogService flowLogService;


    @Autowired


    private OrderServiceImpl orderService;






    /*


@@ -137,8 +141,11 @@


        params.getCombParams().forEach(combParam -> {


            agvMobileService.comb(combParam, getUserId());


        });


        //获取判断时哪个厂的订单


        String csocode = params.getCombParams().get(0).getCombMats().get(0).getCsocode();


        String factory = OrderUtils.getFactory(csocode);


        params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));


        workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false);


        workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false,factory);




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


    }


@@ -153,7 +160,7 @@




        for (AgvMobileStartParam.Pda pda : params.getPad()) {


            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));


            workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);


            workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false,null);


        }




        return R.ok();


@@ -406,6 +413,9 @@


                agvLocMastByContainerCode.setBarcode(barcode1);


                agvLocMastService.updateById(agvLocMastByContainerCode);


            }


            // 保存调整记录


            AdjDetl adjDetl = new AdjDetl();






            return R.ok("维护成功");


        }


@@ -505,6 +515,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 +538,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")) {


@@ -559,6 +573,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 +582,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 +615,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 +643,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,11 +674,19 @@


                // 更新订单


                // 先查询库订单明细 所属的订单




                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 失败！(半成品调拨单任务)");


                    }


                }


            }


            // 更新源库位


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