From 1558bec75e6d83a5270fd4c83649105428f7c8a0 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 26 Apr 2024 14:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=94=80=E5=94=AE=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=8E=A8=E9=80=81=E9=94=80=E5=94=AE=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=97=B6=EF=BC=8C=E7=BC=BA=E5=B0=91=E8=B4=A7?=
 =?UTF-8?q?=E4=B8=BB=E5=8F=8A=E8=B4=A7=E4=B8=BB=E7=B1=BB=E5=9E=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=86=85=E5=AE=B9=EF=BC=8C=E8=B4=A7=E4=B8=BB=E4=B8=BA?=
 =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E7=BC=96=E7=A0=81=EF=BC=8C=E8=B4=A7?=
 =?UTF-8?q?=E4=B8=BB=E7=B1=BB=E5=9E=8B=E4=B8=BA=E4=B8=9A=E5=8A=A1=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusSalesOrderReturnVehApplyService.java                   | 2 ++
 .../yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java    | 4 ++++
 .../fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java | 2 ++
 .../yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json   | 4 ++--
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
index 3afe34af48..5959a7f0c3 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
@@ -687,6 +687,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                                     if (StringUtils.isNotBlank(vehicleSelectVo.getOrgCode())) {
                                         salesReturn.setFSaleOrgId(vehicleSelectVo.getOrgCode());
                                         salesReturn.setFStockOrgId(vehicleSelectVo.getOrgCode());
+                                        salesReturnDetailDto.setFOwnerId(vehicleSelectVo.getOrgCode());
                                         busSalesReturnOrdersDto.setSaleOrgId(vehicleSelectVo.getOrgCode());
                                     }
                                     BaseSalesReturnVo returnVo = baseVehicleOutFeign.selectByVehReturn(vehSid, busSalesOrderReturnVehApply.getContractNo()).getData();
@@ -715,6 +716,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                                             busSalesReturnOrdersDto.setBillNo(billNo);
                                         }
                                         busSalesReturnOrdersService.saveReturnOrders(busSalesReturnOrdersDto);
+                                        salesReturnDetailDto.setFOwnerTypeId("业务组织");
                                         salesReturnDetails.add(salesReturnDetailDto);
                                     }
                                 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java
index 8ecc8621f7..2a6fd3a14b 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java
@@ -50,5 +50,9 @@ public class SalesReturn {
         public String FDeliveryDate;
         @ApiModelProperty("是否赠品")
         public String FIsFree;
+        @ApiModelProperty("货主")
+        public String FOwnerId;
+        @ApiModelProperty("货主类型")
+        public String FOwnerTypeId;
     }
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java
index 4406f71482..685c50d62d 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java
@@ -90,6 +90,8 @@ public class SalesReturnOrdersService extends FinKingDeeService {
             m.put("FRealQty", c.getFRealQty());
             m.put("FDeliveryDate", c.getFDeliveryDate());
             m.put("FIsFree", c.getFIsFree());
+            m.put("FOwnerId",c.getFOwnerId());
+            m.put("FOwnerTypeId",c.getFOwnerTypeId());
             collectionDetailMap.add(m);
         }
         return rb.success().setData(collectionDetailMap);
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json
index da9f968268..2194800d91 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json
@@ -45,9 +45,9 @@
   "FReturnType": {
     "FNumber": "THLX01_SYS"
   },
-  "FOwnerTypeId": "",
+  "FOwnerTypeId": "@KD_FOwnerTypeId",
   "FOwnerId": {
-    "FNumber": ""
+    "FNumber": "@KD_FOwnerId"
   },
   "FProduceDate": "",
   "FExpiryDate": "",