From e5feb4fc2e11c2ed6579ce962d6474b282d04084 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 19 Aug 2025 21:24:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(so):=20=E5=90=8C=E6=AD=A5=20CLM=20=E5=90=88?= =?UTF-8?q?=E5=90=8C=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=80=BC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pubimpl/so/m30/so/m33/Rewrite30For33Impl.java | 2 +- .../private/nc/pubimpl/so/rule/SyncClmNumRule.java | 13 +++++++------ so/src/public/nc/vo/so/m30/util/HttpClmUtil.java | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/so/src/private/nc/pubimpl/so/m30/so/m33/Rewrite30For33Impl.java b/so/src/private/nc/pubimpl/so/m30/so/m33/Rewrite30For33Impl.java index 9f636f1..46297cd 100644 --- a/so/src/private/nc/pubimpl/so/m30/so/m33/Rewrite30For33Impl.java +++ b/so/src/private/nc/pubimpl/so/m30/so/m33/Rewrite30For33Impl.java @@ -210,7 +210,7 @@ public class Rewrite30For33Impl implements IRewrite30For33 { // 更新信用调用后 processer.addAfterRule(new RenovateARByBidsEndRule(engrossAction)); // 同步CLM合同销售订单 - processer.addAfterRule(new SyncClmNumRule("totalaccrued")); + processer.addAfterRule(new SyncClmNumRule("ntotalarmny")); } private void addRuleForOutRush(AroundProcesser processer, M30EngrossAction engrossAction) { diff --git a/so/src/private/nc/pubimpl/so/rule/SyncClmNumRule.java b/so/src/private/nc/pubimpl/so/rule/SyncClmNumRule.java index 0394224..bd3e089 100644 --- a/so/src/private/nc/pubimpl/so/rule/SyncClmNumRule.java +++ b/so/src/private/nc/pubimpl/so/rule/SyncClmNumRule.java @@ -3,6 +3,7 @@ package nc.pubimpl.so.rule; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import nc.impl.pubapp.pattern.rule.IRule; +import nc.vo.pub.lang.UFDouble; import nc.vo.so.m30.entity.SaleOrderBVO; import nc.vo.so.m30.entity.SaleOrderHVO; import nc.vo.so.m30.entity.SaleOrderViewVO; @@ -38,13 +39,13 @@ public class SyncClmNumRule implements IRule { continue; } // 累计安排生产订单主数量 - Object narrangemonum = body.getAttributeValue("narrangemonum"); + UFDouble narrangemonum = body.getNarrangemonum(); if ("narrangemonum".equals(flag) && narrangemonum == null) { continue; } // 累计确认应收金额 - Object totalaccrued = body.getAttributeValue("totalaccrued"); - if ("totalaccrued".equals(flag) && totalaccrued == null) { + UFDouble ntotalarmny = body.getNtotalarmny(); + if ("ntotalarmny".equals(flag) && ntotalarmny == null) { continue; } JSONObject oneJson = new JSONObject(); @@ -53,10 +54,10 @@ public class SyncClmNumRule implements IRule { bodyMap.put("id", vbdef11); if (narrangemonum != null) { - bodyMap.put("narrangemonum", narrangemonum); + bodyMap.put("narrangemonum", narrangemonum.toString()); } - if (totalaccrued != null) { - bodyMap.put("totalAccrued", totalaccrued); + if (ntotalarmny != null) { + bodyMap.put("totalAccrued", ntotalarmny.toString()); } bodyList.add(bodyMap); diff --git a/so/src/public/nc/vo/so/m30/util/HttpClmUtil.java b/so/src/public/nc/vo/so/m30/util/HttpClmUtil.java index 3838903..0f9a7a6 100644 --- a/so/src/public/nc/vo/so/m30/util/HttpClmUtil.java +++ b/so/src/public/nc/vo/so/m30/util/HttpClmUtil.java @@ -98,14 +98,14 @@ public class HttpClmUtil { String signature = URLEncoder.encode(base64String, StandardCharsets.UTF_8); params.put("signature", signature); String responseString = doGet(baseUrl + tokenUrl, params); - Logger.error("HttpClmUtil-responseString = " + responseString); + // Logger.error("HttpClmUtil-responseString = " + responseString); Gson gson = new Gson(); Map result = gson.fromJson(responseString, Map.class); if (StringUtils.equals("00000", result.getOrDefault("code", "") + "")) { Map tokenInfo = (Map) result.get("data"); access_token = (String) tokenInfo.getOrDefault("access_token", ""); } - Logger.error("HttpClmUtil-getAccessToken = " + access_token); + // Logger.error("HttpClmUtil-getAccessToken = " + access_token); return access_token; }