2023年5月30日18:03:44

blade-service-api/blade-stock-api/src/main/java/org/springblade/stock/feign/IStockGoodsClient.java

@@ -37,6 +37,7 @@ public interface IStockGoodsClient {
 	String SELECT_STOCK_PARTS = API_PREFIX + "/selectStockParts";
 	String SELECT_STOCK_PARTS_YCP = API_PREFIX + "/selectStockPartsYCP";
 	String SELECT_LIST_BY_GOODS_ID = API_PREFIX + "/selectListByGoodsId";
+	String UPDATE_STOCK_LIST = API_PREFIX + "/updateStockList";
 
 
 	@GetMapping("/stockgoods/stocklist")
@@ -164,6 +165,14 @@ public interface IStockGoodsClient {
 	 */
 	@PostMapping(UPDATE_STOCK)
 	boolean updateStock(@RequestBody StockGoods stockGoods);
+/**
+	 * 修改库存总账
+	 *
+	 * @param stockGoods
+	 * @return
+	 */
+	@PostMapping(UPDATE_STOCK_LIST)
+	boolean updateStockList(@RequestBody List<StockGoods> stockGoods);
 
 	/**
 	 * 修改库存总账

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -146,7 +146,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void createFinanceProcess(AuditProecessDTO auditProecessDTO) {
 		//查询最大批次号
 		int current;
@@ -574,7 +574,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void serverProcess(AuditProecess auditProecess) {
 
 		//查看最新操作记录,防止重复提交
@@ -1149,7 +1149,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void batchOperation(List<AuditProecess> processLis, Integer operate, String auditMsg) {
 		processLis.forEach(e -> {
 			e.setOperate(operate);
@@ -1174,7 +1174,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void changeAuditUser(AuditProecess auditProecess) {
 		AuditProecess process = baseMapper.selectById(auditProecess.getId());
 		List<String> userIdList = Arrays.stream(process.getAuditUserId().split(",")).collect(Collectors.toList());
@@ -1234,7 +1234,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void cancelCheck(Long srcBillId) {
 		//查询最大批次号
 		LambdaQueryWrapper<AuditProecess> countMaxWrapper = new LambdaQueryWrapper<>();
@@ -1477,7 +1477,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void officeCheck(AuditProecess auditProecess) {
 		// 查看最新操作记录,防止重复提交
 		AuditProecess proecessTemp = baseMapper.selectById(auditProecess.getId());
@@ -1646,7 +1646,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void commonCheck(AuditProecess auditProecess) {
 		// 查看最新操作记录,防止重复提交
 		AuditProecess proecessTemp = baseMapper.selectById(auditProecess.getId());

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsAttnServiceImpl.java

@@ -61,7 +61,7 @@ public class CorpsAttnServiceImpl extends ServiceImpl<CorpsAttnMapper, CorpsAttn
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R createUser(CorpsAttn corpsAttn) {
 		CorpsAttn attn = baseMapper.selectById(corpsAttn.getId());
 

blade-service/blade-client/src/main/java/org/springblade/client/land/service/impl/LandDriverServiceImpl.java

@@ -170,7 +170,7 @@ public class LandDriverServiceImpl extends ServiceImpl<LandDriverMapper, LandDri
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R createUser(LandDriver landDriver) {
 		LandDriver driver = baseMapper.selectById(landDriver.getId());
 

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -157,8 +157,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 	 * @return
 	 */
 	@Override
-	@GlobalTransactional
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submitDelivery(Delivery delivery) {
 		String status = null;//订单状态
 		if ("681169".equals(AuthUtil.getTenantId())) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -1337,16 +1337,18 @@ public class ExportOrderController extends BladeController {
 			//主表id
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getPid()), OrderItems::getPid, orderItems.getPid());
 		}else{
-			LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			orderLambdaQueryWrapper.eq(Order::getIsDeleted, 0)
-				.eq(Order::getTenantId, AuthUtil.getTenantId())
-				.eq(Order::getBillType, OrderTypeEnum.SALES.getType())
-				.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType())
-				.apply("storage_quantity > purchase_quantity");//销售数量大于采购数量
-			List<Order> orderList = orderService.list(orderLambdaQueryWrapper);
-			List<Long> orderId = orderList.stream().map(Order::getId).collect(Collectors.toList());
-			//主表id
-			lambdaQueryWrapper.in(ObjectUtils.isNotNull(orderId), OrderItems::getPid, orderId);
+			if (ObjectUtils.isNotEmpty(orderItems.getShowAll()) && orderItems.getShowAll() == 0){
+				LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+				orderLambdaQueryWrapper.eq(Order::getIsDeleted, 0)
+					.eq(Order::getTenantId, AuthUtil.getTenantId())
+					.eq(Order::getBillType, OrderTypeEnum.SALES.getType())
+					.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType())
+					.apply("storage_quantity > purchase_quantity");//销售数量大于采购数量
+				List<Order> orderList = orderService.list(orderLambdaQueryWrapper);
+				List<Long> orderId = orderList.stream().map(Order::getId).collect(Collectors.toList());
+				//主表id
+				lambdaQueryWrapper.in(ObjectUtils.isNotNull(orderId), OrderItems::getPid, orderId);
+			}
 		}
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getBillNo()), OrderItems::getBillNo, orderItems.getBillNo());//销售单号
 		if (ObjectUtils.isNotNull(orderItems.getBusinesDateList()) && orderItems.getBusinesDateList().size() > 0) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -817,8 +817,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * @return
 	 */
 	@Override
-	@GlobalTransactional
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R affirm(Order order) {
 		// 订单时间
 		Date date = new Date();
@@ -1632,7 +1632,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void checkPassCancel(Long id) {
 		//获得当前销售订单信息
 		Order orderMessage = baseMapper.selectById(id);
@@ -1835,7 +1835,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void repealCancel(Order orderMessage) {
 		LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		orderLambdaQueryWrapper
@@ -1869,6 +1869,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				List<StockGoods> stockGoodsList = castToList(redisTemplate.opsForValue().get("stockGoods"), StockGoods.class);
 
 				if (CollectionUtils.isNotEmpty(orderItems)) {
+					List<StockGoods> stockGoods = new ArrayList<>();
 					orderItems.forEach(e -> {
 						// 开始锁定库存,减少可用
 						StockGoods oneStock = stockGoodsList.stream().filter(s ->
@@ -1894,12 +1895,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						oneStock.setSurplusRouteQuantity(surplusRouteQuantity.add(orderQuantity));
 						// 减少锁定库存
 						oneStock.setLockingQuantity(lockingQuantity == null ? new BigDecimal("0") : lockingQuantity.subtract(orderQuantity));
-						// 更新库存
-						boolean r = stockGoodsClient.updateStock(oneStock);
-						if (!r) {
-							throw new SecurityException("撤销失败: " + oneStock.getCode() + "更新库存失败");
-						}
+						stockGoods.add(oneStock);
 					});
+					// 更新库存
+					boolean r = stockGoodsClient.updateStockList(stockGoods);
+					if (!r) {
+						throw new SecurityException("撤销失败:更新库存失败");
+					}
 				}
 			}
 			order.setStatus(0);
@@ -1938,7 +1940,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	public List<OrderVO> orderInventoryList( String billType, Long itemId, Long corpId) {
+	public List<OrderVO> orderInventoryList(String billType, Long itemId, Long corpId) {
 		return baseMapper.orderInventoryList(AuthUtil.getTenantId(), "GN", billType, itemId, corpId);
 	}
 
@@ -1947,8 +1949,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * @return
 	 */
 	@Override
-	@GlobalTransactional(rollbackFor = Exception.class)
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R dealerSubmit(Order order) {
 		// dealer 1 确认订单 2 取消订单
 		Order selectById = baseMapper.selectById(order.getId());
@@ -5564,8 +5566,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					} else {
 						//更新对应销售单明细采购数量
 						OrderItems srcItems = orderItemsMapper.selectById(orderItems.getSrcItemId());
-						if(null != srcItems){
-							BigDecimal quantity = ObjectUtils.isNotNull(srcItems.getPurchaseQuantity()) ?srcItems.getPurchaseQuantity() : new BigDecimal("0.00");
+						if (null != srcItems) {
+							BigDecimal quantity = ObjectUtils.isNotNull(srcItems.getPurchaseQuantity()) ? srcItems.getPurchaseQuantity() : new BigDecimal("0.00");
 							srcItems.setPurchaseQuantity(quantity.add(orderItems.getActualQuantity()));
 							orderItemsMapper.updateById(srcItems);
 						}
@@ -7171,8 +7173,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * @param billType 货款类型: 申请 收费 付费
 	 * @param itemType 付款类型: 采购 销售 收货 发货
 	 */
-	@GlobalTransactional(rollbackFor = Exception.class)
+
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void paymentApply(Order order, String billType, String itemType) {
 		//获取所属公司中文名
 		if (order.getBelongToCorpId() != null) {
@@ -7402,8 +7405,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * @param billType 货款类型: 申请 收费 付费
 	 * @param itemType 付款类型: 采购 销售 收货 发货
 	 */
-	@GlobalTransactional(rollbackFor = Exception.class)
+
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void paymentApplyFD(Order order, String billType, String itemType) {
 		//获取所属公司中文名
 		if (order.getBelongToCorpId() != null) {

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryServiceImpl.java

@@ -155,7 +155,7 @@ public class SalaryServiceImpl extends ServiceImpl<SalaryMapper, Salary> impleme
 
 	@Override
 	@Transactional
-	@GlobalTransactional
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R checkOrder(Salary salary) {
 		{
 			Salary selectById = baseMapper.selectById(salary.getId());

blade-service/blade-stock/src/main/java/org/springblade/stock/feign/StockGoodsClient.java

@@ -254,6 +254,20 @@ public class StockGoodsClient implements IStockGoodsClient {
 	 * @return
 	 */
 	@Override
+	@PostMapping(UPDATE_STOCK_LIST)
+	@Transactional(rollbackFor = Exception.class)
+	public boolean updateStockList(List<StockGoods> stockGoods) {
+		stockGoodsService.updateBatchById(stockGoods);
+		return redisClient.basicData("stockGoods");
+	}
+
+	/**
+	 * 修改库存总账
+	 *
+	 * @param stockGoods
+	 * @return
+	 */
+	@Override
 	@PostMapping(UPDATE_STOCK_YCP)
 	@TenantIgnore
 	public boolean updateStockYCP(StockGoods stockGoods) {

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/AccServiceImpl.java

@@ -138,7 +138,7 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public boolean removeAcc(List<Long> idList) {
 		idList.forEach(id -> {
 			baseMapper.deleteById(id);

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/ItemsServiceImpl.java

@@ -55,7 +55,7 @@ public class ItemsServiceImpl extends ServiceImpl<ItemsMapper, Items> implements
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public boolean removeItems(List<Long> idList) {
 		idList.forEach(id -> {
 			baseMapper.deleteById(id);

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -185,7 +185,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 	@Override
 	@Transactional
-	@GlobalTransactional
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public Settlement cancelModify(SettlementDTO settlementDTO) {
 		Long id = settlementDTO.getId();
 		List<Items> itemsList = settlementDTO.getItemsList();
@@ -1689,7 +1689,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 	//审核取消方法
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void passCancel(Long settlementId) {
 
 		LambdaQueryWrapper<Settlement> settlementLambdaQueryWrapper = new LambdaQueryWrapper<>();

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/ClaimServiceImpl.java

@@ -355,7 +355,7 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 
 	@Override
 	@Transactional
-	@GlobalTransactional
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public Claim modify(Claim claim) {
 		Long id = claim.getId();
 		Claim claimOne = baseMapper.selectById(id);

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -503,7 +503,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@Transactional
-	@GlobalTransactional
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void check(OrderVO vo) {
 		Order order = new Order();
 		BeanUtil.copyProperties(vo, order);
@@ -551,8 +551,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	@GlobalTransactional
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R<OrderSubmitDto> submit(OrderSubmitDto order) {
 		order.setIfEnquiry("询价确认");
 		order.setUpdateUser(SecureUtil.getUserId());
@@ -586,7 +586,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	@GlobalTransactional
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	@Transactional(rollbackFor = Exception.class)
 	public R<OrderSubmitDto> commit(OrderSubmitDto submitDto) {
 		submitDto.setIfShipping("船务确认");
@@ -643,7 +643,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	@GlobalTransactional
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	@Transactional(rollbackFor = Exception.class)
 	public R dealerSubmit(Order order) {
 		// dealer 1 确认订单 2 取消订单
@@ -929,7 +929,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void repealCancel(Order orderMessage) {
 		LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		orderLambdaQueryWrapper