From 119745516dd15ebad191c77bc09c7655f5f35b03 Mon Sep 17 00:00:00 2001
From: YXY <932687738@qq.com>
Date: Mon, 16 Oct 2023 21:46:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../flyingbook/controller/EdiController.java | 10 ++++++++++
.../mapper/ErpLarkTempRelationMapper.java | 3 ++-
.../cjt/CJTOperateCallBackAbstract.java | 18 +++++++++++-------
.../cjt/CJTOperateCallBackFactory.java | 1 +
.../cjt/ManufactureOrderSyncCallOperate.java | 2 +-
.../mapper/ErpLarkTempRelationMapper.xml | 6 ++++++
6 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/EdiController.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/EdiController.java
index 0f8c627..23c4e8a 100644
--- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/EdiController.java
+++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/EdiController.java
@@ -78,6 +78,16 @@ public class EdiController extends BaseController {
iEventLogService.insertBatchEventLog(Arrays.asList(log1, log2));
}
+ /**
+ * 同步数据到飞书表格
+ */
+// @PostMapping("/cjtTicket")
+// public void receiveCjtTicket(Long id) {
+// ErpLarkTempRelation erpLarkTempRelation = erpLarkTempRelationMapper.selectErpLarkTempRelationById(id);
+// JSONObject jsonObject = JSONObject.parseObject(erpLarkTempRelation.getRemark());
+// execeuteByType(jsonObject);
+// }
+
/**
* 同步数据到飞书表格
*/
diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkTempRelationMapper.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkTempRelationMapper.java
index 7aa5d5f..7509991 100644
--- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkTempRelationMapper.java
+++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkTempRelationMapper.java
@@ -65,7 +65,8 @@ public interface ErpLarkTempRelationMapper
public Long selectMaxId(@Param("method") String method, @Param("flag") Long flag,@Param("key") String key);
public int updateByMethod(@Param("method") String method, @Param("flag") Long flag,@Param("id") Long id,@Param("key") String key);
- public int updateForCjt(@Param("flag") Long flag,@Param("id") Long id,@Param("remark") String remark);
+ public int updateForCjt(@Param("flag") Long flag,@Param("id") Long id);
+ public int updateForCjtError(@Param("flag") Long flag,@Param("id") Long id,@Param("remark") String remark);
public int deleteByMethod(@Param("method") String method,@Param("flag") Long flag,@Param("id") Long id,@Param("key") String key);
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 89dd047..09df5d8 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
@@ -90,7 +90,7 @@ public abstract class CJTOperateCallBackAbstract {
}
}
- private void preHandle(CJTEdiCallbackRequestVo req) {
+ public void preHandle(CJTEdiCallbackRequestVo req) {
if (req.getRetryCount() > 0) {
return;
}
@@ -109,22 +109,26 @@ public abstract class CJTOperateCallBackAbstract {
private void endHandle(CJTEdiCallbackRequestVo req) {
if (req.getTempId() != null) {
- erpLarkTempRelationMapper.updateForCjt(FlagStatus.DELETED.getCode(), req.getTempId(), "");
+ erpLarkTempRelationMapper.updateForCjt(FlagStatus.DELETED.getCode(), req.getTempId());
}
}
private void errorHandle(CJTEdiCallbackRequestVo req, Exception e) {
if (req.getTempId() != null) {
- erpLarkTempRelationMapper.updateForCjt(FlagStatus.OK.getCode(), req.getTempId(), e.getMessage());
+ erpLarkTempRelationMapper.updateForCjtError(FlagStatus.OK.getCode(), req.getTempId(), e.getMessage());
}
}
private void sync(CJTEdiCallbackRequestVo req) {
CjtAccountEnum cjtAccountEnum = req.getCjtAccountEnum();
- LarkCJTRequestBody cjtRequestBody = new LarkCJTRequestBody(req.getVoucherId());
- LarkCJTRequest cjtRequest = new LarkCJTRequest(getRequestUrl(), cjtAccountEnum.getAppKey(), cjtAccountEnum.getAppSecret(), generateToken(req), cjtRequestBody);
- LarkOkHttpHelper.post(cjtRequest);
- JSONObject jsonObject = requestCjt(cjtRequest);
+ String msgType = req.getMsgType();
+ JSONObject jsonObject = null;
+ if (!msgType.contains("Delete")){
+ LarkCJTRequestBody cjtRequestBody = new LarkCJTRequestBody(req.getVoucherId());
+ LarkCJTRequest cjtRequest = new LarkCJTRequest(getRequestUrl(), cjtAccountEnum.getAppKey(), cjtAccountEnum.getAppSecret(), generateToken(req), cjtRequestBody);
+ LarkOkHttpHelper.post(cjtRequest);
+ jsonObject = requestCjt(cjtRequest);
+ }
syncRecord(req, jsonObject);
}
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 1441883..fd6ce50 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
@@ -76,6 +76,7 @@ public class CJTOperateCallBackFactory {
break;
default:
+ saleDispatchSyncCallOperate.preHandle(cjtEdiCallbackRequestVo);
break;
}
}
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 831d0df..0be1364 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
@@ -44,7 +44,7 @@ public class ManufactureOrderSyncCallOperate extends CJTOperateCallBackAbstract
if (cjtAccountEnum.getCode().equals(CjtAccountEnum.TWO.getCode())){
sb.append(detail.get("Quantity")).append("_");
sb.append(getSpecialKey(detail, "pubuserdefnvc2")).append("_");
- sb.append(getSpecialKey(detail, "priuserdefnvc1")).append("_");
+ sb.append(getSpecialKey(detail, "priuserdefnvc1"));
}else {
sb.append(detail.get("SourceVoucherCode")).append("_");
sb.append(header.get("Code")).append("_");
diff --git a/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkTempRelationMapper.xml b/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkTempRelationMapper.xml
index 256f04f..44c51a0 100644
--- a/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkTempRelationMapper.xml
+++ b/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkTempRelationMapper.xml
@@ -128,6 +128,12 @@
and #{id} >= id
+ update erp_lark_temp_relation
+ set flag = #{flag}
+ where #{id} = id
+
+
+
update erp_lark_temp_relation
set flag = #{flag},remark = #{remark}
where #{id} = id