#

zjj

2023-12-08 e76b40363630b51ca3c287b8ea13626839c32a3e

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

@@ -5,10 +5,13 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkService;
import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.utils.HttpHandler;
@@ -34,6 +37,11 @@
    private TaskWrkService taskWrkService;
    @Autowired
    private CommandInfoService commandInfoService;
    @Autowired
    private ApiLogService apiLogService;

    @Autowired
    private StaDescService staDescService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -44,7 +52,7 @@
    public void execute() throws IOException {
        for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
            TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
            if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {//完成
            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//完成
                taskStatusFeedbackParam.setTaskStatus("done");
                Map<String, Object> map = new HashMap<>();
                map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
@@ -65,7 +73,8 @@
                    map1.put(114,"J-1107");
                    map1.put(118,"J-1109");
                    map1.put(122,"J-1111");
                    taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //设备编码
                    StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no", taskWrk.getTargetPoint()));
                    taskOverToWms.setEquipmentCode(staDesc.getStnDesc()); //设备编码
                    taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //源库位
                }

@@ -82,7 +91,14 @@
                }catch (Exception e){
                    continue;
                }

                apiLogService.save("Wms任务完成接口"
                        ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
                        ,null
                        ,"127.0.0.1"
                        ,JSON.toJSONString(taskOverToWms)
                        ,response
                        ,true
                );

                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("code").equals(200)){