From 792c2671e7bcbf035d328a794bad08c57d063a32 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Thu, 17 Jul 2025 08:57:51 +0800 Subject: [PATCH] =?UTF-8?q?nuonuo=E5=8F=91=E7=A5=A8=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nuonuo/service/impl/NuoNuoServiceImpl.java | 16 ++++++++++++---- .../seeyon/service/impl/SeeYonInterFaceImpl.java | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/impl/NuoNuoServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/impl/NuoNuoServiceImpl.java index b45b6d89..61387208 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/impl/NuoNuoServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/nuonuo/service/impl/NuoNuoServiceImpl.java @@ -178,7 +178,7 @@ public class NuoNuoServiceImpl extends BaseService impleme // 创建expenseList JSONArray JSONObject expenseItem = new JSONObject(); expenseItem.put("materialCode", ""); - expenseItem.put("invoiceno", detailArray.getJSONObject(i).getString("field0150")); + expenseItem.put("invoiceno", mainData.getString("field0150")); expenseItem.put("sklx", ""); expenseItem.put("buysellflag", "1"); expenseItem.put("szxm", ""); @@ -195,7 +195,11 @@ public class NuoNuoServiceImpl extends BaseService impleme expenseItem.put("quantity", detailArray.getJSONObject(i).getString("field0157")); expenseItem.put("localAmount", detailArray.getJSONObject(i).getString("field0149")); expenseItem.put("detailId", detailArray.getJSONObject(i).getString("field0192")); - expenseItem.put("taxRate", detailArray.getJSONObject(i).getString("field0156")); + if(detailArray.getJSONObject(i).getString("field0156") != null && !"".equals(detailArray.getJSONObject(i).getString("field0156"))){ + BigDecimal value = detailArray.getJSONObject(i).getBigDecimal("field0156"); + int result = value.multiply(BigDecimal.valueOf(100)).intValue(); // 结果：5 + expenseItem.put("taxRate", String.valueOf(result)); + } //expenseItem.put("kplx", ""); //expenseItem.put("areacl", ""); expenseItem.put("subjectCode", "1122"); @@ -709,7 +713,7 @@ public class NuoNuoServiceImpl extends BaseService impleme // 创建expenseList JSONArray JSONObject expenseItem = new JSONObject(); expenseItem.put("materialCode", ""); - expenseItem.put("invoiceno", detailArray.getJSONObject(i).getString("field0150")); + expenseItem.put("invoiceno", mainData.getString("field0150")); expenseItem.put("sklx", ""); expenseItem.put("buysellflag", "1"); expenseItem.put("szxm", ""); @@ -726,7 +730,11 @@ public class NuoNuoServiceImpl extends BaseService impleme expenseItem.put("quantity", detailArray.getJSONObject(i).getString("field0157")); expenseItem.put("localAmount", detailArray.getJSONObject(i).getString("field0149") != null ? detailArray.getJSONObject(i).getBigDecimal("field0149") : "0"); expenseItem.put("detailId", detailArray.getJSONObject(i).getString("field0197")); - expenseItem.put("taxRate", detailArray.getJSONObject(i).getString("field0156")); + if(detailArray.getJSONObject(i).getString("field0156") != null && !"".equals(detailArray.getJSONObject(i).getString("field0156"))){ + BigDecimal value = detailArray.getJSONObject(i).getBigDecimal("field0156"); + int result = value.multiply(BigDecimal.valueOf(100)).intValue(); // 结果：5 + expenseItem.put("taxRate", String.valueOf(result)); + } //expenseItem.put("kplx", ""); //expenseItem.put("areacl", ""); expenseItem.put("subjectCode", "1122"); diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java index 5ef99bc5..036fa1b4 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java @@ -245,6 +245,8 @@ public class SeeYonInterFaceImpl implements ISeeYonInterFace { } //表单模版ID String formAppId = requestData.getString("formAppId"); + //表单模版ID + String affairId = requestData.getString("affairId"); //事件事件类型 String eventType = requestData.getString("eventType"); //数据源编码 @@ -326,7 +328,7 @@ public class SeeYonInterFaceImpl implements ISeeYonInterFace { object.put("formApp",formAppId); object.put("eventType",eventType); object.put("businessDataStr",seeYonBean.toJSONString()); - object.put("affairId",""); + object.put("affairId",affairId); object.put("summaryId",requestData.getString("summaryId")); object.put("currentActivityId",""); object.put("id",forMainId);