#

zjj

2025-07-02 d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
@@ -22,6 +23,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;

/**
 * 定时将任务(完成、取消)转成日志
@@ -80,21 +82,21 @@
                    taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //设备编码
                    taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //目标库位
                    Date now = new Date();
                    //更新库位状态
                    LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
                    locMast.setLocSts("K");//O.空库位
                    locMast.setBarcode("");//托盘码
                    locMast.setModiTime(now);
                    locMast.setModiUser(9999L);
                    locMastService.updateById(locMast);

                    //更新库位状态
                    LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                    locMast2.setLocSts("Z");//F.在库
                    locMast2.setBarcode(taskWrk.getBarcode());//托盘码
                    locMast2.setModiTime(now);
                    locMast2.setModiUser(9999L);
                    locMastService.updateById(locMast2);
//                    //更新库位状态
//                    LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
//                    locMast.setLocSts("K");//O.空库位
//                    locMast.setBarcode("");//托盘码
//                    locMast.setModiTime(now);
//                    locMast.setModiUser(9999L);
//                    locMastService.updateById(locMast);
//
//                    //更新库位状态
//                    LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
//                    locMast2.setLocSts("Z");//F.在库
//                    locMast2.setBarcode(taskWrk.getBarcode());//托盘码
//                    locMast2.setModiTime(now);
//                    locMast2.setModiUser(9999L);
//                    locMastService.updateById(locMast2);
                }

                taskOverToWms.setTaskStatus("done"); //任务状态
@@ -105,23 +107,29 @@
                            .setUri(wmsUrl)
                            .setPath("wcsManager/wcsInterface/taskStatusFeedback")
                            .setJson(JSON.toJSONString(taskOverToWms))
                            .setTimeout(60, TimeUnit.SECONDS)
                            .build()
                            .doPost();
                }catch (Exception e){
                    log.error("wms任务完成请求出错"+e.getMessage());
                    continue;
                }

                if (Cools.isEmpty(response)){
                    log.error("wms任务完成，请求体："+JSON.toJSONString(taskOverToWms)+"返回值为:"+response);
                }

                JSONObject jsonObject = JSON.parseObject(response);

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

                }else {
                    continue;
                }