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

public/proto/mtp.proto

@@ -1875,4 +1875,20 @@ message DeliveryOrderDetail {
      optional uint64 LadingBillID = 10; // uint64 提单ID
      optional uint64 SubNum = 11; // uint64 提单子单号
      optional uint64 WRFactorTypeID = 12; // uint64 仓单要素类型ID
+}
+
+// 议价申请审核请求 0 29 59
+message WrBargainNoAgreeReq {
+ optional MessageHead Header = 1; // MessageHead
+ optional uint64 WrBargainID = 2; // uint64 申请ID
+ optional uint64 ConfirmQty = 3; // uint64 可接受数量(拒绝时填写)
+ optional double ConfirmPrice = 4; // double 可接受价格(拒绝时填写)
+ optional string ConfirmRemark = 5; // string 确认备注
+ optional uint32 Status = 6; // uint32 状态 1 确认 2 拒绝
+}
+// 议价申请审核响应 0 29 60
+message WrBargainNoAgreeRsp {
+ optional MessageHead Header = 1; // MessageHead 消息头
+ optional int32 RetCode = 2; // int32 返回码
+ optional string RetDesc = 3; // string 描述信息
 }

src/services/funcode/index.ts

@@ -184,6 +184,9 @@ export const funCode: Code = {
     DeliveryOrderReq: 393217,    /// 交割申报请求 (交收)
     DeliveryOrderRsp: 393218,    /// 交割申报应答
 
+    WrBargainNoAgreeReq: 1900603,  /// 议价申请拒绝请求(0, 29, 59)
+    WrBargainNoAgreeRsp: 1900604, /// 议价申请拒绝响应(0, 29, 60)
+
     // 履约
     PerformanceManualConfirmReq: 1310723, // 履约手动确认请求
     PerformanceManualConfirmRsp: 1310724, // 履约手动确认应答

src/services/proto/warehousetrade/index.ts

@@ -1,7 +1,7 @@
 import {
     DeliveryOrderReq,
     HdWRDealOrderReq,
-    HdWROrderReq, PaymentArrearsReq, WarehouseRepurchaseReq,
+    HdWROrderReq, PaymentArrearsReq, WarehouseRepurchaseReq, WrBargainNoAgreeReq,
     WRListingCancelOrderReq, WROutApplyCancelReq,
     WROutApplyReq, WROutCancelReq, WROutConfirmReq, WRTradeFinanceBuyCancelReq
 } from "@/services/proto/warehousetrade/interface";
@@ -106,4 +106,13 @@ export const WROutCancel = (param: WROutCancelReq): Promise<any> => {
  */
 export const DeliveryOrder = (param: DeliveryOrderReq): Promise<any> =>{
     return protoMiddleware<DeliveryOrderReq>(param, 'DeliveryOrderReq', 'DeliveryOrderRsp', HeadEnum.tradeMode17)
+}
+
+/**
+ * 议价申请拒绝请求
+ * @param param
+ * @constructor
+ */
+export const WrBargainNoAgree = (param: WrBargainNoAgreeReq): Promise<any> =>{
+    return protoMiddleware<WrBargainNoAgreeReq>(param, 'WrBargainNoAgreeReq', 'WrBargainNoAgreeRsp', HeadEnum.tradeMode17)
 }

src/services/proto/warehousetrade/interface.ts

@@ -298,4 +298,18 @@ export interface DeliveryOrderDetail {
     WRFactorTypeID: number // uint64 仓单要素类型ID
 }
 
+// 议价申请审核请求 0 29 59
+export interface WrBargainNoAgreeReq {
+    WrBargainID: number // uint64 申请ID
+    ConfirmQty: number // uint64 可接受数量(拒绝时填写)
+    ConfirmPrice: number // double 可接受价格(拒绝时填写)
+    ConfirmRemark: string // string 确认备注
+    Status: number // uint32 状态 1 确认 2 拒绝
+}
+// 议价申请审核响应 0 29 60
+export interface WrBargainNoAgreeRsp {
+    RetCode : number // int32 返回码
+    RetDesc: string // string 描述信息
+}
+
 

src/views/market/spot_trade/components/post_buying/index.vue

@@ -207,7 +207,6 @@ export default defineComponent({
                         PriceMove: 0, // double 商品升贴水值
                         WeightRatio: 1, // double 商品重量系数
                     };
-
                     const param = {
                         AccountID: res.accountid, // 默认内部资金账号第一个
                         ClientSerialNo: uuidv4(), // 客户端流水号
@@ -248,15 +247,14 @@ export default defineComponent({
                         WRStandardID: props.selectedRow.wrstandardid,
                         HasWr: isWR(), // 无仓单挂牌  是否有无仓单
                         DeliveryMonth: isWR() ? '' : moment(res.DeliveryMonth).format('YYYY-MM'),
-                        FactoryItems: props.selectedRow.wrResult.flatMap((it) => {
+                        FactoryItems: props.selectedRow.wrResult != undefined ? props.selectedRow.wrResult.flatMap((it) => {
                             return {
                                 DGFactoryItemTypeID: it.dgfactoryitemtypeid, // uint64 要素项类型ID
                                 DGFactoryItemID: it.dgfactoryitemid, // uint64 预约要素项类型值
                                 ItemTypeMode: 1, // uint32 要素项类型模式
                             };
-                        }), // DGFactoryItems 要素类型明细集合(没有仓单要素ID填写)
+                        }): [], // DGFactoryItems 要素类型明细集合(没有仓单要素ID填写)
                     };
-                    debugger;
                     requestResultLoadingAndInfo(hdWROrder, param, loading, ['求购成功', '求购失败:']).then(() => {
                         cancel(true);
                     });

src/views/market/spot_trade/spot_trade_order_transaction/components/delisting/index.vue

@@ -178,7 +178,6 @@ export default defineComponent({
         function getMoney() {}
         // const { getMaxNum, getMoney, getMargin } = handleNumAndMoney(props.enumName, props.buyOrSell, props.selectedRow, props.parantSelectedRow, formState);
         function submit() {
-            debugger
             validateAction<ListingForm>(formRef, formState).then((res) => {
                 // 摘牌请求
                 const param: OrderReq = {

src/views/market/spot_trade/spot_trade_order_transaction/components/listing/index.vue

@@ -193,7 +193,6 @@ export default defineComponent({
                     // ReceiveInfoID: number // 收货地址ID
                     OrderFlag: 1,
                 }
-                debugger
                 requestResultLoadingAndInfo(Order, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
                     cancel(true);
                 });

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_transfer/index.vue

@@ -66,6 +66,7 @@ import moment from "moment";
 import {getLongTypeLoginID} from "@/services/bus/login";
 import {LongType} from "@/services/socket/login/interface";
 import {Order} from "@/services/socket/order";
+import {QueryTradePositionRsp} from "@/services/go/ermcp/order/interface";
 
 export default defineComponent({
     name: ModalEnum.commodity_contract_summary_transfer,
@@ -73,7 +74,7 @@ export default defineComponent({
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrPerformancePlan>,
+            type: Object as PropType<QueryTradePositionRsp>,
             default: {},
         },
         buyOrSell: {
@@ -93,15 +94,15 @@ export default defineComponent({
                 ClientType: 4, // 终端类型
                 LoginID: Number(getLongTypeLoginID() as LongType), // 登陆账号
                 AccountID: getSelectedAccountId(), // 交易账号
-                // GoodsID: props.parantSelectedRow.goodsid, // 商品ID     (需要填入)
-                // MarketID: props.parantSelectedRow.marketid, // 市场ID   (需要填入)
+                GoodsID: props.selectedRow.goodsid, // 商品ID
+                MarketID: props.selectedRow.marketid, // 市场ID
                 ValidType: 1, // 校验类型 当日有效
                 OperateType: 1, // 操作类型: 申请
                 OrderSrc: 1, // 单据来源: 客户端下单
-                // OrderPrice: res.price, // 委托价格                      (需要填入)
+                OrderPrice: 370, // 委托价格                      (需要填入)
                 OperatorID: Number(getLongTypeLoginID()),
                 // MarketMaxSub: number // 市价允许最大偏差(做市)
-                // OrderQty: res.num, // 委托数量                          (需要填入)
+                OrderQty: 1, // 委托数量                          (需要填入)
                 BuyOrSell: 1 ,  // 买卖方向  0 买 1 卖
                 BuildType: 2 ,  // 下单类型  1 建 2 平
                 // CurtQuotePrice: 0, // 保留，计算冻结金额使用
@@ -124,7 +125,6 @@ export default defineComponent({
                 // ReceiveInfoID: number // 收货地址ID
                 OrderFlag: 1,
             }
-            debugger
             requestResultLoadingAndInfo(Order, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
                 cancel(true);
             });