# 出库确认

whycq

2024-07-16 e5f650ad8b4693cb9f7514808dbd8ee7ccf9b3d7

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

@@ -219,12 +219,12 @@
        }
        String[] batch1 = batch.split("箱号：");
        String[] batch2 = batch1[1].split("规格：");
        batch = batch2[0];
        batch = batch2[0].replaceAll(" ", "");
//        List<Order> orders = orderService.selectorderNoL(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.selectWrkDetlByOrderNoNotNull(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().add("未查到数据");
@@ -248,15 +248,15 @@
            if (Cools.isEmpty(batch)){
                return R.error().add("参数为空");
            }
            String[] batch1 = batch.split("箱号：");
            String[] batch2 = batch1[1].split("规格：");
            batch = batch2[0];
//            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.selectWrkDetlByOrderNoNotNull(batch);
                WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
                if (Cools.isEmpty(wrkDetlLog)) {
                    return R.error().add("未查到数据:工作明细为空");
                }
@@ -272,14 +272,14 @@
            if (!orderDetl.getQty$().equals("已完成")){
                return R.error().add("任务未完成");
            }
            if (orderDetl.getSource()==1){
            if (!Cools.isEmpty(orderDetl.getSource()) && orderDetl.getSource()==1){
                return R.error().add("任务已确认，请勿重复确认！！！");
            }
            orderDetl.setSource(1);
            orderDetlService.updateById(orderDetl);
            return R.ok();
        } catch (Exception e){
            return R.error().add(e);
            return R.error().add(e.getMessage());
        }
    }