#1

lsh

2024-05-31 37f97c17a695aacd4f658eb86483558ba62374cd

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

@@ -6,7 +6,10 @@
import com.core.annotations.AppAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.WrkMastExecute;
import com.zy.asrs.entity.param.AgvTaskCallBackParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.AppAuthUtil;
@@ -53,6 +56,10 @@
    AgvWrkMastService agvWrkMastService;
    @Autowired
    ApiLogService apiLogService;
    @Autowired
    private WrkMastExecuteService wrkMastExecuteService;
    @Autowired
    private AgvBasDevpService agvBasDevpService;

    @PostMapping("/task/event/status")
    @AppAuth(memo = "ESS任务回调")
@@ -83,7 +90,23 @@
                return R.error("任务编号错误");
            }
        }

        if (agvWrkMast.getIoType().equals(121)){
            try{
                if (agvWrkMast.getWrkSts().equals(12L)){
                    WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", wrkNo));
                    if (Cools.isEmpty(wrkMastExecute) || wrkMastExecute.getWrkSts()!=1){
                        return R.error("任务状态WrkSts参数有误,WrkSts:"+wrkMastExecute.getWrkSts$());
                    } else {
                        wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
                        wrkMastExecuteService.updateById(wrkMastExecute);
                    }
                }else {
                    return R.error("任务异常");
                }
            }catch (Exception e){
                return R.error(""+e.getMessage());
            }
        }else {
        if(agvWrkMast.getWrkSts() >= 205){
            return R.error("当前任务已完成");
        }
@@ -102,6 +125,7 @@
            log.error(e.getMessage());
            return R.error();
        }
        }
        return new R(0, "成功");
    }