达沃特修改暂存

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/enums/DeliveryStatusEnum.java

@@ -9,20 +9,24 @@ import java.util.Objects;
 @AllArgsConstructor
 public enum DeliveryStatusEnum {
 	/**
-	 * 发货
+	 * 客户确认-确认收货-已收货
 	 */
 	DELIVER("已收货"),
 
 	/**
-	 * 撤销发货
+	 * 客户确认/工厂发货-撤销发货   经销商-调拨-撤销调拨
 	 */
 	REPEAL("录入"),
 	/**
-	 * 到货
+	 * 工厂发货-确认发货 已发货
 	 */
 	REVOCATION("已发货"),
 	/**
-	 * 确认调拨
+	 * 客户确认-确认到货-已到货
+	 */
+	HAVWARRIVED("已到货"),
+	/**
+	 * 经销商-调拨-确认调拨
 	 */
 	ALLOT("确认调拨"),
 	/**

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

@@ -260,7 +260,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 operationFinanceProcess(AuditProecess auditProecess) {
 
 		//查看最新操作记录,防止重复提交
@@ -963,7 +963,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 salaryCheck(AuditProecess auditProecess) {
 		//查看最新操作记录,防止重复提交
 		AuditProecess proecessTemp = baseMapper.selectById(auditProecess.getId());

blade-service/blade-client/src/main/java/org/springblade/client/lock/controller/LockController.java

@@ -30,6 +30,7 @@ import org.springblade.client.lock.service.ILockService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.AesUtil;
 import org.springblade.core.tool.utils.Func;
@@ -65,6 +66,7 @@ public class LockController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入lock")
 	public R<Lock> detail(Lock lock) {
+		lock.setTenantId(SecureUtil.getTenantId());
 		Lock detail = lockService.getOne(Condition.getQueryWrapper(lock));
 		return R.data(detail);
 	}
@@ -76,6 +78,7 @@ public class LockController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入lock")
 	public R<IPage<Lock>> list(Lock lock, Query query) {
+		lock.setTenantId(SecureUtil.getTenantId());
 		IPage<Lock> pages = lockService.page(Condition.getPage(query), Condition.getQueryWrapper(lock));
 		return R.data(pages);
 	}
@@ -87,6 +90,7 @@ public class LockController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入lock")
 	public R<IPage<LockVO>> page(LockVO lock, Query query) {
+		lock.setTenantId(SecureUtil.getTenantId());
 		IPage<LockVO> pages = lockService.selectLockPage(Condition.getPage(query), lock);
 		return R.data(pages);
 	}

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

@@ -835,7 +835,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	public DailyNumberVO dailyNumber(DeliveryVO delivery) {
 		DailyNumberVO dailyNumberVo = new DailyNumberVO();
 		//获取今日发货数量
-		dailyNumberVo.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,new Date(),DeliveryStatusEnum.DELIVER.getType()));
+		dailyNumberVo.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,new Date(),DeliveryStatusEnum.REVOCATION.getType()));
 		//获取待发货数量
 		dailyNumberVo.setWaitDeliver(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,null,DeliveryStatusEnum.REPEAL.getType()));
 		return dailyNumberVo;
@@ -851,7 +851,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				CorpNumberVO corpNumberVO = new CorpNumberVO();
 				corpNumberVO.setBelongToCorpName(e.getGoodtypes());
 				//获取今日发货数量
-				corpNumberVO.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),new Date(),DeliveryStatusEnum.DELIVER.getType()));
+				corpNumberVO.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),new Date(),DeliveryStatusEnum.REVOCATION.getType()));
 				//获取待发货数量
 				corpNumberVO.setWaitDeliver(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),null,DeliveryStatusEnum.REPEAL.getType()));
 				list.add(corpNumberVO);

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

@@ -481,7 +481,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 	public R revocation(Delivery delivery) {
 		String billStatus = null;//订单状态
 		if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.TAKE.getType())) {
-			billStatus = DeliveryStatusEnum.REVOCATION.getType();
+			billStatus = DeliveryStatusEnum.HAVWARRIVED.getType();
 		} else if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.REVOCATION.getType())) {
 			billStatus = DeliveryStatusEnum.DELIVER.getType();
 		}