*

lsh

2025-04-08 a451e2d9e1abcae3286dfcfec4103aad1ee64085

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

@@ -121,10 +121,30 @@

    @RequestMapping(value = "/taskWrk/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            taskWrkService.deleteById(id);
    public R delete(@RequestParam String taskNo){
//         for (Long id : ids){
//            taskWrkService.deleteById(id);
//        }
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (taskWrk == null) {
            return R.error();
        }
        Date now = new Date();
        taskWrk.setMemo("手动强制删除！！！");
        taskWrk.setModiTime(now);
        taskWrk.setModiUser(getUserId());
        if (!taskWrkService.updateById(taskWrk)){
            log.error("删除失败" + taskWrk);
            return R.error("删除失败" + taskWrk);

        }
        if (taskWrkService.saveToHistoryD(taskWrk.getTaskNo()) == 0) {
            log.error("任务档转任务历史档失败" + taskWrk);
            return R.error("任务档转任务历史档失败" + taskWrk);

        }
        //删除任务
        taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
        return R.ok();
    }

@@ -212,14 +232,15 @@
            locMast.setBarcode(taskWrk.getBarcode());

        }
        String response="";
        try{
            HashMap<String, Object> headParam = new HashMap<>();
            headParam.put("taskNo",taskWrk.getTaskNo());
            headParam.put("status",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoType());
            headParam.put("barcode",taskWrk.getBarcode());
            headParam.put("reportTime",new Date());
            String response;
//            headParam.put("reportTime",new Date());
            log.info("wcs手动完成任务上报wms={}", taskWrk);
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
                    .setUri(wmsUrl)
@@ -229,7 +250,7 @@
                    .doPost();

            JSONObject jsonObject = JSON.parseObject(response);
            apiLogService.save("wcs派发入库任务上报wms"
            apiLogService.save("wcs手动完成任务上报wms"
                    ,wmsUrl+taskStatusFeedbackPath
                    ,null
                    ,"127.0.0.1"
@@ -238,12 +259,15 @@
                    ,true
            );
        }catch (Exception e){
            log.error("wcs手动取消任务上报wms失败", taskWrk);
            throw new CoolException("wcs派发入库任务上报wms失败");
            log.error("wcs手动完成任务上报wms失{},返回值={}", taskWrk,response);
//            throw new CoolException(e);
        }
        Date now = new Date();
        locMast.setModiTime(now);
        locMastService.updateById(locMast);
        taskWrk.setStatus(7);//手动完成任务
        taskWrk.setModiTime(new Date());
        taskWrk.setModiTime(now);
        taskWrk.setCompleteTime(now);
        taskWrkService.updateById(taskWrk);
        return R.ok();
    }
@@ -261,19 +285,22 @@
        Date now = new Date();
        taskWrk.setStatus(TaskStatusType.CANCEL.id);
        taskWrk.setModiTime(now);//操作时间
        taskWrk.setCancelTime(now);
        try{
            taskWrk.setModiUser(getUserId());//操作员
        }catch (Exception e){
            taskWrk.setModiUser(9999L);//操作员
            taskWrk.setModiUser(1111L);//操作员
        }
        String response="";
        try{
            HashMap<String, Object> headParam = new HashMap<>();
            headParam.put("taskNo",taskWrk.getTaskNo());
            headParam.put("status",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoType());
            headParam.put("barcode",taskWrk.getBarcode());
            headParam.put("reportTime",new Date());
            String response;
//            headParam.put("reportTime",new Date());

            log.info("wcs手动取消任务上报wm={}", taskWrk);
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
                    .setUri(wmsUrl)
@@ -281,9 +308,8 @@
                    .setJson(JSON.toJSONString(headParam))
                    .build()
                    .doPost();

            JSONObject jsonObject = JSON.parseObject(response);
            apiLogService.save("wcs派发入库任务上报wms"
            apiLogService.save("wcs手动取消任务上报wms"
                    ,wmsUrl+taskStatusFeedbackPath
                    ,null
                    ,"127.0.0.1"
@@ -292,8 +318,8 @@
                    ,true
            );
        }catch (Exception e){
            log.error("wcs手动完结任务上报wms失败", taskWrk);
            throw new CoolException("wcs派发入库任务上报wms失败");
            log.error("wcs手动取消任务上报wms失败={},返回值={}", taskWrk,response);
//            throw new CoolException(e);
        }
        taskWrk.setCompleteTime(now);//完结时间
        taskWrkService.updateById(taskWrk);
@@ -327,5 +353,28 @@
                return "未知";
        }
    }
    @PostMapping(value = "/taskWrk/returnWorkingCondition/auth")
    @ManagerAuth(memo = "重新给堆垛机下发任务")
    public R returnWorkingCondition(@RequestParam String taskNo) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==12){
            taskWrk.setWrkSts(11);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");
            }
            return R.ok();
        } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
            taskWrk.setWrkSts(2);
            taskWrkService.updateById(taskWrk);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");
            }
            return R.ok();
        }else{
            return R.error("任务状态不对无法重新给堆垛机下发任务");
        }

    }


}