From ac2e9e9c32222b5e2557a9bd3e9f38c0d3f2a26c Mon Sep 17 00:00:00 2001 From: ludj Date: Sun, 5 Feb 2023 12:19:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BC=96=E7=A0=81=E6=94=B9?= =?UTF-8?q?=E4=B8=BAID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java | 2 +- acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java | 2 ++ .../main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java | 4 ++-- .../src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java | 4 ++-- .../src/main/java/org/nl/wms/sch/tasks/InHotTask.java | 4 ++-- .../src/main/java/org/nl/wms/sch/tasks/InTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/OutHotTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/OutTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/SendOutTask.java | 2 +- .../main/java/org/nl/wms/sch/tasks/sb/SbCallEmptyTask.java | 2 +- .../org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java | 2 +- .../wms/st/instor/service/impl/HandMoveStorServiceImpl.java | 4 ++-- 17 files changed, 22 insertions(+), 20 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java index a4bbb4819..30eac1824 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java @@ -43,7 +43,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc int i=0; while (it.hasNext()) { Map.Entry entry = it.next(); - System.out.println(entry.getKey() + ":" + entry.getValue()); + System.out.println("即将写入值:"+entry.getKey() + ":" + entry.getValue()); p2[i] = new ItemValue(); p2[i].setItem_code(entry.getKey()); p2[i].setItem_value(entry.getValue()); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java index 3a8accea4..87e530832 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java @@ -70,11 +70,13 @@ public class OpcUtl { if (!is_success) { // throw new BusinessException(message.toString()); System.out.println("下发信号失败："+message.toString()); + System.out.println("下发信号失败原因："+message.toString()); log.info("下发信号失败："+message.toString()); throw new WDKException(message.toString()); } } catch (JIException arg7) { log.info("下发信号失败："+arg7.getMessage()); + System.out.println("下发信号失败原因："+arg7.getMessage()); throw new WDKException(arg7); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java index 2cca04222..f16bb8c18 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java @@ -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")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index 5a7e35427..21201a5de 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -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")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index 827977ab6..882b85456 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -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); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java index 20ef27ad2..d05d9ad98 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java @@ -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); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java index 7f9b1e68d..c005aabe7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java @@ -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")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java index 6b78771e7..fcf008f8c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java @@ -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()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java index 93920ecf0..ba89fe95f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java @@ -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); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java index 073a8fcfe..54e5202ed 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java @@ -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")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java index 3d0cc8981..b9624867a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java @@ -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()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java index 4a07a1ea4..56ab2f7eb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java @@ -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")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java index 0a917050a..90571b73e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java @@ -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")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java index 357f03404..6bb9b85b5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java @@ -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")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sb/SbCallEmptyTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sb/SbCallEmptyTask.java index 397aaccd9..5d8ac9fda 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sb/SbCallEmptyTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sb/SbCallEmptyTask.java @@ -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()) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java index eccc2ccca..2a2f41c98 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java @@ -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); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 27ed9bcac..3d45903de 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -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);