From 0437ddbb892c495aaa497dd5463712d3299b5ba3 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 19 Sep 2022 08:44:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 8 ++++---- .../java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java | 8 ++++---- .../main/java/org/nl/wms/sch/tasks/CallMaterialTask.java | 6 +++--- .../java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java | 8 ++++---- .../main/java/org/nl/wms/sch/tasks/SendMaterialTask.java | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 78db202..6e88979 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -140,7 +140,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public JSONObject apply(JSONObject whereJson) { String type = whereJson.getString("type"); String point_code = whereJson.getString("point_code"); @@ -420,7 +420,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return resuft; } - @Transactional + @Transactional(rollbackFor = Exception.class) public void createEmp(JSONObject json) { String vehicle_qty = json.getString("vehicle_qty"); String task_id = json.getString("task_id"); @@ -450,7 +450,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { empTab.insert(jsonEmp); } - @Transactional + @Transactional(rollbackFor = Exception.class) public JSONObject inCreateRegion(JSONObject json) { String start_point_code = json.getString("start_point_code"); String next_point_code = json.getString("next_point_code"); @@ -503,7 +503,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return resuft; } - @Transactional + @Transactional(rollbackFor = Exception.class) public JSONObject outCreateRegion(JSONObject json) { String next_point_code = json.getString("next_point_code"); String io_type = json.getString("io_type"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java index 4ab7988..c6ae37b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java @@ -34,7 +34,7 @@ public class CallEmpVehicleTask extends AbstractAcsTask { private final String THIS_CLASS = CallEmpVehicleTask.class.getName(); @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); @@ -105,7 +105,7 @@ public class CallEmpVehicleTask extends AbstractAcsTask { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); @@ -180,7 +180,7 @@ public class CallEmpVehicleTask extends AbstractAcsTask { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void forceFinish(String task_id) { JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); @@ -196,7 +196,7 @@ public class CallEmpVehicleTask extends AbstractAcsTask { } - @Transactional + @Transactional(rollbackFor = Exception.class) public JSONObject findBeginPoint(JSONObject json) { String next_point_code = json.getString("next_point_code"); String vehicle_qty = json.getString("vehicle_qty"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java index b3c794b..f7e3649 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java @@ -30,7 +30,7 @@ public class CallMaterialTask extends AbstractAcsTask { private final String THIS_CLASS = CallMaterialTask.class.getName(); @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { /** *改变任务状态 @@ -159,7 +159,7 @@ public class CallMaterialTask extends AbstractAcsTask { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { //请求参数 载具、起点、终点 String vehicle_code = form.getString("vehicle_code"); @@ -272,7 +272,7 @@ public class CallMaterialTask extends AbstractAcsTask { } - @Transactional + @Transactional(rollbackFor = Exception.class) public JSONObject findBeginPoint(JSONObject json) { String next_point_code = json.getString("next_point_code"); String vehicle_type = json.getString("vehicle_type"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java index f2ade01..8e264bc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java @@ -36,7 +36,7 @@ public class SendEmpVehicleTask extends AbstractAcsTask { private final String THIS_CLASS = SendEmpVehicleTask.class.getName(); @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); @@ -108,7 +108,7 @@ public class SendEmpVehicleTask extends AbstractAcsTask { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); @@ -186,7 +186,7 @@ public class SendEmpVehicleTask extends AbstractAcsTask { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void forceFinish(String task_id) { JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); @@ -202,7 +202,7 @@ public class SendEmpVehicleTask extends AbstractAcsTask { } - @Transactional + @Transactional(rollbackFor = Exception.class) public JSONObject findEndPoint(JSONObject json) { String start_point_code = json.getString("start_point_code"); String vehicle_qty = json.getString("vehicle_qty"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java index 4efa901..84a1eaa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java @@ -38,7 +38,7 @@ public class SendMaterialTask extends AbstractAcsTask { @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { /** *改变任务状态 @@ -183,7 +183,7 @@ public class SendMaterialTask extends AbstractAcsTask { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { //请求参数 载具、起点、终点 String vehicle_code = form.getString("vehicle_code"); @@ -270,7 +270,7 @@ public class SendMaterialTask extends AbstractAcsTask { } - @Transactional + @Transactional(rollbackFor = Exception.class) public JSONObject findEndPoint(JSONObject json) { String start_point_code = json.getString("start_point_code");