自动门及混料间设备驱动更新

lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java

@@ -15,9 +15,9 @@ import org.nl.wms.sch.tasks.SendMaterialTask;
 import org.nl.wms.st.inbill.service.dto.RegionioDto;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
-import org.nl.wql.core.engine.object.WO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 @Service
 @RequiredArgsConstructor
@@ -56,6 +56,7 @@ public class SendMaterialServiceImpl implements SendMaterialService {
         return resultJSON;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public JSONObject confirm(JSONObject param) {
         // 返回值
@@ -121,8 +122,8 @@ public class SendMaterialServiceImpl implements SendMaterialService {
             json.put("bill_status", "20");
             regionIOTable.update(json, "iostorinv_id = " + id);
         } catch (Exception e) {
-            // 报错删除搬运记录（任务已在createTask中删除）
-            regionIOTable.delete("iostorinv_id = " + id);
+            // 手动回滚事务
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 
             resultJSON.put("code", "0");
             resultJSON.put("desc", e.getMessage());