#

lsh

2024-05-26 40fb39d97d52ea1714d56107039bdfbdeb27a369

#

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

@@ -219,19 +219,6 @@
    }

    /**
     * 贴标机贴标完成
     */
    @PostMapping("/small/containers/auth/v1")
    @AppAuth(memo = "贴标机贴标完成") //old需要修改
    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
                                           @RequestBody LabellerCompleteParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.labellerComplete(param);
        return R.ok();
    }

    /**
     * 中控(2楼)：码垛完成下发入库信息
     */
    @PostMapping("/palletizing/complete/auth/v1")
@@ -298,5 +285,47 @@
    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/
    /*...........................亳州煜星..............以上.............亳州煜星...........................*/

//    /**
//     * 亳州煜星任务下发
//     */
//    @PostMapping("/small/containers/auth/v1")
//    @AppAuth(memo = "贴标机贴标完成") //old需要修改
//    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
//                                          @RequestBody LabellerCompleteParam param,
//                                          HttpServletRequest request) {
//        auth(appkey, param, request);
//        openService.labellerComplete(param);
//        return R.ok();
//    }
//
//    /**
//     * 亳州煜星任务下发
//     */
//    @PostMapping("/small/containers/auth/v1")
//    @AppAuth(memo = "贴标机贴标完成") //old需要修改
//    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
//                                          @RequestBody LabellerCompleteParam param,
//                                          HttpServletRequest request) {
//        auth(appkey, param, request);
//        openService.labellerComplete(param);
//        return R.ok();
//    }
//
//    /**
//     * 亳州煜星任务下发
//     */
//    @PostMapping("/small/containers/auth/v1")
//    @AppAuth(memo = "贴标机贴标完成") //old需要修改
//    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
//                                          @RequestBody LabellerCompleteParam param,
//                                          HttpServletRequest request) {
//        auth(appkey, param, request);
//        openService.labellerComplete(param);
//        return R.ok();
//    }

    /*...........................亳州煜星..............以上.............亳州煜星...........................*/

}

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -68,6 +68,7 @@
                        locMast.setLocSts("D");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        locMast.setInvWh("1");
                        if (!locMastService.updateById(locMast)) {
//                            exceptionHandle("空板入库 ===>> 修改库位状态失败;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

 src/main/java/com/zy/common/service/CommonService.java

@@ -332,7 +332,7 @@
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O")
                    .orderBy("lev1",true).orderBy("bay1",true));
                    .orderBy("inv_wh",false).orderBy("lev1",true).orderBy("bay1",true));
            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;