测试调整格式

whycxzp

2025-04-30 d19e91bcc4ed9ab08e8be375fb5fc0f7e874a6a9

 src/main/java/com/whyc/service/WmsService.java

@@ -5,14 +5,13 @@
import com.google.gson.reflect.TypeToken;
import com.whyc.dto.*;
import com.whyc.pojo.db_abe_ram.AbeInf;
import com.whyc.pojo.db_param.PageParam;
import com.whyc.pojo.db_wms.BattWarehouse;
import com.whyc.pojo.db_wms.Task;
import com.whyc.util.HttpUtil;
import com.whyc.util.JsonUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import sun.applet.Main;

import java.util.Date;
import java.util.HashMap;
@@ -27,6 +26,9 @@

    @Autowired
    private AbeInfService abeInfService;

    @Autowired
    private BattWarehouseService battWarehouseService;

    public Response getMaterialList() {
        String httpUrl = "http://192.168.10.133:8051"+"/api/Wms_material/get_all";
@@ -107,7 +109,7 @@
                String startLocationCode = taskDto.getStartlocation_code();
                //1=搬运空托,2=搬运电池. 转化到字段Des中,1001=搬运空托,1002=搬运电池
                Integer type = taskDto.getType();
                String taskNo = responseInside.getTask_no();
                String taskNo = (String) responseInside.getTask_no().get(0);

                Task task = new Task();
                task.setTaskNo(taskNo);
@@ -125,17 +127,21 @@
        return response;
    }

    public Response stopTask(WmsTaskStopDto stopDto) {
        String httpUrl = "http://192.168.10.133:8051"+"/api/wms_task/inbound";
    public Response cancelTask(WmsTaskCancelDto stopDto) {
        String httpUrl = "http://192.168.10.133:8051"+"/api/wms_task/force_send";
        Response response = HttpUtil.doPost(httpUrl, JsonUtil.getGson().toJson(stopDto));
        //对结果进行处理
        if(response.getCode() == 1){ //请求成功,data有正常数据
            String dataStr = (String) response.getData();
            WmsResponseTaskStopDto responseInside = JsonUtil.getGson().fromJson(dataStr, WmsResponseTaskStopDto.class);
            WmsResponseTaskCancelDto responseInside = JsonUtil.getGson().fromJson(dataStr, WmsResponseTaskCancelDto.class);
            response.set(1,responseInside);
            /*if(responseInside.getCode() ==0) {

            }*/
            if(responseInside.getCode() ==0) {
                //取消成功,任务需要添加完结时间
                Task task = new Task();
                task.setTaskNo(stopDto.getTask_no());
                task.setEndTime(new Date());
                taskService.update(task);
            }
        }
        return response;
    }
@@ -232,6 +238,11 @@
                task.setActivationChamberStartTime(statusTime);
            }break;
            case 14:
                //开始取活化结束的电池,如果任务编号在更新电池仓库中存在,则更新活化时间为当前时间
                BattWarehouse battWarehouse =battWarehouseService.getByTaskNo(taskNo);
                if(battWarehouse != null){
                    battWarehouseService.finishActivationById(battWarehouse.getId());
                }
                task.setActivationChamberPickUpTime(statusTime);break;
            case 24:
                //测压任务,开始取测压结束的电池. 读取abe_inf表中的内阻,插入到任务里