# 出库确认

whycq

2024-07-16 a1c235841ddeef9159092a0c261dfc298058743c

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

@@ -56,6 +56,8 @@
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private RgvOneSignService rgvOneSignService;


    // 商品上架
@@ -74,10 +76,14 @@
    }

    @RequestMapping("/search/sign/auth/v2")
//    @ManagerAuth(memo = "拆叠盘模式切换")
    @ManagerAuth(memo = "拆叠盘模式切换")
    public R orderSearchByBarcodeV2(@RequestParam boolean sign){
        Integer signRu = 1;
        return R.ok(signRu);
        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
        if (sign){
            rgvOneSign.setRgvOneSign(1-rgvOneSign.getRgvOneSign());
            rgvOneSignService.updateById(rgvOneSign);
        }
        return R.ok(rgvOneSign.getRgvOneSign());
    }


@@ -209,14 +215,19 @@
    @ManagerAuth(memo = "出库确认获取信息")
    public R wrkDetlSearchByBatch(@RequestBody String batch){
        if (Cools.isEmpty(batch)){
            return R.error("参数为空");
            return R.error().add("参数为空");
        }
        String[] batch1 = batch.split("箱号：");
        String[] batch2 = batch1[1].split("规格：");
        batch = batch2[0].replaceAll(" ", "");
//        List<Order> orders = orderService.selectorderNoL(batch);
        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
        WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
//        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
        if (Cools.isEmpty(wrkDetl)){
            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
//            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
            if (Cools.isEmpty(wrkDetlLog)){
                return R.error("未查到数据");
                return R.error().add("未查到数据");
            }
            wrkDetl = new WrkDetl();
            wrkDetl.sync(wrkDetlLog);
@@ -225,7 +236,7 @@
            wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
        }
        if (Cools.isEmpty(wrkDetl)){
            return R.error("未查到数据");
            return R.error().add("未查到数据");
        }
        return R.ok().add(wrkDetl);
    }
@@ -233,31 +244,43 @@
    @RequestMapping("/order/search/batch/auth")
    @ManagerAuth(memo = "出库确认")
    public R orderSearchByBatch(@RequestBody String batch){
        if (Cools.isEmpty(batch)){
            return R.error("参数为空");
        }
        String orderNo = "";
        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
        if (Cools.isEmpty(wrkDetl)) {
            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
            if (Cools.isEmpty(wrkDetlLog)) {
                return R.error("未查到数据");
        try{
            if (Cools.isEmpty(batch)){
                return R.error().add("参数为空");
            }
            orderNo=wrkDetlLog.getOrderNo();
        }else {
            orderNo=wrkDetl.getOrderNo();
        }
//            String[] batch1 = batch.split("箱号：");
//            String[] batch2 = batch1[1].split("规格：");
//            batch = batch2[0];
            String orderNo = "";
//            WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
            WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
            if (Cools.isEmpty(wrkDetl)) {
//                WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
                WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
                if (Cools.isEmpty(wrkDetlLog)) {
                    return R.error().add("未查到数据:工作明细为空");
                }
                orderNo=wrkDetlLog.getOrderNo();
            }else {
                orderNo=wrkDetl.getOrderNo();
            }
//        List<Order> orders = orderService.selectorderNoL(batch);
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
        if (Cools.isEmpty(orderDetl)){
            return R.error("未查到数据");
            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
            if (Cools.isEmpty(orderDetl)){
                return R.error().add("未查到数据:订单明细为空"+orderNo);
            }
            if (!orderDetl.getQty$().equals("已完成")){
                return R.error().add("任务未完成");
            }
            if (orderDetl.getSource()==1){
                return R.error().add("任务已确认，请勿重复确认！！！");
            }
            orderDetl.setSource(1);
            orderDetlService.updateById(orderDetl);
            return R.ok();
        } catch (Exception e){
            return R.error().add(e.getMessage());
        }
        if (!orderDetl.getQty$().equals("已完成")){
            return R.error("任务未完成");
        }
        orderDetl.setSource(1);
        orderDetlService.updateById(orderDetl);
        return R.ok();
    }

//    @RequestMapping("/truss/auth")
@@ -285,12 +308,22 @@
     * 中控：2楼212叫托盘
     */
    @PostMapping("/balcony/complete/car/auth/v1")
    @AppAuth(memo = "中控：2楼212叫托盘")
//    @AppAuth(memo = "中控：2楼212叫托盘")
    public synchronized R balconyCompleteCar() {
        mobileService.trussComb2Car(212);
        return R.ok();
    }

    /**
     * 中控：获取箱型编号
     */
    @PostMapping("/box/type/complete/auth/v1")
//    @AppAuth(memo = "中控：获取箱型编号")
    public synchronized R boxTypeCompleteCar() {
        List<Map<String, Object>> maps = mobileService.boxTypeComb();
        return R.ok().add(maps);
    }


    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")