#

lsh

2024-07-15 e003f5bb31c6f113a4f6d3820bcaf23376ddd61d

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

@@ -221,9 +221,9 @@
        String[] batch2 = batch1[1].split("规格：");
        batch = batch2[0];
//        List<Order> orders = orderService.selectorderNoL(batch);
        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", 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.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("未查到数据");
            }
@@ -245,10 +245,13 @@
        if (Cools.isEmpty(batch)){
            return R.error("参数为空");
        }
        String[] batch1 = batch.split("箱号：");
        String[] batch2 = batch1[1].split("规格：");
        batch = batch2[0];
        String orderNo = "";
        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", 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.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("未查到数据");
            }
@@ -264,6 +267,9 @@
        if (!orderDetl.getQty$().equals("已完成")){
            return R.error("任务未完成");
        }
        if (orderDetl.getSource()==1){
            return R.error("任务已确认，请勿重复确认！！！");
        }
        orderDetl.setSource(1);
        orderDetlService.updateById(orderDetl);
        return R.ok();