#1

dubin

2025-12-18 6a02553155f5c12890a611e6fe12b93cc7e75c32

#1

 src/main/java/com/zy/asrs/entity/result/WrkCancel.java

New file
@@ -0,0 +1,13 @@
package com.zy.asrs.entity.result;

import lombok.Data;

@Data
public class WrkCancel {

    /*任务号*/
    private String taskId;

    /*取消时间*/
    private String msgTime;
}

 src/main/java/com/zy/asrs/entity/result/WrkPriority.java

New file
@@ -0,0 +1,16 @@
package com.zy.asrs.entity.result;

import lombok.Data;

@Data
public class WrkPriority {

    /*组号*/
    private String taskId;

    /*优先级*/
    private Integer priorityCode;

    /*调整时间*/
    private String msgTime;
}

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

@@ -1,5 +1,7 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
@@ -9,6 +11,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.WrkCancel;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.*;
@@ -16,6 +19,7 @@
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.WcsController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +27,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -75,8 +81,12 @@
    private SlaveProperties slaveProperties;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private ApiLogService apiLogService;
    @Value("${wcs-slave.cancel}")
    private String cancel;
    @Value("${wcs-slave.url}")
    private String url;

    @Override
    @Transactional
@@ -1028,7 +1038,48 @@
            throw new CoolException("保存数据失败");
        }

        //wms取消任务 同时调用wcs任务取消接口通知wcs todo
        //wms取消任务 同时调用wcs任务取消接口通知wcs
        WrkCancel wrkCancel = new WrkCancel();
        Date date = new Date();
        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        wrkCancel.setTaskId(workNo); // 任务号
        wrkCancel.setMsgTime(dateFormat.format(date)); // 取消时间

        String response = "";
        boolean flag = false;
        try {
            response = new HttpHandler.Builder()
                    .setUri(url)
                    .setPath(cancel)
                    .setJson(JSON.toJSONString(wrkCancel))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getInteger("returnStatus") == 0){
                flag = true;
            }else {
                log.error("wms取消任务下发wcs失败--->url：{}；request：{}；response：{}", url+"/"+cancel, JSON.toJSONString(wrkCancel), response);
                throw new CoolException("wms取消任务下发wcs失败");
            }
        }catch (Exception e){
            log.error("fail", e);
        }finally {
            try {
                //保存接口日志
                apiLogService.save(
                        "wms下发任务给wcs",
                        url+"/"+cancel,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(wrkCancel),
                        response,
                        flag
                );
            }catch (Exception e){
                log.error("",e);
            }
        }


    }


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

@@ -5,11 +5,11 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.result.WorkIssuedResult;
import com.zy.asrs.entity.result.WrkPriority;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +31,8 @@
    private String url;
    @Value("${wcs-slave.workIssued}")
    private String workIssued;
    @Value("${wcs-slave.priority}")
    private String priority;
    @Value("${wcs-slave.inDevp}")
    private String inDevp;
    @Value("${wcs-slave.outDevp}")
@@ -130,4 +132,53 @@

        return null;
    }

    public ReturnT<String> notice(WrkMast wrkMast) {
        WrkPriority wrkPriority = new WrkPriority();
        Date date = new Date();
        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        wrkPriority.setTaskId(wrkMast.getWrkNo().toString()); // 组号
        wrkPriority.setPriorityCode(wrkMast.getIoPri().intValue()); // 优先级
        wrkPriority.setMsgTime(dateFormat.format(date)); // 调整时间

        String response = "";
        boolean success = false;
        try {
            response = new HttpHandler.Builder()
                    .setUri(url)
                    .setPath(priority)
                    .setJson(JSON.toJSONString(wrkPriority))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getInteger("returnStatus").equals(0)) {
                success = true;
                wrkMast.setWrkSts(1L);
                wrkMastService.updateById(wrkMast);
            } else {
                log.error("wms下发任务给wcs失败！！！url：{}；request：{}；response：{}", url + "/" + workIssued, JSON.toJSONString(wrkPriority), response);
                throw new CoolException("wms下发任务给wcs失败");
            }
        } catch (Exception e) {
            log.error("fail", e);
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "wms下发任务给wcs",
                        url + "/" + workIssued,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(wrkPriority),
                        response,
                        success
                );
            } catch (Exception e) {
                log.error("", e);
            }
        }
        return null;
    }
}

 src/main/resources/application.yml

@@ -70,6 +70,8 @@
  locInfo: fromWms/cargoLocationSyn
  #任务取消
  cancel: fromWms/taskCancel
  #任务优先级调整
  priority: fromWms/taskPriority
  #入库站
  inDevp : 101
  #出库站