#

lsh

2024-10-24 2cf7eb592181c2d0baaffcdb66f302bce30ab164

#

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

@@ -267,7 +267,11 @@
                                            @RequestBody SingleUnstackingCompleteParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.singleUnstackingComplete(param);
        try{
            openService.singleUnstackingComplete(param);
        } catch (Exception e){
            return R.error(e.getMessage()).add(e.getMessage());
        }
        return R.ok(param);
    }

@@ -280,7 +284,11 @@
                                            @RequestBody SingleMountUnstackingCompleteParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.singleMountUnstackingComplete(param);
        try{
            openService.singleMountUnstackingComplete(param);
        } catch (Exception e){
            return R.error(e.getMessage()).add(e.getMessage());
        }
        return R.ok(param);
    }


 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -876,6 +876,17 @@
            throw new CoolException("参数：物料明细 matLists为空");
        }

//        if (Cools.isEmpty(param.getBarcode())){
//            throw new CoolException("参数：托盘码 barcode为空");
//        }
//        WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
//        if (Cools.isEmpty(wrkMastMatrix)){
//            throw new CoolException("参数：托盘码查询工作档失败："+param.getBarcode());
//        }
//        if (!wrkMastMatrix.getSheetNo().equals("1")){
//            throw new CoolException("参数：此任务未上报禁止完成："+param.getBarcode());
//        }

        ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
        ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
        //判断matLists参数
@@ -958,6 +969,9 @@
        if (Cools.isEmpty(wrkMastMatrix)){
            throw new CoolException("参数：托盘码查询工作档失败："+param.getBarcode());
        }
        if (!wrkMastMatrix.getSheetNo().equals("1")){
            throw new CoolException("参数：此任务未上报禁止完成："+param.getBarcode());
        }

        wrkMastMatrix.setSheetNo("2");
        if (!wrkMastService.updateById(wrkMastMatrix)){