diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CjtCallBackOperateEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/CjtCallBackOperateEnum.java index 329d309..ae99970 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CjtCallBackOperateEnum.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/CjtCallBackOperateEnum.java @@ -12,23 +12,32 @@ public enum CjtCallBackOperateEnum { PURCHASE_ARRIVAL_ORDER_CREATE("PuArrival_Create", "新增进货单",AppType.SYNC_CJT_PURCHASE_ARRIVAL_ORDER_DATA_TO_MULTI_TABLE.getCode()), PURCHASE_ARRIVAL_ORDER_UPDATE("PuArrival_Update", "修改进货单",AppType.SYNC_CJT_PURCHASE_ARRIVAL_ORDER_DATA_TO_MULTI_TABLE.getCode()), PURCHASE_ARRIVAL_ORDER_DELETE("PuArrival_Delete", "删除进货单",AppType.SYNC_CJT_PURCHASE_ARRIVAL_ORDER_DATA_TO_MULTI_TABLE.getCode()), + PURCHASE_ARRIVAL_ORDER_AUDIT("PuArrival_Audit", "审核进货单",AppType.SYNC_CJT_PURCHASE_ARRIVAL_ORDER_DATA_TO_MULTI_TABLE.getCode()), PURCHASE_ORDER_CREATE("PurchaseOrder_Create", "新增采购订单",AppType.SYNC_CJT_PURCHASE_ORDER_DATA_TO_MULTI_TABLE.getCode()), PURCHASE_ORDER_UPDATE("PurchaseOrder_Update", "修改采购订单",AppType.SYNC_CJT_PURCHASE_ORDER_DATA_TO_MULTI_TABLE.getCode()), PURCHASE_ORDER_DELETE("PurchaseOrder_Delete", "删除采购订单",AppType.SYNC_CJT_PURCHASE_ORDER_DATA_TO_MULTI_TABLE.getCode()), + PURCHASE_ORDER_AUDIT("PurchaseOrder_Audit", "审核采购订单",AppType.SYNC_CJT_PURCHASE_ORDER_DATA_TO_MULTI_TABLE.getCode()), SALE_DELIVERY_CREATE("SaleDelivery_Create", "新增销货单",AppType.SYNC_CJT_SALE_DELIVERY_DATA_TO_MULTI_TABLE.getCode()), SALE_DELIVERY_UPDATE("SaleDelivery_Create", "修改销货单",AppType.SYNC_CJT_SALE_DELIVERY_DATA_TO_MULTI_TABLE.getCode()), SALE_DELIVERY_DELETE("SaleDelivery_Create", "删除销货单",AppType.SYNC_CJT_SALE_DELIVERY_DATA_TO_MULTI_TABLE.getCode()), + SALE_DELIVERY_AUDIT("SaleDelivery_Audit", "审核销货单",AppType.SYNC_CJT_SALE_DELIVERY_DATA_TO_MULTI_TABLE.getCode()), + SALE_DISPATCH_CREATE("SaleDispatchVoucher_Create", "新增销售出库单",AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.getCode()), SALE_DISPATCH_UPDATE("SaleDispatchVoucher_Update", "修改销售出库单",AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.getCode()), SALE_DISPATCH_DELETE("SaleDispatchVoucher_Delete", "删除销售出库单",AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.getCode()), + SALE_DISPATCH_AUDIT("SaleDispatchVoucher_Audit", "审核销售出库单",AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.getCode()), + MANUFACTURE_ORDER_CREATE("ManufactureOrder_Create", "新增加工单",AppType.SYNC_CJT_MANUFACTURE_ORDER_DATA_TO_MULTI_TABLE.getCode()), MANUFACTURE_ORDER_UPDATE("ManufactureOrder_Update", "修改加工单",AppType.SYNC_CJT_MANUFACTURE_ORDER_DATA_TO_MULTI_TABLE.getCode()), MANUFACTURE_ORDER_DELETE("ManufactureOrder_Delete", "删除加工单",AppType.SYNC_CJT_MANUFACTURE_ORDER_DATA_TO_MULTI_TABLE.getCode()), + MANUFACTURE_ORDER_AUDIT("ManufactureOrder_Audit", "审核加工单",AppType.SYNC_CJT_MANUFACTURE_ORDER_DATA_TO_MULTI_TABLE.getCode()), + SALE_ORDER_CREATE("SaleOrder_Create", "新增销售订单",AppType.SYNC_CJT_SALE_ORDER_DATA_TO_MULTI_TABLE.getCode()), SALE_ORDER_UPDATE("SaleOrder_Update", "修改销售订单",AppType.SYNC_CJT_SALE_ORDER_DATA_TO_MULTI_TABLE.getCode()), - SALE_ORDER_DELETE("SaleOrder_Delete", "删除销售订单",AppType.SYNC_CJT_SALE_ORDER_DATA_TO_MULTI_TABLE.getCode()); + SALE_ORDER_DELETE("SaleOrder_Delete", "删除销售订单",AppType.SYNC_CJT_SALE_ORDER_DATA_TO_MULTI_TABLE.getCode()), + SALE_ORDER_AUDIT("SaleOrder_Audit", "审核销售订单",AppType.SYNC_CJT_SALE_ORDER_DATA_TO_MULTI_TABLE.getCode()); private final String code; diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/CJTOperateCallBackAbstract.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/CJTOperateCallBackAbstract.java index 090536d..6ff8ed1 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/CJTOperateCallBackAbstract.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/CJTOperateCallBackAbstract.java @@ -66,18 +66,17 @@ public abstract class CJTOperateCallBackAbstract { CjtCallBackOperateEnum msgTypeEnum = req.getMsgTypeEnum(); String operateCallBackFlag = buildCacheUniqueKey(RedisConstants.CJT_CALLBACK_OPERATE, req.getAppId() + msgTypeEnum.getLarkCompanyCode() + req.getVoucherId()); try { - Boolean operateFlag = redisCache.setCacheObjectIfAbsent(operateCallBackFlag, operateCallBackFlag, 2L, TimeUnit.MINUTES); + preHandle(req); + Boolean operateFlag = redisCache.setCacheObjectIfAbsent(operateCallBackFlag, operateCallBackFlag, 5L, TimeUnit.MINUTES); if (!operateFlag) { return; } - preHandle(req); initContext(req); -// resetTicket(req); sync(req); endHandle(req); } catch (Exception e) { log.error("{} execute error", this.getClass().getSimpleName(), e); - if (req.getRetry() && req.getRetryCount() < 2) { + if (req.getRetry() && req.getRetryCount() < 1) { req.addRetryCount(); execute(req); } else { @@ -85,6 +84,7 @@ public abstract class CJTOperateCallBackAbstract { larkRobotHelper.sendMessageByBot(ROBOT_GROUP, buildRobotErrorCountMessage(req, e)); } } + redisCache.deleteObject(operateCallBackFlag); } public void preHandle(CJTEdiCallbackRequestVo req) { diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/CJTOperateCallBackFactory.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/CJTOperateCallBackFactory.java index 2ef7b09..22a42a6 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/CJTOperateCallBackFactory.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/CJTOperateCallBackFactory.java @@ -50,31 +50,37 @@ public class CJTOperateCallBackFactory { case SALE_DISPATCH_CREATE: case SALE_DISPATCH_UPDATE: case SALE_DISPATCH_DELETE: + case SALE_DISPATCH_AUDIT: saleDispatchSyncCallOperate.execute(cjtEdiCallbackRequestVo); break; case SALE_ORDER_CREATE: case SALE_ORDER_UPDATE: case SALE_ORDER_DELETE: + case SALE_ORDER_AUDIT: saleOrderSyncCallBackOperate.execute(cjtEdiCallbackRequestVo); break; case MANUFACTURE_ORDER_CREATE: case MANUFACTURE_ORDER_UPDATE: case MANUFACTURE_ORDER_DELETE: + case MANUFACTURE_ORDER_AUDIT: manufactureOrderSyncCallOperate.execute(cjtEdiCallbackRequestVo); break; case PURCHASE_ORDER_CREATE: case PURCHASE_ORDER_UPDATE: case PURCHASE_ORDER_DELETE: + case PURCHASE_ORDER_AUDIT: purchaseOrderSyncCallBackOperate.execute(cjtEdiCallbackRequestVo); break; case PURCHASE_ARRIVAL_ORDER_CREATE: case PURCHASE_ARRIVAL_ORDER_UPDATE: case PURCHASE_ARRIVAL_ORDER_DELETE: + case PURCHASE_ARRIVAL_ORDER_AUDIT: purchaseArrivalOrderCallBackOperate.execute(cjtEdiCallbackRequestVo); break; case SALE_DELIVERY_CREATE: case SALE_DELIVERY_UPDATE: case SALE_DELIVERY_DELETE: + case SALE_DELIVERY_AUDIT: saleDeliverySyncCallBackOperate.execute(cjtEdiCallbackRequestVo); break; default: diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/ManufactureOrderSyncCallOperate.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/ManufactureOrderSyncCallOperate.java index 0be1364..3ff3199 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/ManufactureOrderSyncCallOperate.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/ManufactureOrderSyncCallOperate.java @@ -27,6 +27,7 @@ public class ManufactureOrderSyncCallOperate extends CJTOperateCallBackAbstract addRecord(req, returnBody); break; case MANUFACTURE_ORDER_UPDATE: + case MANUFACTURE_ORDER_AUDIT: updateRecord(req,returnBody); break; case MANUFACTURE_ORDER_DELETE: diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/PurchaseArrivalOrderCallBackOperate.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/PurchaseArrivalOrderCallBackOperate.java index d8b093b..de0e151 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/PurchaseArrivalOrderCallBackOperate.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/PurchaseArrivalOrderCallBackOperate.java @@ -26,6 +26,7 @@ public class PurchaseArrivalOrderCallBackOperate extends CJTOperateCallBackAbstr addRecord(req, returnBody); break; case PURCHASE_ARRIVAL_ORDER_UPDATE: + case PURCHASE_ARRIVAL_ORDER_AUDIT: updateRecord(req,returnBody); break; case PURCHASE_ARRIVAL_ORDER_DELETE: @@ -111,7 +112,7 @@ public class PurchaseArrivalOrderCallBackOperate extends CJTOperateCallBackAbstr @Override protected String getDetailName() { - return "PurchaseOrderDetails"; + return "Details"; } } diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/PurchaseOrderSyncCallBackOperate.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/PurchaseOrderSyncCallBackOperate.java index 63531a6..a707e3d 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/PurchaseOrderSyncCallBackOperate.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/PurchaseOrderSyncCallBackOperate.java @@ -26,6 +26,7 @@ public class PurchaseOrderSyncCallBackOperate extends CJTOperateCallBackAbstract addRecord(req, returnBody); break; case PURCHASE_ORDER_UPDATE: + case PURCHASE_ORDER_AUDIT: updateRecord(req,returnBody); break; case PURCHASE_ORDER_DELETE: diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleDeliverySyncCallBackOperate.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleDeliverySyncCallBackOperate.java index 5ee5f41..f2382c2 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleDeliverySyncCallBackOperate.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleDeliverySyncCallBackOperate.java @@ -26,6 +26,7 @@ public class SaleDeliverySyncCallBackOperate extends CJTOperateCallBackAbstract addRecord(req, returnBody); break; case SALE_DELIVERY_UPDATE: + case SALE_DELIVERY_AUDIT: updateRecord(req,returnBody); break; case SALE_DELIVERY_DELETE: diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleDispatchSyncCallOperate.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleDispatchSyncCallOperate.java index 3d2c388..08dfbf8 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleDispatchSyncCallOperate.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleDispatchSyncCallOperate.java @@ -27,6 +27,7 @@ public class SaleDispatchSyncCallOperate extends CJTOperateCallBackAbstract { addRecord(req, returnBody); break; case SALE_DISPATCH_UPDATE: + case SALE_DISPATCH_AUDIT: updateRecord(req,returnBody); break; case SALE_DISPATCH_DELETE: diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleOrderSyncCallBackOperate.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleOrderSyncCallBackOperate.java index b6892ff..8f34493 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleOrderSyncCallBackOperate.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleOrderSyncCallBackOperate.java @@ -26,6 +26,7 @@ public class SaleOrderSyncCallBackOperate extends CJTOperateCallBackAbstract{ addRecord(req, returnBody); break; case SALE_ORDER_UPDATE: + case SALE_ORDER_AUDIT: updateRecord(req,returnBody); break; case SALE_ORDER_DELETE: