root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务编码改为ID

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java
View File

@@ -43,7 +43,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
int i=0; int i=0;
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry<String, Object> entry = it.next(); Map.Entry<String, Object> entry = it.next();
System.out.println(entry.getKey() + ":" + entry.getValue()); System.out.println("即将写入值:"+entry.getKey() + ":" + entry.getValue());
p2[i] = new ItemValue(); p2[i] = new ItemValue();
p2[i].setItem_code(entry.getKey()); p2[i].setItem_code(entry.getKey());
p2[i].setItem_value(entry.getValue()); p2[i].setItem_value(entry.getValue());

2
acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java
View File

@@ -70,11 +70,13 @@ public class OpcUtl {
if (!is_success) { if (!is_success) {
// throw new BusinessException(message.toString()); // throw new BusinessException(message.toString());
System.out.println("下发信号失败："+message.toString()); System.out.println("下发信号失败："+message.toString());
System.out.println("下发信号失败原因："+message.toString());
log.info("下发信号失败："+message.toString()); log.info("下发信号失败："+message.toString());
throw new WDKException(message.toString()); throw new WDKException(message.toString());
} }
} catch (JIException arg7) { } catch (JIException arg7) {
log.info("下发信号失败："+arg7.getMessage()); log.info("下发信号失败："+arg7.getMessage());
System.out.println("下发信号失败原因："+arg7.getMessage());
throw new WDKException(arg7); throw new WDKException(arg7);
} }
} }

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java
View File

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

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
View File

@@ -284,7 +284,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("material_code", form.getString("material_code")); json.put("material_code", form.getString("material_code"));
json.put("point_code1", form.getString("point_code1")); json.put("point_code1", form.getString("point_code1"));

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
View File

@@ -283,7 +283,7 @@ public class CoolCutTask extends AbstractAcsTask {
} }
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", form.getString("task_type"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", point_code1); json.put("point_code1", point_code1);

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
View File

@@ -265,7 +265,7 @@ public class CutConveyorTask extends AbstractAcsTask {
} }
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", form.getString("task_type"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", point_code1); json.put("point_code1", point_code1);

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
View File

@@ -281,7 +281,7 @@ public class CutTrussTask extends AbstractAcsTask {
}*/ }*/
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code")); json.put("vehicle_code", form.getString("vehicle_code"));
json.put("vehicle_code2", form.getString("vehicle_code2")); json.put("vehicle_code2", form.getString("vehicle_code2"));

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java
View File

@@ -185,7 +185,7 @@ public class EmptyVehicleTask extends AbstractAcsTask {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code")); json.put("vehicle_code", form.getString("vehicle_code"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java
View File

@@ -186,13 +186,13 @@ public class InCoolIvtTask extends AbstractAcsTask {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id",IdUtil.getSnowflake(1,1).nextId()); 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_type", "010204");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", point_code1); json.put("point_code1", point_code1);
json.put("point_code2", point_code2); json.put("point_code2", point_code2);
json.put("material_code", form.getString("container_name")); 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("sort_seq", "1");
json.put("handle_class", THIS_CLASS); json.put("handle_class", THIS_CLASS);
json.put("create_id", currentUserId); json.put("create_id", currentUserId);

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
View File

@@ -244,7 +244,7 @@ public class InHotTask extends AbstractAcsTask {
} }
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", "010201");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("point_code1")); json.put("point_code1", form.getString("point_code1"));
@@ -292,7 +292,7 @@ public class InHotTask extends AbstractAcsTask {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", "010203");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("point_code1")); json.put("point_code1", form.getString("point_code1"));

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
View File

@@ -223,7 +223,7 @@ public class InTask extends AbstractAcsTask {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code")); json.put("vehicle_code", form.getString("vehicle_code"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
View File

@@ -175,7 +175,7 @@ public class OutHotTask extends AbstractAcsTask {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", "010202");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("point_code1")); json.put("point_code1", form.getString("point_code1"));

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
View File

@@ -190,7 +190,7 @@ public class OutTask extends AbstractAcsTask {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code")); json.put("vehicle_code", form.getString("vehicle_code"));

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java
View File

@@ -125,7 +125,7 @@ public class SendOutTask extends AbstractAcsTask {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); 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_type", form.getString("task_type"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("point_code1")); json.put("point_code1", form.getString("point_code1"));

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sb/SbCallEmptyTask.java
View File

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

2
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java
View File

@@ -321,7 +321,7 @@ public class ChangeServiceImpl implements ChangeService {
} else { } else {
task = new JSONObject(); task = new JSONObject();
String task_id = IdUtil.getSnowflake(1, 1).nextId() + ""; 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("taskdtl_id", task_id);
task.put("task_id", task_id); task.put("task_id", task_id);

4
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -248,7 +248,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
} else { } else {
task = new JSONObject(); task = new JSONObject();
String task_id = IdUtil.getSnowflake(1, 1).nextId() + ""; 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("taskdtl_id", task_id);
task.put("task_id", task_id); task.put("task_id", task_id);
@@ -416,7 +416,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
} else { } else {
task = new JSONObject(); task = new JSONObject();
String task_id = IdUtil.getSnowflake(1, 1).nextId() + ""; 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("taskdtl_id", task_id);
task.put("task_id", task_id); task.put("task_id", task_id);