commit 摘牌接口

src/services/proto/warehousetrade/index.ts

@@ -23,7 +23,7 @@ export const hdWROrder = (param: HdWROrderReq): Promise<any> => {
  * @constructor
  */
 export const HdWRDealOrder = (param: HdWRDealOrderReq): Promise<any> => {
-    return protoMiddleware<HdWRDealOrderReq>(param, 'HdWRDealOrderReq', 'HdWRDealOrderRsp', 2)
+    return protoMiddleware<HdWRDealOrderReq>(param, 'HdWRDealOrderReq', 'HdWRDealOrderRsp', HeadEnum.tradeMode17)
 }
 
 /**

src/services/proto/warehousetrade/interface.ts

@@ -53,7 +53,7 @@ export interface HdWROrderRsp {
 export interface  HdWRDealOrderReq {
     UserID: number; // uint32 用户ID
     AccountID: number; // uint64 资金账号
-    RelatedWRTradeOrderID: number; // uint64 关联委托单号(摘牌委托关联挂牌委托单ID)
+    RelatedWRTradeOrderID: string; // uint64 关联委托单号(摘牌委托关联挂牌委托单ID)
     WRTransferUserID: number; // uint32 仓单受让用户
     OrderQty: number; // uint64 委托数量
     OrderSrc: number; // uint32 委托来源

src/views/market/spot_trade/components/buy-sell-market/components/delisting/index.vue

@@ -64,7 +64,7 @@ export default defineComponent({
         const param: HdWRDealOrderReq = {
             UserID: getUserId(), // uint32 用户ID
             AccountID: Number(getSelectedAccountId() as Long), // uint64 资金账号
-            RelatedWRTradeOrderID: Number(props.selectedRow.wrtradeorderid), // uint64 关联委托单号(摘牌委托关联挂牌委托单ID)
+            RelatedWRTradeOrderID: props.selectedRow.wrtradeorderid, // uint64 关联委托单号(摘牌委托关联挂牌委托单ID)
             WRTransferUserID: props.selectedRow.userid, // uint32 仓单受让用户
             OrderQty: 1, // uint64 委托数量
             OrderSrc: 0, // uint32 委托来源
@@ -72,11 +72,11 @@ export default defineComponent({
             ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
             ClientType: 4, // uint32 终端类型
             OperatorID: getUserId(), // uint64 操作员账号ID
-            BuyOrSell: 1, // uint32 买卖方向
+            BuyOrSell: 0, // uint32 买卖方向
             ApplyID: 0, // uint64 申请ID
             LadingBillId: 0, // uint64 提单id(wrholdlb的LadingBillId字段),卖的时候填写
             SubNum: 0, // uint64 提单子单号(wrholdlb的SubNum字段),卖的时候填写
-            WRFactorTypeId: 0, // uint64 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写
+            WRFactorTypeId: props.parantSelectedRow.wrfactortypeid, // uint64 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写
             TradeDate: moment().format('YYYYMMDD'), // string 交易日
             DeliveryMonth: '', // string 交收月
             HasWr: 1, // uint32 是否有仓单-0:没有仓单 1:有仓单
@@ -88,7 +88,7 @@ export default defineComponent({
         });
         return {
             visible: true,
-        };
+        };8
     },
 });
 </script>