mdf:修改任务表数据
This commit is contained in:
@@ -50,53 +50,27 @@ public class SchBaseTask implements Serializable {
|
||||
/** 点位4 */
|
||||
private String point_code4;
|
||||
|
||||
/** 组盘id */
|
||||
private String group_id;
|
||||
|
||||
/** 载具类型 */
|
||||
private String vehicle_type;
|
||||
|
||||
/** 载具数量 */
|
||||
private Integer vehicle_qty;
|
||||
|
||||
/** 载具编码 */
|
||||
private String vehicle_code;
|
||||
|
||||
/** 载具编码2 */
|
||||
private String vehicle_code2;
|
||||
|
||||
/** - */
|
||||
private String handle_status;
|
||||
/**
|
||||
* 载具物料信息
|
||||
*/
|
||||
private String material_code;
|
||||
/** 载具数量 */
|
||||
private Integer qty;
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Integer pcsn;
|
||||
|
||||
/** 车号 */
|
||||
private String car_no;
|
||||
|
||||
/** 任务组id */
|
||||
private String task_group_id;
|
||||
|
||||
/** 任务组序号 */
|
||||
private BigDecimal task_group_seq;
|
||||
|
||||
/** 完成类型 */
|
||||
private String finished_type;
|
||||
|
||||
/** 创建模式 */
|
||||
private String create_mode;
|
||||
|
||||
/** acs链路id */
|
||||
private String acs_trace_id;
|
||||
|
||||
/** 请求参数 */
|
||||
private String request_param;
|
||||
|
||||
/** 反馈参数 */
|
||||
private String response_param;
|
||||
|
||||
/** 生成区域 - 车间 */
|
||||
private String workshop_code;
|
||||
|
||||
/** 外部数据 */
|
||||
private String ext_group_data;
|
||||
/** 组盘物料数据 */
|
||||
private String group_data;
|
||||
|
||||
/** 备注 */
|
||||
private String remark;
|
||||
|
||||
@@ -37,7 +37,8 @@ import java.util.List;
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
public abstract class AbstractTask {
|
||||
public abstract class
|
||||
AbstractTask {
|
||||
@Autowired
|
||||
private ISchBaseTaskService taskService;
|
||||
@Autowired
|
||||
@@ -99,7 +100,6 @@ public abstract class AbstractTask {
|
||||
taskDto.setStart_device_code2(task.getPoint_code3());
|
||||
taskDto.setNext_device_code2(task.getPoint_code4());
|
||||
taskDto.setVehicle_code(task.getVehicle_code());
|
||||
taskDto.setVehicle_code2(task.getVehicle_code2());
|
||||
this.setTask(task.getConfig_code(), taskDto);
|
||||
// 如果各类方法对返回参数有不同,可以通过调用子类实现的deliveryBeforeProcessing方法来完成赋值,也可以是统一封装到参数值中。
|
||||
this.deliveryBeforeProcessing(task, taskDto);
|
||||
@@ -291,18 +291,13 @@ public abstract class AbstractTask {
|
||||
AbstractTask bean = SpringContextHolder.getBean(this.getClass());
|
||||
|
||||
// 2、创建申请任务
|
||||
task.setAcs_trace_id(requestNo);
|
||||
task.setTask_id(IdUtil.getSnowflake(1, 1).nextIdStr());
|
||||
task.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr());
|
||||
task.setConfig_code(configCode);
|
||||
task.setCreate_mode(ObjectUtil.isNotEmpty(param.getString("create_mode"))
|
||||
? param.getString("create_mode") : GeneralDefinition.ACS_CREATION);
|
||||
task.setVehicle_code(vehicleCode);
|
||||
task.setVehicle_qty(param.getInteger("vehicle_qty"));
|
||||
task.setVehicle_type(vehicleType);
|
||||
task.setTask_status(TaskStatus.APPLY.getCode());
|
||||
// 将所有参数存到表中,后续需要可以提取
|
||||
task.setRequest_param(JSONObject.toJSONString(param));
|
||||
TaskUtils.setCreateByAcsOrPda(task, param);
|
||||
|
||||
// 3、判断是否直接找点下发
|
||||
|
||||
Reference in New Issue
Block a user