commit 提货

src/services/go/wrtrade/index.ts

@@ -4,12 +4,13 @@ import { getSelectedAccountId } from "@/services/bus/account";
 import { getUsrId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
+    QueryFaProductDetailReq,
     QueryFilterItemReq, QueryOrderQuoteDetailReq,
     QueryOrderQuoteReq, QueryPerformancePlanReq,
     QueryWrGoodsInfoReq,
     QueryWrOrderDetailReq,
     QueryWrPositionReq, QueryWrSpecialMatchOrderReq,
-    QueryWrTradeDetailReq, WrFilterItem,
+    QueryWrTradeDetailReq, WrFAProductDetail, WrFilterItem,
     WrGoodsInfo, WrHoldLB,
     WrOrderDetail,
     WrOrderQuote,
@@ -127,3 +128,12 @@ export function QueryPerformancePlan(req: QueryPerformancePlanReq): Promise<WrPe
     });
 }
 
+/**
+ * 查询融资产品列表 /WrTrade2/QueryFaProductDetail
+ */
+export function queryFaProductDetail(req: QueryFaProductDetailReq): Promise<WrFAProductDetail[]> {
+    return commonSearch_go('/WrTrade2/QueryFaProductDetail', req).catch((err) => {
+        throw new Error(`查询融资产品列表: ${err}`);
+    });
+}
+

src/services/go/wrtrade/interface.ts

@@ -453,3 +453,31 @@ export interface WrPerformancePlan {
     wrtransferuserid: number;//仓单受让用户
     wrtypename: string;//商品
 }
+
+/**
+ * 查询融资产品列表
+ */
+export interface QueryFaProductDetailReq{
+    wrfactortypeid: number
+}
+
+export interface WrFAProductDetail{
+    accountid	:number;//资金账号
+    areauserid	:number;//金融机构ID
+    financingdays	:number;//天数(天)
+    interestminlen	:number;//最小起息天数
+    interestrate	:number;//利率
+    interestratemode	:number;//利率方式 - 1:年利率 2:日利率
+    interestsettlemode	:number;//结息方式 - 1:按日结息 3:按月结息
+    interestsettlevalue	:number;//结息方式值
+    isautoloan	:number;//是否自动放款 number;
+//-手动 1-自动 (当为自动放款时,显示放款快)
+    marginratio	:number;//保证金比率质押率 - [仓单质押]
+    productdetailid	:number;//产品组合ID(SEQ_FINANCEAREAPRODUCTDETAIL)
+    productid	:number;//金融产品ID
+    productname	:string;//产品名称
+    updatetime	:string;//更新时间
+    username	:string;//融出方
+    wrfactortypeid	:string;//仓单要素ID
+}
+

src/views/order/spot_warran/components/spot_warrant_spot_details/components/pick_up/index.vue

@@ -105,7 +105,7 @@ import { getSelectedAccountId, getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { wROutApply } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';
-import moment from 'moment';
+import moment, {Moment} from 'moment';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { WROutInDetail } from '@/services/proto/warehousetrade/interface';
@@ -140,20 +140,19 @@ export default defineComponent({
                     WarehouseID: props.selectedRow.warehouseid, // uint64 仓库ID
                     UserID: getUserId(), // uint64 申请人ID
                     AccountID: getSelectedAccountId()?.toString(), // uint64 申请人账户ID
-                    AppointmentDate: '20200730', // string 预约出库时间（格式：20200101）
+                    AppointmentDate: (res.AppointmentDate.value as Moment).format('YYYYMMDD'), // string 预约出库时间（格式：20200101）
                     AppointmentModel: 3, // uint32 预约方式:1-物流,2-自送，3-自提
-                    ContactName: '111', // string 收货人提货人
-                    ContactNum: '131', // string 收货人提货人手机
+                    ContactName: res.ContactName, // string 收货人提货人
+                    ContactNum: res.ContactNum, // string 收货人提货人手机
                     AppointmentRemark: '', // string 预约备注
                     CreatorID: Number(getLongTypeLoginID()), // uint64 创建人ID
                     WROutInDetails: {
                         LadingBillID: props.selectedRow.ladingbillid, // string 提单ID
                         SubNum: props.selectedRow.subnum, // uint64 提单子单号
-                        Qty: 1, // uint64 子提单总数量
-                        OutQty: 1, // uint64 预约数量
+                        Qty: res.OutQty, // uint64 子提单总数量
+                        OutQty: res.OutQty, // uint64 预约数量
                     } as WROutInDetail, // WROutInDetail 仓单出库提单明细数据
                 };
-
                 requestResultLoadingAndInfo(wROutApply, param, loading, ['提货成功', '提货失败:']).then(() => {
                     cancel(true);
                 });