commit 添加接口

public/proto/mtp.proto

@@ -1779,4 +1779,32 @@ message PerformanceActivateRsp {
  optional int32 RetCode = 2; // int32 返回码
  optional string RetDesc = 3; // string 描述信息
  optional uint64 PerformancePlanID = 4; // uint64 履约计划ID
+}
+// 仓单出入库注销请求 0 29 110
+message WROutApplyCancelReq {
+ optional MessageHead Header = 1; // MessageHead
+ optional uint64 ClientSerialID = 2; // uint64 客户端唯一ID
+ optional string ApplyID = 3; // string 申请ID
+ optional uint32 Type = 4; // uint32 类型：1-入库预约注销，2-入库注册注销，3-出库预约注销,4-出库注销注销
+}
+// 仓单出入库注销响应 0 29 111
+message WROutApplyCancelRsp {
+ optional MessageHead Header = 1; // MessageHead 消息头
+ optional int32 RetCode = 2; // int32 返回码
+ optional string RetDesc = 3; // string 描述信息
+ optional uint64 ClientSerialID = 4; // uint64 客户端唯一ID
+}
+// 仓单出库确认请求 0 29 195
+message WROutConfirmReq {
+ optional MessageHead Header = 1; // MessageHead
+ optional uint64 applyid = 2; // uint64 申请Id
+  optional uint32 operatesrc = 3; // uint32 操作来源 - 1:管理端 2:终端
+  optional uint64 operateid = 4; // uint64 操作人
+}
+// 仓单出库确认响应 0 29 196
+message WROutConfirmRsp {
+ optional MessageHead Header = 1; // MessageHead 消息头
+ optional int32 RetCode = 2; // int32 返回码
+ optional string RetDesc = 3; // string 描述信息
+  optional uint64 applyid = 4; // uint64 协议ID
 }

src/services/funcode/index.ts

@@ -147,7 +147,7 @@ export const funCode: Code = {
     t2bExchConfirmBusinessRsp: 589900,  // 交易所审核结果通知应答
 
     GoodsPickupOperateReq: 1900728, // 提货单操作请求
-    GoodsPickupOperateRsp:1900729,  // 提货单操作响应
+    GoodsPickupOperateRsp: 1900729,  // 提货单操作响应
 
     GoodsPickupConfirmReq: 196703, // 商品提货确认请求
     GoodsPickupConfirmRsp: 196704, // 商品提货确认响应
@@ -172,6 +172,12 @@ export const funCode: Code = {
     WRListingCancelOrderReq: 1441796, // 挂牌撤单请求
     WRListingCancelOrderRsp: 1441797, // 挂牌撤单应答
 
+    WROutApplyCancelReq: 1900654, // 仓单出入库注销请求
+    WROutApplyCancelRsp: 1900655, // 仓单出入库注销响应
+
+    WROutConfirmReq: 1900739, // 仓单出库确认请求
+    WROutConfirmRsp: 1900740, // 仓单出库确认响应
+
     // 履约
     PerformanceManualConfirmReq: 1310723, // 履约手动确认请求
     PerformanceManualConfirmRsp: 1310724, // 履约手动确认应答
@@ -187,11 +193,11 @@ export const funCode: Code = {
 
     /***************** 融资信息 ******************/
 
-    WRTradeFinanceBuyCancelReq : 1441814,     /// 融资申请撤单请求(0, 22, 22)
-    WRTradeFinanceBuyCancelRsp : 1441815,     /// 融资申请撤单应答(0, 22, 23)
-    WarehouseRepurchaseReq : 1507335,     /// 仓单回购请求(0, 23, 7)
-    WarehouseRepurchaseRsp : 1507336,     /// 仓单回购应答(0, 23, 8)
-    PaymentArrearsReq : 1507337,     /// 支付欠款请求(0, 23, 9)
-    PaymentArrearsRsp : 1507338,     /// 支付欠款应答(0, 23, 10)
+    WRTradeFinanceBuyCancelReq: 1441814,//      融资申请撤单请求(0, 22, 22)
+    WRTradeFinanceBuyCancelRsp: 1441815,//      融资申请撤单应答(0, 22, 23)
+    WarehouseRepurchaseReq: 1507335,//          仓单回购请求(0, 23, 7)
+    WarehouseRepurchaseRsp: 1507336,//          仓单回购应答(0, 23, 8)
+    PaymentArrearsReq: 1507337,//               支付欠款请求(0, 23, 9)
+    PaymentArrearsRsp: 1507338,//               支付欠款应答(0, 23, 10)
 
 };

src/services/proto/warehousetrade/index.ts

@@ -1,8 +1,8 @@
 import {
     HdWRDealOrderReq,
     HdWROrderReq, PaymentArrearsReq, WarehouseRepurchaseReq,
-    WRListingCancelOrderReq,
-    WROutApplyReq, WRTradeFinanceBuyCancelReq
+    WRListingCancelOrderReq, WROutApplyCancelReq,
+    WROutApplyReq, WROutConfirmReq, WRTradeFinanceBuyCancelReq
 } from "@/services/proto/warehousetrade/interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
 import { HeadEnum } from "@/services/socket/protobuf/protoHeader";
@@ -71,6 +71,23 @@ export const WRTradeFinanceBuyCancel = (param: WRTradeFinanceBuyCancelReq): Prom
     return protoMiddleware<WRTradeFinanceBuyCancelReq>(param, 'WRTradeFinanceBuyCancelReq', 'WRTradeFinanceBuyCancelRsp', HeadEnum.tradeMode17)
 }
 
+/**
+ * 仓单出入库注销请求
+ * @param param
+ */
+export const WROutApplyCancel = (param: WROutApplyCancelReq): Promise<any> => {
+    return protoMiddleware<WROutApplyCancelReq>(param, 'WROutApplyCancelReq', 'WROutApplyCancelRsp', HeadEnum.tradeMode17)
+}
+
+/**
+ * 仓单出库确认请求
+ * @param param
+ * @constructor
+ */
+export const WROutConfirm = (param: WROutConfirmReq): Promise<any> => {
+    return protoMiddleware<WROutConfirmReq>(param, 'WROutConfirmReq', 'WROutConfirmRsp', HeadEnum.tradeMode17)
+}
+
 
 
 

src/services/proto/warehousetrade/interface.ts

@@ -214,5 +214,30 @@ export interface WRTradeFinanceBuyCancelRsp {
     ClientSerialNo : string // string 客户端流水号
 }
 
+// 仓单出入库注销请求 0 29 110
+export interface WROutApplyCancelReq {
+    ClientSerialID: number // uint64 客户端唯一ID
+    ApplyID: string // string 申请ID
+    Type: number // uint32 类型：1-入库预约注销，2-入库注册注销，3-出库预约注销,4-出库注销注销
+}
+// 仓单出入库注销响应 0 29 111
+export interface WROutApplyCancelRsp {
+    RetCode: number // int32 返回码
+    RetDesc: string// string 描述信息
+    ClientSerialID: number // uint64 客户端唯一ID
+}
+// 仓单出库确认请求 0 29 195
+export interface WROutConfirmReq {
+    applyid: number // uint64 申请Id
+    operatesrc: number // uint32 操作来源 - 1:管理端 2:终端
+    operateid: number // uint64 操作人
+}
+// 仓单出库确认响应 0 29 196
+export interface WROutConfirmRsp {
+    RetCode: number // int32 返回码
+    RetDesc: string // string 描述信息
+    applyid: number // uint64 协议ID
+}
+