commit 解决bug

src/common/constants/enumsName.ts

@@ -690,14 +690,11 @@ export function getPerformanceTypeName(type: number) {
 export function getPerformanceStatusName(type: number) {
     let result = '--'
     switch (type) {
-        case 0:
-            result = '初始化'
-            break
         case 1:
-            result = '正常'
+            result = '初始化'
             break
         case 2:
-            result = '处理错误'
+            result = '正常'
             break
         case 3:
             result = '处理错误'

src/services/go/wrtrade/index.ts

@@ -1,24 +1,33 @@
 /** ================================= 仓单贸易v2 ================================**/
+/* 更新全部接口 20210803 */
 
 import { getSelectedAccountId } from "@/services/bus/account";
 import { getUsrId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
     QueryFaProductDetailReq,
-    QueryFilterItemReq, QueryOrderQuoteDetailReq,
-    QueryOrderQuoteReq, QueryPerformancePlanReq,
+    QueryFilterItemReq, QueryFtDeliveryGoodsReq, QueryHoldLBReq, QueryOrderQuoteDetailReq,
+    QueryOrderQuoteReq, QueryPerformancePlanReq, QueryWrFactorTypeInfoReq,
     QueryWrGoodsInfoReq, QueryWrMarketTradeConfigReq,
     QueryWrOrderDetailReq,
-    QueryWrPositionReq, QueryWrSpecialMatchOrderReq,
-    QueryWrTradeDetailReq, WrFAProductDetail, WrFilterItem,
+    QueryWrPositionReq, QueryWrSpecialMatchOrderReq, QueryWrStandardFactoryItemReq,
+    QueryWrTradeDetailReq, WrFactorTypeInfo, WrFAProductDetail, WrFilterItem, WrFtDeliveryGoods,
     WrGoodsInfo, WrHoldLB, WrMarketTradeConfig,
     WrOrderDetail,
     WrOrderQuote,
     WrOrderQuoteDetail, WrPerformancePlan,
-    WrPosition, WrSpecialMatchOrder,
+    WrPosition, WrSpecialMatchOrder, WrStandardFactoryItemEx,
     WrTradeDetail
 } from "@/services/go/wrtrade/interface";
 
+/**
+ * 查询融资产品列表 /WrTrade2/QueryFaProductDetail
+ */
+export function queryFaProductDetail(req: QueryFaProductDetailReq): Promise<WrFAProductDetail[]> {
+    return commonSearch_go('/WrTrade2/QueryFaProductDetail', req).catch((err) => {
+        throw new Error(`查询融资产品列表: ${err}`);
+    });
+}
 
 /**
  * 查询筛选框列表  /WrTrade2/QueryFilterItem
@@ -31,6 +40,40 @@ export function queryFilterItem(req: QueryFilterItemReq): Promise<WrFilterItem[]
     });
 }
 
+/**
+ * 查询品种品类筛选框列表 /WrTrade2/QueryFtDeliveryGoods
+ * @param req
+ */
+export function queryFtDeliveryGoods(req: QueryFtDeliveryGoodsReq): Promise<WrFtDeliveryGoods> {
+    return commonSearch_go('/WrTrade2/QueryFtDeliveryGoods', req).catch((err) => {
+        throw new Error(`查询品种品类筛选框列表: ${err}`);
+    });
+}
+
+/**
+ * 查询仓单持有记录 /WrTrade2/QueryHoldLB
+ * 页面 现货仓单 -> 现货明细
+ * @param req
+ */
+export function queryHoldLB(): Promise<WrHoldLB[]> {
+    const accountid = getSelectedAccountId()
+    return commonSearch_go('/WrTrade2/QueryHoldLB', { accountid }).catch((err) => {
+        throw new Error(`查询仓单持有记录: ${err}`);
+    });
+}
+
+/**
+ * 页面 现货仓单->现货明细? , 表名叫仓单持有记录， 有挂单特有维度，为防误解汇总也有相关维度， 新写接口，不跟汇总合在一起了。
+ * 查询仓单持有记录 /WrTrade2/QueryHoldLB
+ * 页面 现货仓单 -> 现货明细
+ * @param req
+ */
+export function queryHoldLBFilter(req: QueryHoldLBReq): Promise<WrHoldLB[]> {
+    const accountid = getSelectedAccountId()
+    return commonSearch_go('/WrTrade2/QueryHoldLB', req).catch((err) => {
+        throw new Error(`查询仓单持有记录: ${err}`);
+    });
+}
 
 /**
  * 查询大厅行情列表 /WrTrade2/QueryOrderQuote
@@ -53,6 +96,27 @@ export function queryOrderQuoteDetail(req: QueryOrderQuoteDetailReq): Promise<Wr
 }
 
 /**
+ * 查询履约信息 /WrTrade2/QueryPerformancePlan
+ */
+export function QueryPerformancePlan(req: QueryPerformancePlanReq): Promise<WrPerformancePlan[]> {
+    req.userid = getUsrId();
+    return commonSearch_go('/WrTrade2/QueryPerformancePlan', req).catch((err) => {
+        throw new Error(`查询履约信息: ${err}`);
+    });
+}
+
+/**
+ * 查询仓单要素详细信息 /WrTrade2/QueryWrFactorTypeInfo
+ * @param req
+ * @constructor
+ */
+export function queryWrFactorTypeInfo(req: QueryWrFactorTypeInfoReq): Promise<WrFactorTypeInfo[]> {
+    return commonSearch_go('/WrTrade2/QueryWrFactorTypeInfo', req).catch((err) => {
+        throw new Error(`查询仓单要素详细信息: ${err}`);
+    });
+}
+
+/**
  * 查询仓单商品信息 /WrTrade2/QueryWrGoodsInfo
  * @param req
  */
@@ -63,6 +127,16 @@ export function queryWrGoodsInfo(req: QueryWrGoodsInfoReq): Promise<WrGoodsInfo[
 }
 
 /**
+ * 查询市场交易参数配置 /WrTrade2/QueryWrMarketTradeConfig
+ * @param req
+ */
+export function queryWrMarketTradeConfig(req: QueryWrMarketTradeConfigReq): Promise<WrMarketTradeConfig[]> {
+    return commonSearch_go('/WrTrade2/QueryWrMarketTradeConfig', req).catch((err) => {
+        throw new Error(`查询市场交易参数配置: ${err}`);
+    });
+}
+
+/**
  *  页面 现货仓单 | 预售仓单 -> 挂单
  *  仓单头寸
  *  查询仓单委托单(挂单) /WrTrade2/QueryWrOrderDetail
@@ -98,53 +172,30 @@ export function queryWrSpecialMatchOrder(req: QueryWrSpecialMatchOrderReq): Prom
 }
 
 /**
- * 查询仓单成交明细 /WrTrade2/QueryWrTradeDetail
- */
-export function queryWrTradeDetail(req: QueryWrTradeDetailReq): Promise<WrTradeDetail[]> {
-    req.userid = getUsrId();
-    return commonSearch_go('/WrTrade2/QueryWrTradeDetail', req).catch((err) => {
-        throw new Error(`查询仓单成交明细: ${err}`);
-    });
-}
-
-/**
- * 查询仓单持有记录 /WrTrade2/QueryHoldLB
- * 页面 现货仓单 -> 现货明细
+ * 查询品类要素定义项 /WrTrade2/QueryWrStandardFactoryItem
  * @param req
  */
-export function queryHoldLB(): Promise<WrHoldLB[]> {
-    const accountid = getSelectedAccountId()
-    return commonSearch_go('/WrTrade2/QueryHoldLB', { accountid }).catch((err) => {
-        throw new Error(`查询仓单持有记录: ${err}`);
+export function queryWrStandardFactoryItem(req: QueryWrStandardFactoryItemReq): Promise<WrStandardFactoryItemEx[]> {
+    return commonSearch_go('/WrTrade2/QueryWrStandardFactoryItem', req).catch((err) => {
+        throw new Error(`查询品类要素定义项: ${err}`);
     });
 }
 
 /**
- * 查询履约信息 /WrTrade2/QueryPerformancePlan
+ * 查询仓单成交明细 /WrTrade2/QueryWrTradeDetail
  */
-export function QueryPerformancePlan(req: QueryPerformancePlanReq): Promise<WrPerformancePlan[]> {
+export function queryWrTradeDetail(req: QueryWrTradeDetailReq): Promise<WrTradeDetail[]> {
     req.userid = getUsrId();
-    return commonSearch_go('/WrTrade2/QueryPerformancePlan', req).catch((err) => {
-        throw new Error(`查询履约信息: ${err}`);
+    return commonSearch_go('/WrTrade2/QueryWrTradeDetail', req).catch((err) => {
+        throw new Error(`查询仓单成交明细: ${err}`);
     });
 }
 
-/**
- * 查询融资产品列表 /WrTrade2/QueryFaProductDetail
- */
-export function queryFaProductDetail(req: QueryFaProductDetailReq): Promise<WrFAProductDetail[]> {
-    return commonSearch_go('/WrTrade2/QueryFaProductDetail', req).catch((err) => {
-        throw new Error(`查询融资产品列表: ${err}`);
-    });
-}
 
-/**
- * 查询市场交易参数配置 /WrTrade2/QueryWrMarketTradeConfig
- * @param req
- */
-export function queryWrMarketTradeConfig(req: QueryWrMarketTradeConfigReq): Promise<WrMarketTradeConfig[]> {
-    return commonSearch_go('/WrTrade2/QueryWrMarketTradeConfig', req).catch((err) => {
-        throw new Error(`查询市场交易参数配置: ${err}`);
-    });
-}
+
+
+
+
+
+
 

src/services/go/wrtrade/interface.ts

@@ -10,6 +10,10 @@ export interface QueryOrderQuoteReq {
     pagesize?: number//         每页条数
     page?: number//             页码
     warehouseid?: number  //    仓库id(筛选条件)
+    dgitemname?: string  //     商品要素项名称模糊匹配, 逗号隔开, 如 产地1,品牌1,规格12mm
+    deliverygoodsid?: number//  品种id
+    wrfactortypeid?: number//   仓单要素id
+    deliverymonth?: string //   交收月(yyyy-mm) 仓单预售填写
 }
 
 /**
@@ -48,24 +52,28 @@ export interface QueryOrderQuoteDetailReq {
     wrpricetype: number//       价格方式 - 1:固定价 2-浮动价
     haswr: number//             是否有仓单 0-没有 1-有(仓单贸易填1,仓单预售填0)
     wrfactortypeid: number//    仓单要素id
-    goodsid: number//           期货商品id
+    goodsid?: number//          期货商品id
     buyorsell: number//         卖方向 0-买 1-卖
+    deliverymonth?: string//    交收月(yyyy-mm) 查仓单预售的买卖大厅时填写
 }
 
 /**
  * 查询买吗大厅返回
  */
 export interface WrOrderQuoteDetail {
-    buyorsell: number;//买卖 - number;
-    //:买 1:卖
-    fixedprice: number;//买(卖)价
-    orderqty: number;//买(卖)量(=委托量-成交量)
-    pricemove: number;//买(卖)升贴水- 基差
-    userid: number;//购买方(销售方)用户ID
-    username: string;//购买方(销售方)
-    wrtradeorderid: string;//仓单贸易委托单ID(32number;
-    //+Unix秒时间戳(1number;
-    //位)+xxxxxx)
+    buyorsell	:number;//买卖 - number;
+//:买 1:卖
+    deliverymonth	:string;//交收月
+    enumdicname	:string;//单位名称
+    fixedprice	:number;//买(卖)价
+    minivalue	:number;//现货商品最小变动值
+    orderqty	:number;//买(卖)量(=委托量-成交量)
+    pricemove	:number;//买(卖)升贴水- 基差
+    userid	:number;//购买方(销售方)用户ID
+    username	:string;//购买方(销售方)
+    wrtradeorderid	:string;//仓单贸易委托单ID(32number;
+//+Unix秒时间戳(1number;
+//位)+xxxxxx)
 }
 
 /**
@@ -462,23 +470,23 @@ export interface QueryFaProductDetailReq{
 }
 
 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;
+    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
+    marginratio     :number;//保证金比率质押率 - [仓单质押]
+    productdetailid :number;//产品组合ID(SEQ_FINANCEAREAPRODUCTDETAIL)
+    productid       :number;//金融产品ID
+    productname     :string;//产品名称
+    updatetime      :string;//更新时间
+    username        :string;//融出方
+    wrfactortypeid  :string;//仓单要素ID
 }
 
 /**
@@ -527,3 +535,80 @@ export interface WrMarketTradeConfig{
     sellreleaseratio	:number;//卖方释放比率[2:分步履约]
     updatetime	:string;//更新时间
 }
+
+/**
+ * 查询品种品类筛选框列表请求
+ */
+export interface QueryFtDeliveryGoodsReq {
+    
+}
+
+/**
+ * 查询品种品类筛选框列表返回
+ */
+export interface WrFtDeliveryGoods {
+    deliverygoodscode: string       // 品种代码
+    deliverygoodsid: number         // 品种ID
+    deliverygoodsname: string       // 品种名称
+    wdlst: WrFtWrstandard[]         // 商品列表
+}
+
+export interface WrFtWrstandard {
+    wrstandardcode: string      //现货商品代码
+    wrstandardid: number        //现货商品ID
+    wrstandardname: string      //商品名称
+}
+
+/**
+ *  查询仓单持有记录 /WrTrade2/QueryHoldLB
+ *  页面 现货仓单->现货明细? , 表名叫仓单持有记录， 有挂单特有维度，为防误解汇总也有相关维度， 新写接口，不跟汇总合在一起了
+ */
+export interface QueryHoldLBReq {
+    accountid: number               //      资金账号
+    warehouseid?: number            //      仓库id
+    deliverygoodsid?: number        //      品种id
+    wrstandardid?: number           //      品类id
+}
+
+/**
+ * 查询仓单要素详细信息请求
+ */
+export interface QueryWrFactorTypeInfoReq {
+    wrfactortypeid: number   //仓单要素id
+}
+
+/**
+ * 查询仓单要素详细信息返回
+ */
+export interface WrFactorTypeInfo {
+    deliverygoodscode	:string;//品种代码
+    deliverygoodsname	:string;//品种名称
+    dgfactoryitemid	:number;//选择项id
+    dgfactoryitemtypeid	:number;//要素选择项ID (1-仓库 2-品牌)
+    dgfactoryitemvalue	:string;//要素项值
+    itemtypename	:string;//要素项名称
+    optioncompare	:string;//选择比较串
+    warehouseid	:number;//仓库id
+    wrfactortypeid	:string;//仓单要素ID
+    wrfactortypename	:string;//要素名称
+    wrfactortypename2	:string;//要素名称(不含仓库)
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:number;//品类id
+    wrstandardname	:string;//品类名称
+}
+
+export interface QueryWrStandardFactoryItemReq {
+    wrstandardid: number     // 品类id
+}
+
+export interface WrStandardFactoryItem {
+    dgfactoryitemid: number         //  选择项id
+    dgfactoryitemvalue: string      //  要素项值
+}
+
+export interface WrStandardFactoryItemEx {
+    dgfactoryitemtypeid: number     //  要素项类型id(1-999：预留为特殊类型 1:仓库 2:品牌)
+    itemlst: WrStandardFactoryItem[]//  要素项列表
+    itemtypename: string            //  要素项类型名称
+    wrstandardid: number            //  品类
+}