自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhangchao
2024-11-04 59f80df1e377e8775969ca4acadfa2eadd6e37ae 
 src/main/java/com/zy/asrs/controller/AgvMobileController.java


@@ -5,10 +5,12 @@


import com.core.annotations.ManagerAuth;


import com.core.common.Cools;


import com.core.common.R;


import com.core.common.SnowflakeIdWorker;


import com.core.exception.CoolException;


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 io.swagger.models.auth.In;


import lombok.Synchronized;


@@ -47,6 +49,12 @@


    private AgvWrkMastService agvWrkMastService;


    @Autowired


    private AgvWrkDetlService agvWrkDetlService;


    @Autowired


    private SnowflakeIdWorker snowflakeIdWorker;


    @Autowired


    private FlowLogService flowLogService;


    @Autowired


    private OrderServiceImpl orderService;






    /*


@@ -276,6 +284,7 @@


        String matnr = params.get("matnr");


        String floor = params.get("floor");




        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);






@@ -294,7 +303,7 @@


                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));


            } else {


                // 如果是加工单 只在 lev1 = 1 查库存


                if ("JG".equals(orderNo.substring(0,2))) {


                if (orderDetl.getSource().equals(35)) {


                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));


                } else {


                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));


@@ -372,9 +381,7 @@








        if((!Cools.eq("F",agvLocMastByContainerCode.getLocSts())


                && !Cools.eq("D",agvLocMastByContainerCode.getLocSts()))


                || (!Cools.eq("F",agvLocMastByLocNo.getLocSts())


        if((!Cools.eq("F",agvLocMastByLocNo.getLocSts())


                && !Cools.eq("D",agvLocMastByLocNo.getLocSts()))){




            return R.error("库位状态不为F或者D，无法维护");


@@ -399,6 +406,9 @@


                agvLocMastByContainerCode.setBarcode(barcode1);


                agvLocMastService.updateById(agvLocMastByContainerCode);


            }


            // 保存调整记录


            AdjDetl adjDetl = new AdjDetl();






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


        }


@@ -427,7 +437,13 @@


        }




        if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){


            return R.ok("该库位与货架库存一致，无需维护");


            //agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());


            //agvLocMastService.updateById(agvLocMastByContainerCode);




            agvLocMastByLocNo.setBarcode(containerCode);


            agvLocMastService.updateById(agvLocMastByLocNo);


            //return R.ok("该库位与货架库存一致，无需维护");


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


        }






@@ -513,6 +529,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")) {


@@ -540,12 +557,14 @@


            }


            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);


            // 同步调拨单


            long flowId = snowflakeIdWorker.nextId();


            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));


            for (AgvLocDetl agvLocDetl : agvLocDetls) {


                AgvWrkDetl wrkDetl = new AgvWrkDetl();


                wrkDetl.setWrkNo(wrkMast.getWrkNo());


                wrkDetl.sync(agvLocDetl);


                wrkDetl.setSuppCode(agvLocDetl.getSuppCode());


                wrkDetl.setModel(orderNo);


                wrkDetl.setIoTime(now);


                wrkDetl.setAppeUser(getUserId());


                wrkDetl.setAppeTime(now);


@@ -555,10 +574,48 @@


                    throw new CoolException("保存工作明细失败");


                }


                // 更新订单


                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));


                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());


//                flowLog.setSpare1(barcode);


//                flowLog.setOpType(5L);


//                flowLog.setOrderNo(orderDetl.getOrderNo());


//                flowLog.setThreeCode(orderDetl.getThreeCode());


//                flowLog.setMatnr(agvLocDetl.getMatnr());


//                flowLog.setMaktx(agvLocDetl.getMaktx());


//                flowLog.setOrderPrevious(orderDetl.getAnfme());


//                flowLog.setOrderCurrent(orderDetl.getAnfme());


//                flowLog.setOrderChanged(0.0);


//


//                flowLog.setQtyPrevious(orderDetl.getQty());


//                flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());


//                flowLog.setQtyChanged(agvLocDetl.getAnfme());


//


//                flowLog.setLocPrevious(agvLocDetl.getAnfme());


//                flowLog.setLocCurrent(0.0d);


//                flowLog.setLocChanged(agvLocDetl.getAnfme());


//                flowLog.setUserId(getUserId());


//                flowLog.setAppeTime(now);


//                if (!flowLogService.insert(flowLog)) {


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


                    }


                }


            }


            // 更新源库位


@@ -577,6 +634,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");


@@ -607,10 +665,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 失败！(半成品调拨单任务)" );


                    }


                }


            }


            // 更新源库位


@@ -696,6 +762,7 @@


        return R.ok();


    }






    public static void main(String[] args) {


        List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();


        List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();