From 09b64eaecd8330117b9631846adb9a9537450f43 Mon Sep 17 00:00:00 2001
From: "zhangxinah@yonyou.com" <zhangxinah@yonyou.com>
Date: Thu, 10 Apr 2025 19:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E9=9D=9E=E5=BF=85=E8=A6=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/nccloud/openapi/so/m30/OpenAPIParaUtil.java | 10 +++++-----
 .../nccloud/openapi/so/m30/SaleOrderResource.java      | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/so/src/public/nccloud/openapi/so/m30/OpenAPIParaUtil.java b/so/src/public/nccloud/openapi/so/m30/OpenAPIParaUtil.java
index 201604d..e897649 100644
--- a/so/src/public/nccloud/openapi/so/m30/OpenAPIParaUtil.java
+++ b/so/src/public/nccloud/openapi/so/m30/OpenAPIParaUtil.java
@@ -14,20 +14,20 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 /**
- * 销售订单接口适配2005代码
+ * ���۶����ӿ�����2005����
  * zhangxinah
  */
 
 
 /**
- * openapi参数解析工具类
+ * openapi��������������
  *
  * @author Administrator
  */
 public class OpenAPIParaUtil {
 
     /**
-     * json转VO
+     * jsonתVO
      *
      * @param paramList
      * @param headtable
@@ -38,14 +38,14 @@ public class OpenAPIParaUtil {
         List<SaleOrderVO> aggVOList = new ArrayList<SaleOrderVO>();
         for (Map<String, Object> map : paramList) {
             if (!map.containsKey(headtable) || !map.containsKey(bodytable)) {
-                ExceptionUtils.wrappBusinessException("传入数据异常，参数要包含表头信息和表体信息");
+                ExceptionUtils.wrappBusinessException("���������쳣������Ҫ������ͷ��Ϣ�ͱ�����Ϣ");
             }
             Map<String, String> headInfo = (Map<String, String>) map.get(headtable);
             List<Map<String, String>> bodyInfo = (List<Map<String, String>>) map.get(bodytable);
 
             SaleOrderVO aggvo = new SaleOrderVO();
             SaleOrderHVO hvo = new SaleOrderHVO();
-            // 首先设置集团
+            // �������ü���
             hvo.setAttributeValue(SaleOrderHVO.PK_GROUP, AppContext.getInstance().getPkGroup());
             hvo.setStatus(VOStatus.NEW);
 
diff --git a/so/src/public/nccloud/openapi/so/m30/SaleOrderResource.java b/so/src/public/nccloud/openapi/so/m30/SaleOrderResource.java
index 07e12b0..5dd7256 100644
--- a/so/src/public/nccloud/openapi/so/m30/SaleOrderResource.java
+++ b/so/src/public/nccloud/openapi/so/m30/SaleOrderResource.java
@@ -103,7 +103,7 @@ public class SaleOrderResource extends NCCPubRestResource {
 				headdata.put("dmakedate", headdata.get("dbilldate"));
 				headdata.put("dmakedate", headdata.get("dbilldate"));
 				headdata.put("cinvoicecustid", headdata.get("ccustomerid"));
-
+				headdata.put("ccustomervid", headdata.get("ccustomerid"));
 				String pk_group = AppContext.getInstance().getPkGroup();
 				headdata.put("pk_group", pk_group);
 				List<Object> bodyArr = (List<Object>) map.get(BODYTABLE);
@@ -111,9 +111,9 @@ public class SaleOrderResource extends NCCPubRestResource {
 					Map<String, Object> bodydata = (Map<String, Object>) body;
 					bodydata.put("pk_group", pk_group);
 					bodydata.put("cprojectid", headdata.get("vdef6"));
-					bodydata.put("ctrafficorgvid", headdata.get("pk_org_v"));
+					//bodydata.put("ctrafficorgvid", headdata.get("pk_org_v"));
 					bodydata.put("csendstockorgvid", headdata.get("pk_org_v"));
-					bodydata.put("csendstordocid", headdata.get("pk_org_v"));
+					//bodydata.put("csendstordocid", headdata.get("pk_org_v"));
 					bodydata.put("csendstockorgid", headdata.get("pk_org_v"));
 					bodydata.put("carorgid", headdata.get("pk_org_v"));
 					bodydata.put("carorgvid", headdata.get("pk_org_v"));
@@ -311,7 +311,9 @@ public class SaleOrderResource extends NCCPubRestResource {
 
 		bodydata.put("nqtunitnum", BFPubTools.getUFDouble_NullAsZero(bodydata.get("nnum"))
 				.div(BFPubTools.getUFDouble_NullAsZero(map.get("measrate").toString().split("/")[0])));
-
+		
+		bodydata.put("nastnum", BFPubTools.getUFDouble_NullAsZero(bodydata.get("nnum"))
+				.div(BFPubTools.getUFDouble_NullAsZero(map.get("measrate").toString().split("/")[0])));
 		sql = "select sl.pk_taxcode from bd_taxrate sl inner join bd_taxcode sm on sl.pk_taxcode=sm.pk_taxcode  where sl.taxrate="
 				+ bodydata.get("ntaxrate") + " and sm.pk_group<>'~' " + "";