代码更新

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");

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");

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");

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");

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");