2/11 扫码生成单据的事务修改1.0

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -52,6 +52,8 @@ import com.glxp.api.util.udi.FilterUdiUtils;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -1358,7 +1360,7 @@ public class IoCodeTempController extends BaseController {
      @Autowired
     RelCodeBatchService relCodeBatchService;
 
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public BaseResponse addDrugOrder(AddOrderRequest addOrderRequest, UdiEntity udiEntity, String code) {
         AddCodeResult addCodeResult = new AddCodeResult();
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
@@ -1933,6 +1935,7 @@ public class IoCodeTempController extends BaseController {
     }
 
 
+
     public void updateRelCode(BasicBussinessTypeEntity bussinessTypeEntity, String code) {
         if (!(bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)))
             relCodeBatchService.threadUpdateIoCodeTempEntity(code);

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -35,6 +35,8 @@ import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.*;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -449,6 +451,12 @@ public class IoAddInoutService {
 
 
     //生成扫码单据详情
+    @Transactional(
+            propagation = Propagation.REQUIRED,
+            isolation = Isolation.READ_COMMITTED,
+            timeout = 30,
+            rollbackFor = Exception.class
+    )
     public List<IoOrderDetailCodeEntity> genOrderDetailCode(IoOrderEntity orderEntity, IoCodeTempEntity codeTempEntity) {
 
         List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().select("id", "count", "reCount", "bindRlFk", "batchNo", "price").eq("orderIdFk", orderEntity.getBillNo()));