|
|
@@ -13,6 +13,7 @@ import com.rongwei.bscommon.sys.fegin.RwApsServer;
|
|
|
import com.rongwei.bscommon.sys.service.*;
|
|
|
import com.rongwei.bsentity.domain.*;
|
|
|
import com.rongwei.bsentity.vo.*;
|
|
|
+import com.rongwei.commonservice.service.RedisService;
|
|
|
import com.rongwei.rwadmincommon.system.vo.SysUserVo;
|
|
|
import com.rongwei.rwcommon.base.exception.CustomException;
|
|
|
import com.rongwei.rwcommon.utils.DateUtils;
|
|
|
@@ -25,6 +26,7 @@ import org.redisson.api.RedissonClient;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
@@ -43,6 +45,8 @@ public class ApsServiceImpl implements ApsService {
|
|
|
@Autowired
|
|
|
private RedissonClient redissonClient;
|
|
|
@Autowired
|
|
|
+ private RedisService redisService;
|
|
|
+ @Autowired
|
|
|
private ApsBlankOrderService apsBlankOrderService;
|
|
|
@Autowired
|
|
|
private ApsBlankOrderDao apsBlankOrderDao;
|
|
|
@@ -62,6 +66,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
private ApsProcessOperationOutMaterService apsProcessOperationOutMaterService;
|
|
|
|
|
|
@Override
|
|
|
+// @Async("customThreadPool")
|
|
|
public void apsSchedule(List<ApsBlankOrderVo> apsBlankOrders) {
|
|
|
// 当前等路人所属工厂
|
|
|
SysUserVo currentUser = CXCommonUtils.getCurrentUser();
|
|
|
@@ -80,6 +85,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
try {
|
|
|
// 加锁最大1小时
|
|
|
rLock.lock(1, TimeUnit.HOURS);
|
|
|
+ redisService.redisCatchInit("apsUser-"+tenantId,currentUser,3600);
|
|
|
// 合并待发布未锁定的订单一起排程
|
|
|
String idStrs = null;
|
|
|
if(apsBlankOrders != null && apsBlankOrders.size()>0){
|
