任务编码改为ID

This commit is contained in:
ludj
2023-02-05 12:19:02 +08:00
parent 609c95e3d0
commit ac2e9e9c32
17 changed files with 22 additions and 20 deletions

View File

@@ -177,7 +177,7 @@ public class BookTwoConfirmTask extends AbstractAcsTask {
}
/*SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_code(IdUtil.getSnowflake(1,1).nextId())
.task_type("")
.task_name("共挤线叫空载具")
.task_status(TaskStatusEnum.SURE_END.getCode())
@@ -193,7 +193,7 @@ public class BookTwoConfirmTask extends AbstractAcsTask {
JSONObject json = new JSONObject();
json.put("task_id",IdUtil.getSnowflake(1,1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", "05");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("start_pint_code"));

View File

@@ -284,7 +284,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("material_code", form.getString("material_code"));
json.put("point_code1", form.getString("point_code1"));

View File

@@ -283,7 +283,7 @@ public class CoolCutTask extends AbstractAcsTask {
}
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", point_code1);

View File

@@ -265,7 +265,7 @@ public class CutConveyorTask extends AbstractAcsTask {
}
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", point_code1);

View File

@@ -281,7 +281,7 @@ public class CutTrussTask extends AbstractAcsTask {
}*/
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("vehicle_code2", form.getString("vehicle_code2"));

View File

@@ -185,7 +185,7 @@ public class EmptyVehicleTask extends AbstractAcsTask {
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());

View File

@@ -186,13 +186,13 @@ public class InCoolIvtTask extends AbstractAcsTask {
JSONObject json = new JSONObject();
json.put("task_id",IdUtil.getSnowflake(1,1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", "010204");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", point_code1);
json.put("point_code2", point_code2);
json.put("material_code", form.getString("container_name"));
json.put("material_code", form.getString("product_area"));
json.put("product_area", form.getString("product_area"));
json.put("sort_seq", "1");
json.put("handle_class", THIS_CLASS);
json.put("create_id", currentUserId);

View File

@@ -244,7 +244,7 @@ public class InHotTask extends AbstractAcsTask {
}
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", "010201");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("point_code1"));
@@ -292,7 +292,7 @@ public class InHotTask extends AbstractAcsTask {
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", "010203");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("point_code1"));

View File

@@ -223,7 +223,7 @@ public class InTask extends AbstractAcsTask {
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());

View File

@@ -175,7 +175,7 @@ public class OutHotTask extends AbstractAcsTask {
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", "010202");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("point_code1"));

View File

@@ -190,7 +190,7 @@ public class OutTask extends AbstractAcsTask {
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));

View File

@@ -125,7 +125,7 @@ public class SendOutTask extends AbstractAcsTask {
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_code", IdUtil.getSnowflake(1,1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("point_code1"));

View File

@@ -37,7 +37,7 @@ public class SbCallEmptyTask extends AbstractAcsTask {
@Override
public String createTask(JSONObject form) {
SchTaskDto dto = SchTaskDto.builder().task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_code(IdUtil.getSnowflake(1,1).nextId())
.task_type("")
.task_name("生箔呼叫空轴")
.task_status(TaskStatusEnum.SURE_END.getCode())

View File

@@ -321,7 +321,7 @@ public class ChangeServiceImpl implements ChangeService {
} else {
task = new JSONObject();
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
String task_code = CodeUtil.getNewCode("TASK_CODE");
String task_code = IdUtil.getSnowflake(1,1).nextId();
task.put("taskdtl_id", task_id);
task.put("task_id", task_id);

View File

@@ -248,7 +248,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
} else {
task = new JSONObject();
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
String task_code = CodeUtil.getNewCode("TASK_CODE");
String task_code = IdUtil.getSnowflake(1,1).nextId();
task.put("taskdtl_id", task_id);
task.put("task_id", task_id);
@@ -416,7 +416,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
} else {
task = new JSONObject();
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
String task_code = CodeUtil.getNewCode("TASK_CODE");
String task_code = IdUtil.getSnowflake(1,1).nextId();
task.put("taskdtl_id", task_id);
task.put("task_id", task_id);