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

public/proto/mtp.proto

@@ -1426,11 +1426,31 @@ message GoodsPickupConfirmReq {
 	optional string CheckRemark = 4; // string 审核备注
 	optional string ClientTicket = 5; // string 客户端流水号
 }
+
 // 商品提货确认响应 0 3 96
 message GoodsPickupConfirmRsp {
 	optional MessageHead Header = 1; // MessageHead 消息头
 	optional int32 RetCode = 2; // int32 返回码
 	optional string RetDesc = 3; // string 描述信息
-	optional string ClientTicket = 4; // string 客户端流水号
+}
+
+// 现货市价请求 0 29 162
+message ErmcpSpotGoodsPriceReq {
+ optional MessageHead Header = 1; // MessageHead
+ optional uint64 DeliveryGoodsID = 2; // uint64 现货品种ID
+ optional uint64 WRStandardID = 3; // uint64 现货品类ID(通用则为0)
+ optional uint64 SpotGoodsBrandID = 4; // uint64 现货品牌ID(通用则为0, 不为0则须先有品类ID)
+ optional uint64 CurrencyID = 5; // uint64 报价货币ID
+ optional double SpotGoodsPrice = 6; // double 现货价格
+ optional string TradeDate = 7; // string 交易日(yyyyMMdd)
+ optional int32 OperateSrc = 8; // int32 最后操作来源 - 1:管理端 2:终端
+ optional uint64 OperateID = 9; // uint64 最后操作人
+ optional int32 OperateType = 10; // int32 操作类型 - 1:新增 2:修改 3:删除
+}
+// 现货市价响应 0 29 163
+message ErmcpSpotGoodsPriceRsp {
+ optional MessageHead Header = 1; // MessageHead 消息头
+ optional int32 RetCode = 2; // int32 返回码
+ optional string RetDesc = 3; // string 描述信息
 }
 

src/services/funcode/index.ts

@@ -151,4 +151,7 @@ export const funCode: Code = {
 
     GoodsPickupConfirmReq: 196703, // 商品提货确认请求
     GoodsPickupConfirmRsp: 196704, // 商品提货确认响应
+
+    ErmcpSpotGoodsPriceReq: 1900706,     /// 现货市价请求(1900706)
+    ErmcpSpotGoodsPriceRsp: 1900707,     /// 现货市价响应(1900707)
 };

src/services/go/ermcp/qhj/index.ts

@@ -4,6 +4,7 @@ import { getSelectedAccountId } from "@/services/bus/account";
 import { getUsrId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
+    Ermcp3SpotGoodsPrice, Ermcp3SpotGoodsPriceLog,
     QhjAccountOutInApply,
     QhjContract,
     QhjCustomer,
@@ -24,7 +25,7 @@ import {
 
     QueryCustomerInfoReq,
     QueryPayOrderReq,
-    QueryReckonPriceLogReq,
+    QueryReckonPriceLogReq, QuerySpotGoodsPrice, QuerySpotGoodsPriceLogReq,
     QuerySubAreaReq,
     QueryTradeDetailReq,
     QueryTradeOrderDetailReq,
@@ -211,4 +212,24 @@ export function queryTradeDetail(req: QueryTradeDetailReq): Promise<QhjMgrTradeD
     return commonSearch_go('/QhjMgr/QueryTradeDetail', req).catch((err) => {
         throw new Error(`查询持仓汇总: ${err}`);
     });
+}
+
+/**
+ * -- 查询现货市价(现货市价)
+ * /Ermcp3/QuerySpotGoodsPrice
+ */
+export function querySpotGoodsPrice(req: QuerySpotGoodsPrice): Promise<Ermcp3SpotGoodsPrice[]> {
+    return commonSearch_go('/Ermcp3/QuerySpotGoodsPrice', req).catch((err) => {
+        throw new Error(`查询现货市价: ${err}`);
+    });
+}
+
+/**
+ * 查询现货市价详情(现货市价/详情)
+ * /Ermcp3/QuerySpotGoodsPriceLog
+ */
+export function querySpotGoodsPriceLog(req: QuerySpotGoodsPriceLogReq): Promise<Ermcp3SpotGoodsPriceLog[]> {
+    return commonSearch_go('/Ermcp3/QuerySpotGoodsPriceLog', req).catch((err) => {
+        throw new Error(`查询现货市价详情: ${err}`);
+    });
 }

src/services/go/ermcp/qhj/interface.ts

@@ -597,5 +597,77 @@ export interface QhjMgrTradeDetailRsp {
     userinfotype: number;//账户类型 1-个人 2-企业
 }
 
+/**
+ *
+ * 查询委托明细请求
+ *
+ */
+export interface QuerySpotGoodsPrice {
+    userid: number          //   用户ID
+}
 
 
+export interface Ermcp3SpotGoodsPrice{
+    areauserid	:number;//所属机构id
+    brandname	:string;//品牌名称
+    currencyid	:number;//报价货币ID
+    currencyname	:string;//币种名称
+    deliverygoodscode	:string;//现货商品代码
+    deliverygoodsid	:number;//现货商品id
+    deliverygoodsname	:string;//现货商品名称
+    enumdicname	:string;//现货商品单位名称
+    gbenumdicname	:string;//品类单位名称
+    gmunitid	:number;//品类单位id
+    isvalid	:number;//是否有效 - number;
+//:无效 1:有效
+    operateid	:number;//最后操作人
+    operatesrc	:number;//最后操作来源 - 1:管理端 2:终端
+    operatetime	:string;//最后操作时间
+    operatorname	:string;//操作人名称
+    spotgoodsbrandid	:number;//现货品牌ID(通用则为number;
+//, 不为number;
+//则须先有品类ID)
+    spotgoodsprice	:number;//现货价格
+    tradedate	:string;//交易日(yyyyMMdd)
+    unitid	:number;//现货商品单位id
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:number;//现货品类ID(通用则为number;
+//)
+    wrstandardname	:string;//品类名称
+}
+
+
+export interface QuerySpotGoodsPriceLogReq {
+    userid: number   // 用户ID
+    deliverygoodsid: number  // 现货商品ID
+    brandid?: number  // 品牌ID
+    wrstandardid?: number // 品类ID
+}
+
+export interface Ermcp3SpotGoodsPriceLog{
+    areauserid	:number;//所属机构id
+    brandname	:string;//品牌名称
+    currencyid	:number;//报价货币ID
+    deliverygoodscode	:string;//现货商品代码
+    deliverygoodsid	:number;//现货商品id
+    deliverygoodsname	:string;//现货商品名称
+    enumdicname	:string;//现货商品单位名称
+    gbenumdicname	:string;//品类单位名称
+    gmunitid	:number;//品类单位id
+    logid	:number;//日志id
+    operateid	:number;//最后操作人
+    operatesrc	:number;//最后操作来源 - 1:管理端 2:终端
+    operatetime	:string;//最后操作时间
+    operatorname	:string;//操作人名称
+    spotgoodsbrandid	:number;//现货品牌ID(通用则为number;
+//, 不为number;
+//则须先有品类ID)
+    spotgoodsprice	:number;//现货价格
+    tradedate	:string;//交易日(yyyyMMdd)
+    unitid	:number;//现货商品单位id
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:number;//现货品类ID(通用则为number;
+//)
+    wrstandardname	:string;//品类名称
+}
+

src/services/proto/delivery/index.ts

@@ -3,7 +3,7 @@ import { getLongTypeLoginID } from '@/services/bus/login';
 import { getAreaUserId } from "@/services/bus/user";
 import {
     DeliveryGoodsApplyReq,
-    DeliveryGoodsCancelReq,
+    DeliveryGoodsCancelReq, ErmcpSpotGoodsPriceReq,
     ErmsMiddelGoodsEditReq
 } from "@/services/proto/delivery/interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
@@ -32,4 +32,12 @@ export const ermsMiddelGoodsEdit = (param: ErmsMiddelGoodsEditReq): Promise<any>
  */
 export const deliveryGoodsCancel = (param: DeliveryGoodsCancelReq): Promise<any> => {
     return protoMiddleware<DeliveryGoodsCancelReq>(param, 'DeliveryGoodsCancelReq', 'DeliveryGoodsCancelRsp', 2)
+}
+
+/**
+ * 修改现货市价
+ * @param param
+ */
+export const ermcpSpotGoodsPrice = (param: ErmcpSpotGoodsPriceReq):Promise<any> => {
+    return protoMiddleware<ErmcpSpotGoodsPriceReq>(param, 'ErmcpSpotGoodsPriceReq', 'ErmcpSpotGoodsPriceReq', 2)
 }

src/services/proto/delivery/interface.ts

@@ -68,4 +68,22 @@ export interface DeliveryGoodsCancelRsp {
     RetDesc: string; // string 描述信息
     wrstandardid: number; // uint64 现货商品ID
     deliverygoodsid: number; // uint64 现货品种ID
-}
+}
+
+// 现货市价请求 0 29 162
+export interface ErmcpSpotGoodsPriceReq {
+    DeliveryGoodsID: number; // uint64 现货品种ID
+    WRStandardID: number; // uint64 现货品类ID(通用则为0)
+    SpotGoodsBrandID: number; // uint64 现货品牌ID(通用则为0, 不为0则须先有品类ID)
+    CurrencyID: number; // uint64 报价货币ID
+    SpotGoodsPrice: number; // double 现货价格
+    TradeDate: string; // string 交易日(yyyyMMdd)
+    OperateSrc: number // int32 最后操作来源 - 1:管理端 2:终端
+    OperateID: number; // uint64 最后操作人
+    OperateType: number; // int32 操作类型 - 1:新增 2:修改 3:删除
+}
+// 现货市价响应 0 29 163
+export interface ErmcpSpotGoodsPriceRsp {
+    RetCode: number; // int32 返回码
+    RetDesc: string; // string 描述信息
+}

src/services/proto/manager/interface.ts

@@ -62,7 +62,6 @@ export interface GoodsPickupConfirmReq extends IMessageHead{
 export interface  GoodsPickupConfirmRsp {
     RetCode: number // int32 返回码
     RetDesc: string // string 描述信息
-    // ClientTicket: string // string 客户端流水号
 }
 
 

src/views/platinum/platinum_pick_query/list/tab/compoments/upload_logistics/index.vue

@@ -35,7 +35,7 @@
                        name="expressnum">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.expresscompany"
+                     v-model:value="formState.expressnum"
                      placeholder="请输入物流单号" />
           </a-form-item>
         </a-col>