You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
99 lines
4.4 KiB
99 lines
4.4 KiB
package com.gaotao.modules.autoWareHourceHaian.controller;
|
|
|
|
import com.gaotao.common.utils.PageUtils;
|
|
import com.gaotao.common.utils.R;
|
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnWmsOrderTaskQueryData;
|
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnWmsTransportTaskData;
|
|
import com.gaotao.modules.autoWareHourceHaian.entity.vo.HaiAnWcsCallbackTask;
|
|
import com.gaotao.modules.autoWareHourceHaian.entity.vo.HaiAnWmsOrderTaskDetail;
|
|
import com.gaotao.modules.autoWareHourceHaian.entity.vo.HaiAnWmsTransportTask;
|
|
import com.gaotao.modules.autoWareHourceHaian.entity.vo.HaiAnWmsTransportTaskDetail;
|
|
import com.gaotao.modules.autoWareHourceHaian.service.HaiAnOrderTaskService;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
import java.util.List;
|
|
|
|
/**
|
|
* @author rqrq
|
|
* @Description 海安订单任务查询控制器，复刻旧页面四接口语义并切换haian_任务表 - rqrq
|
|
*/
|
|
@RestController
|
|
@RequestMapping("/autoWareHourceHaian/haiAnOrderTask")
|
|
public class HaiAnOrderTaskController {
|
|
|
|
@Autowired
|
|
private HaiAnOrderTaskService haiAnOrderTaskService;
|
|
|
|
/**
|
|
* @author rqrq
|
|
* @Description 分页查询海安订单任务主表 - rqrq
|
|
*/
|
|
@PostMapping("/searchOrderTaskList")
|
|
public R searchOrderTaskList(@RequestBody HaiAnWmsOrderTaskQueryData data) {
|
|
// 主列表查询必须携带工厂编码，确保订单任务隔离在当前site - rqrq
|
|
if (data == null || StringUtils.isBlank(data.getSite())) {
|
|
return R.error("工厂编码不能为空");
|
|
}
|
|
PageUtils page = haiAnOrderTaskService.searchOrderTaskList(data);
|
|
return R.ok().put("page", page);
|
|
}
|
|
|
|
/**
|
|
* @author rqrq
|
|
* @Description 查询海安订单任务明细页签 - rqrq
|
|
*/
|
|
@PostMapping("/searchOrderTaskDetailList")
|
|
public R searchOrderTaskDetailList(@RequestBody HaiAnWmsOrderTaskQueryData data) {
|
|
// 明细查询强制site入参，避免跨工厂读取同任务号明细 - rqrq
|
|
if (data == null || StringUtils.isBlank(data.getSite())) {
|
|
return R.error("工厂编码不能为空");
|
|
}
|
|
List<HaiAnWmsOrderTaskDetail> rows = haiAnOrderTaskService.searchOrderTaskDetailList(data);
|
|
return R.ok().put("rows", rows);
|
|
}
|
|
|
|
/**
|
|
* 根据选中任务的site和任务号查询栈板对接回调，返回按创建时间正序排列的明细。- rqrq
|
|
* @param data 选中主任务的site和taskNo；缺失时由Service拒绝查询 - rqrq
|
|
* @return rows为WCS回调主表记录，仅供任务轨迹展示 - rqrq
|
|
*/
|
|
@PostMapping("/searchWcsCallbackTaskList")
|
|
public R searchWcsCallbackTaskList(@RequestBody HaiAnWmsOrderTaskQueryData data) {
|
|
// 交给Service校验业务主键并查询回调；失败由统一异常处理返回，避免展示跨任务数据。- rqrq
|
|
List<HaiAnWcsCallbackTask> rows = haiAnOrderTaskService.searchWcsCallbackTaskList(data);
|
|
return R.ok().put("rows", rows);
|
|
}
|
|
|
|
/**
|
|
* @author rqrq
|
|
* @Description 查询海安订单关联运输任务页签 - rqrq
|
|
*/
|
|
@PostMapping("/searchTransportTaskList")
|
|
public R searchTransportTaskList(@RequestBody HaiAnWmsOrderTaskQueryData data) {
|
|
// 关联运输任务查询必须基于site过滤，保持海安新表查询边界 - rqrq
|
|
if (data == null || StringUtils.isBlank(data.getSite())) {
|
|
return R.error("工厂编码不能为空");
|
|
}
|
|
List<HaiAnWmsTransportTask> rows = haiAnOrderTaskService.searchTransportTaskList(data);
|
|
return R.ok().put("rows", rows);
|
|
}
|
|
|
|
/**
|
|
* @author rqrq
|
|
* @Description 查询海安运输任务明细弹窗数据 - rqrq
|
|
*/
|
|
@PostMapping("/searchTransportTaskDetailList")
|
|
public R searchTransportTaskDetailList(@RequestBody HaiAnWmsTransportTaskData data) {
|
|
// 运输步骤明细查询必须显式传入site，避免多site任务号冲突 - rqrq
|
|
if (data == null || StringUtils.isBlank(data.getSite())) {
|
|
return R.error("工厂编码不能为空");
|
|
}
|
|
List<HaiAnWmsTransportTaskDetail> rows = haiAnOrderTaskService.searchTransportTaskDetailList(data);
|
|
return R.ok().put("rows", rows);
|
|
}
|
|
}
|