From ce0a8121a91aee68d257f789537de19c5e33c86d Mon Sep 17 00:00:00 2001
From: itzhang <2019326567@qq.com>
Date: Tue, 22 Jul 2025 09:19:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=A6=81=E8=B4=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=9A=84=E8=A7=A3=E9=94=81=E9=94=81=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GoodsPlanController.java       | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/src/main/java/com/management/controller/GoodsPlanController.java b/src/main/java/com/management/controller/GoodsPlanController.java
index aa8db55..c323725 100644
--- a/src/main/java/com/management/controller/GoodsPlanController.java
+++ b/src/main/java/com/management/controller/GoodsPlanController.java
@@ -358,6 +358,21 @@ public class GoodsPlanController {
                 backReqMap.put("response_info__c", trackingNumReason.getString("reason"));
 
                 //开始回写
+                JSONObject unlockReq = crmRequestUtil.unlockCRM(goodsPlanId, "purchase_plan__c");
+                //解锁
+                if ("1".equals(goodsPlanData.getString("lock_status"))) {
+                    log.info("解锁");
+
+                    JSONObject unlockRes = new JSONObject();
+
+                    try {
+                        unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class);
+                    } catch (RestClientException e) {
+                        e.printStackTrace();
+                    }
+                    System.out.println("解锁" + unlockRes);
+                }
+
                 JSONObject backReq = crmRequestUtil.updateCRM(backReqMap);
 
                 JSONObject backRes = new JSONObject();
@@ -369,6 +384,18 @@ public class GoodsPlanController {
                 }
 
                 System.out.println("回写结果为：" + backRes);
+
+                log.info("上锁");
+                JSONObject lockRes = new JSONObject();
+
+                try {
+                    lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class);
+                } catch (RestClientException e) {
+                    e.printStackTrace();
+                }
+
+                System.out.println("上锁" + lockRes);
+
                 continue;
             }
 
@@ -449,6 +476,21 @@ public class GoodsPlanController {
             }
 
             //开始回写
+            JSONObject unlockReq = crmRequestUtil.unlockCRM(goodsPlanId, "purchase_plan__c");
+            //解锁
+            if ("1".equals(goodsPlanData.getString("lock_status"))) {
+                log.info("解锁");
+
+                JSONObject unlockRes = new JSONObject();
+
+                try {
+                    unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class);
+                } catch (RestClientException e) {
+                    e.printStackTrace();
+                }
+                System.out.println("解锁" + unlockRes);
+            }
+
             JSONObject backReq = crmRequestUtil.updateCRM(backReqMap);
 
             System.out.println("回写请求为：" + JSON.parseObject(JSON.toJSONString(backReq)));
@@ -463,6 +505,17 @@ public class GoodsPlanController {
 
             System.out.println("回写结果为：" + backRes);
 
+            log.info("上锁");
+            JSONObject lockRes = new JSONObject();
+
+            try {
+                lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class);
+            } catch (RestClientException e) {
+                e.printStackTrace();
+            }
+
+            System.out.println("上锁" + lockRes);
+
             //开始记录日志
             JSONObject logResMap = new JSONObject();
             try {