#

zwl

2025-06-08 91eca979b480dff62809368a5c6563c9e0fcc851

 src/main/java/com/zy/asrs/task/TaskMastScheduler.java

@@ -65,15 +65,19 @@
            if (taskWrk.getWrkSts() == 6) {//入库完成
                headParam.put("Result", 1);
                s="入库完成";
                taskWrk.setStatus(7);//入库任务转历史档6--》7
                taskWrk.setWrkSts(7);//入库任务转历史档6--》7
            } else if (taskWrk.getWrkSts() == 16) {//出库完成-待搬离
                headParam.put("Result", 1);
                s="出库完成-待搬离";
                taskWrk.setWrkSts(17);//出库任务16--》17
            } else if (taskWrk.getWrkSts().equals(30)) {//取消
            } else if (taskWrk.getStatus().equals(4)) {//取消任务上报wms
                s="取消";
                taskWrk.setStatus(5);//取消任务
                headParam.put("Result", 2);
                taskWrk.setWrkSts(31);//取消任务30--》31
            } else if (taskWrk.getStatus().equals(6)) {//完结任务上报wms
                s = "手动完成";
                taskWrk.setStatus(7);//完结
                headParam.put("Result", 1);
            }
            String response = "";
            Boolean bool = false;
@@ -81,47 +85,14 @@
                headParam.put("TaskNo", taskWrk.getTaskNo());
                log.info("wcs"+s+"任务上报wms={}", taskWrk);
                response = new HttpHandler.Builder()
                        // .setHeaders(headParam)
                        // .setHeaders(headPraam)
                        .setUri(wmsUrl)
                        .setPath(TaskExecCallback)
                        .setJson(JSON.toJSONString(headParam))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                Date date=new Date();
                if(jsonObject.get("ReturnStatus").equals(0)){
                    if(taskWrk.getIoType().equals(1)){//入库
                        LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());//目标库位
                        if(locMast != null){
                            locMast.setLocSts("F");
                            locMast.setBarcode(taskWrk.getBarcode());
                            locMast.setModiTime(date);
                            locMastService.updateById(locMast);
                        }
                    }else if(taskWrk.getIoType().equals(3)){//移库
                        LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());//目标库位
                        if(locMast != null){
                            locMast.setLocSts("F");
                            locMast.setBarcode(taskWrk.getBarcode());
                            locMast.setModiTime(date);
                            locMastService.updateById(locMast);
                        }
                        LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getStartPoint());//原始库位
                        if(locMast2 != null){
                            locMast2.setLocSts("O");
                            locMast2.setBarcode("");
                            locMast.setModiTime(date);
                            locMastService.updateById(locMast2);
                        }
                    }else if(taskWrk.getIoType().equals(2)){//出库
                        LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getStartPoint());//原始库位
                        if(locMast2 != null){
                            locMast2.setLocSts("O");
                            locMast2.setBarcode("");
                            locMast2.setModiTime(date);
                            locMastService.updateById(locMast2);
                        }
                    }
                if (jsonObject.get("ReturnStatus").equals("0")) {
                    taskWrkService.updateById(taskWrk);
                    bool = true;
                }