Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/services/proto/warehousetrade/index.ts

@@ -5,6 +5,7 @@ import {
     WROutApplyReq, WROutCancelReq, WROutConfirmReq, WRTradeFinanceBuyCancelReq
 } from "@/services/proto/warehousetrade/interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
+import { IMessageHead } from "@/services/socket/protobuf/proto";
 import { HeadEnum } from "@/services/socket/protobuf/protoHeader";
 
 
@@ -13,7 +14,14 @@ import { HeadEnum } from "@/services/socket/protobuf/protoHeader";
  * @param param
  */
 export const hdWROrder = (param: HdWROrderReq): Promise<any> => {
-    return protoMiddleware<HdWROrderReq>(param, 'HdWROrderReq', 'HdWROrderRsp', HeadEnum.tradeMode17)
+    if (param.MarketID) {
+        const header: IMessageHead = {
+            MarketID: param.MarketID
+        }
+        return protoMiddleware<HdWROrderReq>(param, 'HdWROrderReq', 'HdWROrderRsp', header)
+    } else {
+        return protoMiddleware<HdWROrderReq>(param, 'HdWROrderReq', 'HdWROrderRsp', HeadEnum.tradeMode17)
+    }
 }
 
 /**

src/services/proto/warehousetrade/interface.ts

@@ -42,6 +42,7 @@ export interface HdWROrderReq {
     WRStandardID: number; // uint32 现货品种ID
     FactoryItems: DGFactoryItems; // DGFactoryItems 要素类型明细集合(没有仓单要素ID填写)
     DelistMinQty: number; // uint64 起摘数量
+    MarketID?: number; // 市场ID
 
 }
 // 持仓单挂牌应答 0 22 16

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/index.vue

@@ -349,7 +349,7 @@ export default defineComponent({
         const { goodsGroup, goodsList, groupsChange, findGoodsCode } = handleGoods();
 
         // 获取仓单贸易市场
-        const { spotMarkets } = queryMarketSection(false)
+        const { spotMarkets } = queryMarketSection(true)
 
         // 切换市场
         function handleMarket(value: number) {
@@ -455,7 +455,7 @@ export default defineComponent({
                         ClientSerialNo: uuidv4(), // 客户端流水号
                         // OperateSrc: 2,
                         ClientType: 4,
-                        // MarketID: 17201,
+                        MarketID: formState.marketid,
                         LadingBillId: props.selectedRow.ladingbillid ? props.selectedRow.ladingbillid : 0, // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
                         // LadingBillId: 'uint642081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
                         TradeDate: moment(marketInfo.tradedate).format('YYYYMMDD'), // 交易日 string

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

@@ -436,7 +436,7 @@ export default defineComponent({
                         ClientSerialNo: v4(), // 客户端流水号
                         // OperateSrc: 2,
                         ClientType: 4,
-                        // MarketID: marketInfo.marketid,
+                        MarketID: formState.marketid,
                         LadingBillId: props.selectedRow.ladingbillid.toString(), // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
                         // LadingBillId: 'uint642081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
                         TradeDate: moment(marketInfo.tradedate).format('YYYYMMDD'), // 交易日 string