#

1

2025-05-14 e72f4bde2d285e0f7fdcd4d21c97233998e1ff77

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

@@ -8,10 +8,11 @@
import com.core.common.DateUtils;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
import com.zy.asrs.entity.param.CarryParam;
import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -23,6 +24,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.*;

@RestController
@@ -37,6 +39,12 @@

    @Autowired
    private LocMastService locMastService;

    @Autowired
    private OpenService openService;

    @Autowired
    private StaDescService staDescService;

    @Value("${wms.taskStatusFeedbackPath}")
    private String taskStatusFeedbackPath;
@@ -143,6 +151,84 @@
        taskWrk1.setModiTime(new Date());
        taskWrk1.setModiUser(getUserId());
        taskWrkService.updateById(taskWrk1);
        return R.ok();
    }

    @RequestMapping(value = "/taskWrk/addTask/auth")
    @ManagerAuth
    public R addTaskPoint(CarryParam param){
        try{
            param.updateIoTyoe(param.getIoType());//中航下发  1：出库，2：移库 3：入库   ====转换为====>  1：入库，2：出库，3：移库
            param.updateLocNo();
            if (Cools.isEmpty(param)){
                return R.error("参数为空！");
            } else if (Cools.isEmpty(param.getTaskNo())){
                return R.error("任务号为空！");
            } else if (Cools.isEmpty(param.getIoType())){
                return R.error("任务类型为空！");
            }
            if (Cools.isEmpty(param.getStartPoint()) || Cools.isEmpty(param.getTargetPoint())){
                return R.error("初始目标或者目标位为空");
            }


            String locNo=null;
            if(param.getIoType()==1){
                locNo=param.getTargetPoint();
            }else{
                locNo=param.getStartPoint();
            }
            LocMast locMast = locMastService.selectByLocNo(locNo);
            if(Cools.isEmpty(locMast)){
                return R.error("初始库位无法找到");
            }

            R r = null;

            if(param.getIoType() == 1){
                //入库任务创建
                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("type_no",1)
                        .eq("crn_no",locMast.getCrnNo())
                        .eq("stn_no",param.getStartPoint()));
                if(Cools.isEmpty(staDesc)){
                    return R.error("入库路劲不存在");
                }
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getCrnStn()));

            }else if(param.getIoType() == 2){
                //出库任务创建
                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("type_no",2)
                        .eq("crn_no",locMast.getCrnNo())
                        .eq("stn_no",param.getTargetPoint()));
                if(Cools.isEmpty(staDesc)){
                    return R.error("出库路劲不存在");
                }
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getStnNo()));
            }else if (param.getIoType() == 3){
                LocMast locMast2 = locMastService.selectByLocNo(param.getTargetPoint());
                if(Cools.isEmpty(locMast2)){
                    return R.error("目标库位无法找到");
                }
                if (!locMast2.getCrnNo().equals(locMast.getCrnNo())){
                    return R.error("起始库位与目标库位不再同一巷道");
                }
                //移库任务创建
                r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
            }

            apiLogService.save("wcs手动生成Wms任务"
                    ,request.getRemoteAddr()+request.getRequestURI()
                    ,null
                    ,request.getRemoteAddr()
                    ,JSON.toJSONString(param)
                    ,r.toString()
                    ,true
            );
        } catch (Exception e){

        }
        return R.ok();
    }

@@ -260,41 +346,44 @@

        }
        String response="";
        try{
            HashMap<String, Object> headParam = new HashMap<>();
            headParam.put("taskNo",taskWrk.getTaskNo());
            headParam.put("status",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoTypeWms());
            headParam.put("barcode",taskWrk.getBarcode());
//            headParam.put("reportTime",new Date());
            log.info("wcs手动完成任务上报wms={}", taskWrk);
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
                    .setUri(wmsUrl)
                    .setPath(taskStatusFeedbackPath)
                    .setJson(JSON.toJSONString(headParam))
                    .build()
                    .doPost();

            JSONObject jsonObject = JSON.parseObject(response);
            apiLogService.save("wcs手动完成任务上报wms"
                    ,wmsUrl+taskStatusFeedbackPath
                    ,null
                    ,"127.0.0.1"
                    ,JSON.toJSONString(headParam)
                    ,response
                    ,true
            );
        }catch (Exception e){
            log.error("wcs手动完成任务上报wms失{},返回值={}", taskWrk,response);
//            throw new CoolException(e);
        }
        Date now = new Date();
        locMast.setModiTime(now);
        locMastService.updateById(locMast);
        taskWrk.setStatus(7);//手动完成任务
        taskWrk.setStatus(TaskStatusType.OVER2.id);//手动完成任务
        taskWrk.setModiTime(now);
        taskWrk.setCompleteTime(now);
//        try{
//            HashMap<String, Object> headParam = new HashMap<>();
//            headParam.put("taskNo",taskWrk.getTaskNo());
//            headParam.put("taskStatus",taskWrk.getStatusWms());
//            headParam.put("ioType",taskWrk.getIoTypeWms());
//            headParam.put("barCode",taskWrk.getBarcode());
//            headParam.put("reportTime", LocalDateTime.now());
//            headParam.put("weight",taskWrk.getScWeight().doubleValue());
//
//            log.info("wcs手动完成任务上报wms={}", taskWrk);
//            response = new HttpHandler.Builder()
//                    // .setHeaders(headParam)
//                    .setUri(wmsUrl)
//                    .setPath(taskStatusFeedbackPath)
//                    .setJson(JSON.toJSONString(headParam))
//                    .build()
//                    .doPost();
//
//            JSONObject jsonObject = JSON.parseObject(response);
//            apiLogService.save("wcs手动完成任务上报wms"
//                    ,wmsUrl+taskStatusFeedbackPath
//                    ,null
//                    ,"127.0.0.1"
//                    ,JSON.toJSONString(headParam)
//                    ,response
//                    ,true
//            );
//        }catch (Exception e){
//            log.error("wcs手动完成任务上报wms失{},返回值={}", taskWrk,response);
////            throw new CoolException(e);
//        }
        locMastService.updateById(locMast);
        taskWrkService.updateById(taskWrk);
        return R.ok();
    }
@@ -319,35 +408,37 @@
            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.getIoTypeWms());
            headParam.put("barcode",taskWrk.getBarcode());
//            headParam.put("reportTime",new Date());

            log.info("wcs手动取消任务上报wm={}", taskWrk);
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
                    .setUri(wmsUrl)
                    .setPath(taskStatusFeedbackPath)
                    .setJson(JSON.toJSONString(headParam))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            apiLogService.save("wcs手动取消任务上报wms"
                    ,wmsUrl+taskStatusFeedbackPath
                    ,null
                    ,"127.0.0.1"
                    ,JSON.toJSONString(headParam)
                    ,response
                    ,true
            );
        }catch (Exception e){
            log.error("wcs手动取消任务上报wms失败={},返回值={}", taskWrk,response);
//            throw new CoolException(e);
        }
//        try{
//            HashMap<String, Object> headParam = new HashMap<>();
//            headParam.put("taskNo",taskWrk.getTaskNo());
//            headParam.put("taskStatus",taskWrk.getStatusWms());
//            headParam.put("ioType",taskWrk.getIoTypeWms());
//            headParam.put("barCode",taskWrk.getBarcode());
//            headParam.put("reportTime", LocalDateTime.now());
//            headParam.put("weight",taskWrk.getScWeight().doubleValue());
//
//
//            log.info("wcs手动取消任务上报wm={}", taskWrk);
//            response = new HttpHandler.Builder()
//                    // .setHeaders(headParam)
//                    .setUri(wmsUrl)
//                    .setPath(taskStatusFeedbackPath)
//                    .setJson(JSON.toJSONString(headParam))
//                    .build()
//                    .doPost();
//            JSONObject jsonObject = JSON.parseObject(response);
//            apiLogService.save("wcs手动取消任务上报wms"
//                    ,wmsUrl+taskStatusFeedbackPath
//                    ,null
//                    ,"127.0.0.1"
//                    ,JSON.toJSONString(headParam)
//                    ,response
//                    ,true
//            );
//        }catch (Exception e){
//            log.error("wcs手动取消任务上报wms失败={},返回值={}", taskWrk,response);
////            throw new CoolException(e);
//        }
        taskWrk.setCompleteTime(now);//完结时间
        taskWrkService.updateById(taskWrk);
        return R.ok();
@@ -377,6 +468,7 @@
            return R.ok();
        } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
            taskWrk.setWrkSts(2);
            taskWrk.setStatus(TaskStatusType.RECEIVE.id);//派发状态
            taskWrkService.updateById(taskWrk);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");
@@ -387,6 +479,22 @@
        }

    }
    @PostMapping(value = "/taskWrk/assign/auth")
    @ManagerAuth(memo = "输送线下发完成")
    public R returnAssign(@RequestParam String taskNo) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==1){
            taskWrk.setStatus(TaskStatusType.RECEIVE.id);//派发状态
            taskWrk.setWrkSts(2);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");
            }
            return R.ok();
        }else{
            return R.error("任务状态不对无法跳转");
        }

    }


}