diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java index 149f899..1373bad 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java @@ -40,11 +40,11 @@ public class AcsController extends HuahengBaseController { // @PassApiAuthentication // @ApiLogger(apiName = "API接口第三方Token校验测试", from = "TEST") - @ResponseBody - @PostMapping(value = "/testTokenCheck") - public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) { - return Result.ok(); - } +// @ResponseBody +// @PostMapping(value = "/testTokenCheck") +// public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) { +// return Result.ok(); +// } @PostMapping("/notifyAGVTask") @ResponseBody diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java index 44009fb..70c0c6d 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java @@ -79,8 +79,8 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem return result; } - @Async("baseExecutor") @Override + @Async("asyncPoolTaskExecutor") public void sendTaskToWcs(List<TaskHeader> taskHeaders, String warehouseCode, String zoneCode) { String lockKey = warehouseCode + "_" + zoneCode; handleMultiProcess("sendTaskToWcs", lockKey, 10, 300, new MultiProcessListener() { diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java index f79b896..2dd07b9 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java @@ -87,8 +87,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi private ITaskDetailService taskDetailService; @Autowired private IInventoryHeaderService inventoryHeaderService; - @Resource - private IHuahengMultiHandlerService huahengMultiHandlerService; /** * 根据出库单详情,匹配到可用出库的库存详情