update

src/services/go/wrtrade/interface.ts

@@ -1070,41 +1070,50 @@ export interface QueryWrTradeBargainApplyReq {
 }
 
 export interface QueryWrTradeBargainApplyQsp {
-    buyorsell: number;//买卖 - number;
+    accountid: number;//摘牌资金账号
+    applyprice: string;//申请价格(议价价格)
+    applyqty: number;//摘牌数量(议价数量)
+    applyremark: string;//申请备注
+    applystatus: number;//申请状态(议价状态) - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
+    applytime: string;//申请时间(议价时间)
+    buyorsell: number;//买卖(挂牌类型) - number;
     //:买 1:卖
-    canbargain: number;//是否可议价 - number;
-    //:不可 1:可
-    canpart: number;//是否允许部份摘牌 - number;
-    //:不允许 1:允许
-    delistminqty: number;//起摘数量
+    confirmremark: string;//确认备注
+    confirmtime: string;//确认时间
+    confirmuserid: number;//确认人
     deliverygoodscode: string;//品种代码
     deliverygoodsid: number;//品种ID
     deliverygoodsname: string;//品种名称
     deliverymonth: string;//交收月
     enumdicname: string;//单位名称
-    fixedprice: number;//买(卖)价
-    goodscode: string;//商品合约代码
-    marginflag: number;//挂牌是否指定保证金 - number;
-    //:未指定 1:指定
-    marginvalue: number;//保证金设置值
+    fixedprice: number;//挂牌价格
+    handlestatus: number;//处理状态
+    marginvalue: number;//履约保证金比例
+    marketid: number;//市场ID
+    matchaccountid: number;//挂牌方资金账号
+    matchuserid: number;//挂牌方用户id
+    matchusername: string;//挂牌方用户名称(已脱敏)
     minivalue: number;//现货商品最小变动值
-    orderqty: number;//买(卖)量(=委托量-成交量)
-    ordertime: string;//委托时间
-    performancetemplateid: number;//履约模板id
-    pricemove: number;//买(卖)升贴水- 基差
-    templatename: string;//履约模板名称
-    userid: number;//购买方(销售方)用户ID
-    username: string;//购买方(销售方)
+    optioncompare: string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    orderqty: number;//挂牌数量
+    refprice: string;//参考价格
+    retcode: number;//委托返回代码
+    templatename: string;//履约方式(履约模板名称)
+    tradedate: string;//交易日(yyyyMMdd)
+    userid: number;//摘牌人用户ID(议价人ID)
+    username: string;//议价人名字(已脱敏)
     validtime: string;//有效期限
-    validtype: number;//有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效
+    warehouseid: number;//仓库ID
     warehousename: string;//仓库名称
-    wrfactortypeid: string;//仓单要素id
+    wrbargainid: string;//议价申请单ID(327+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrfactortypeid: string;//仓单要素类型ID(212+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrfactortypename: string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
     wrstandardcode: string;//现货商品代码
     wrstandardid: number;//现货商品ID
     wrstandardname: string;//商品名称
-    wrtradeorderid: string;//仓单贸易委托单ID(32number;
-    //+Unix秒时间戳(1number;
-    //位)+xxxxxx)
+    wrtradeorderid: string;//关联委托单ID
     wrtypename: string;//商品
 }
 

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/delisting/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!--仓单贸易 贸易圈挂牌 摘牌-->
-  <Drawer :title="'挂牌求购'"
+  <Drawer :title="'摘牌'"
           :placement="'right'"
           :visible="visible"
           @cancel="cancel"

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/addPermance.vue

@@ -6,39 +6,7 @@
           @cancel="cancel"
           class="top486">
     <a-spin :spinning="loading">
-      <div class="listed">
-        <a-form class="inlineForm dialogForm">
-          <a-input-search placeholder="搜索朋友编码或名称"
-                          class="searchFriendInput noSuffixInput"
-                          enter-button
-                          v-model:value="searchValue"
-                          @search="handleSearch">
-            <template #prefix>
-              <SearchOutlined />
-            </template>
-          </a-input-search>
-          <div class="formBar">
-            <!-- <a-checkbox-group class="commonCheckboxGroup"> -->
-            <div class="item"
-                 v-for="(item, index) in getViewFriends()"
-                 :key="index + '11'">
-              <a-checkbox v-model:checked="item.checked">
-                <span>{{item.frienduserid}} {{ item.friendname }}</span>
-              </a-checkbox>
-            </div>
-            <!-- </a-checkbox-group> -->
-          </div>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="fixedBtns">
-              <a-form-item class="btnCenter">
-                <a-button class="listedBtn"
-                          @click="submit">确定</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
+
     </a-spin>
   </Drawer>
 </template>

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/components/bargain_detail/index.vue

@@ -1,47 +1,50 @@
 <template>
-    <!-- 现货仓单 议价 议价单 -->
-    <Drawer
-        :title="'议价单'"
-        :placement="'right'"
-        class="delistingBottom"
-        :visible="visible"
-        @cancel="cancel"
-    >
-        <div class="listed">
-            <a-form class="inlineForm dialogForm">
-                <div class="formBar">
-                    <a-table
-                        :columns="columns"
-                        class="dialogTable dialogTable2"
-                        :pagination="false"
-                        :expandIcon="expandIcon"
-                        :loading="loading"
-                        :expandIconAsCell="false"
-                        rowKey="applyprice"
-                        :data-source="tableList"
-                    ></a-table>
-                </div>
-                <a-row :gutter="24" type="flex" justify="center">
-                    <a-col :span="24" class="fixedBtns">
-                        <a-form-item class="btnCenter">
-                            <a-button class="cancelBtn" v-if="isMy()" @click="cancelAction">撤销</a-button>
-                            <template v-else>
-                                <a-button class="listedBtn ml10" @click="submit">确认</a-button>
-                                <a-button class="ml10 cancelBtn" @click="refuse">拒绝</a-button>
-                            </template>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-form>
+  <!-- 现货仓单 议价 议价单 -->
+  <Drawer :title="'议价单'"
+          :placement="'right'"
+          class="delistingBottom"
+          :visible="visible"
+          @cancel="cancel">
+    <div class="listed">
+      <a-form class="inlineForm dialogForm">
+        <div class="formBar">
+          <a-table :columns="columns"
+                   class="dialogTable dialogTable2"
+                   :pagination="false"
+                   :expandIcon="expandIcon"
+                   :loading="loading"
+                   :expandIconAsCell="false"
+                   rowKey="applyprice"
+                   :data-source="tableList"></a-table>
         </div>
-    </Drawer>
+        <a-row :gutter="24"
+               type="flex"
+               justify="center">
+          <a-col :span="24"
+                 class="fixedBtns">
+            <a-form-item class="btnCenter">
+              <a-button class="cancelBtn"
+                        v-if="isMy()"
+                        @click="cancelAction">撤销</a-button>
+              <template v-else>
+                <a-button class="listedBtn ml10"
+                          @click="submit">确认</a-button>
+                <a-button class="ml10 cancelBtn"
+                          @click="refuse">拒绝</a-button>
+              </template>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
-import { QueryWrPositionReq, QueryWrTradeBargainApplyReq, WrOrderDetail, WrPosition } from '@/services/go/wrtrade/interface';
+import { QueryWrPositionReq, QueryWrTradeBargainApplyReq, QueryWrTradeBargainApplyQsp, WrPosition } from '@/services/go/wrtrade/interface';
 import { getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hdWROrder } from '@/services/proto/warehousetrade';
@@ -62,18 +65,18 @@ export default defineComponent({
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrOrderDetail>,
+            type: Object as PropType<QueryWrTradeBargainApplyQsp>,
             default: {},
         },
     },
     setup(props, context) {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+        const { loading, tableList, queryTable } = queryTableList<QueryWrTradeBargainApplyQsp>();
         const { visible, cancel } = _closeModal(context);
-        const { wrtradeorderid } = props.selectedRow;
+        const { wrbargainid } = props.selectedRow;
         const param: QueryWrTradeBargainApplyReq = {
             haswr: 0,
-            wrtradeorderid: wrtradeorderid,
+            wrtradeorderid: props.selectedRow.wrtradeorderid,
         };
         queryTable(queryQueryWrTradeBargainApply, param);
         // 我对别人的 => 撤销
@@ -82,7 +85,7 @@ export default defineComponent({
         // 确认
         function submit() {
             const param: WrBargainNoAgreeReq = {
-                WrBargainID: Long.fromString(wrtradeorderid),
+                WrBargainID: Long.fromString(wrbargainid),
                 Status: 1,
             };
             requestResultLoadingAndInfo(wrBargainNoAgree, param, loading, ['确认成功', '确认失败:']).then(() => {
@@ -92,7 +95,7 @@ export default defineComponent({
         // 拒绝
         function refuse() {
             const param: WrBargainNoAgreeReq = {
-                WrBargainID: Long.fromString(wrtradeorderid),
+                WrBargainID: Long.fromString(wrbargainid),
                 Status: 2,
             };
             requestResultLoadingAndInfo(wrBargainNoAgree, param, loading, ['拒绝成功', '拒绝失败:']).then(() => {
@@ -102,7 +105,7 @@ export default defineComponent({
         // 撤销
         function cancelAction() {
             const param: WrBargainBackReq = {
-                WrBargainID: Long.fromString(wrtradeorderid),
+                WrBargainID: Long.fromString(wrbargainid),
             };
             requestResultLoadingAndInfo(wrBargainBack, param, loading, ['撤销成功', '撤销失败:']).then(() => {
                 cancel(true);

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/index.vue

@@ -48,7 +48,7 @@
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
 import { queryQueryWrTradeBargainApply, queryWrOrderDetail } from '@/services/go/wrtrade';
-import { QueryWrOrderDetailReq, QueryWrTradeBargainApplyReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { QueryWrOrderDetailReq, QueryWrTradeBargainApplyQsp, QueryWrTradeBargainApplyReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
@@ -66,7 +66,7 @@ export default defineComponent({
     },
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+        const { loading, tableList, queryTable } = queryTableList<QueryWrTradeBargainApplyQsp>();
         // 获取列表数据
         const queryTableAction = () => {
             const param: QueryWrTradeBargainApplyReq = {
@@ -91,7 +91,7 @@ export default defineComponent({
             closeComponent,
             openComponent, // 控制异步组件
             btnList, // 表格按钮
-        } = handleComposeOrderTable<WrOrderDetail>(param);
+        } = handleComposeOrderTable<QueryWrTradeBargainApplyQsp>(param);
 
         return {
             contextMenu,

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/setup.ts

@@ -1,5 +1,5 @@
 import { getUserId } from "@/services/bus/account";
-import { WrOrderDetail } from "@/services/go/wrtrade/interface";
+import { QueryWrTradeBargainApplyQsp } from "@/services/go/wrtrade/interface";
 
 export function getSpotWarrantBargainColumns() {
     const columns = [
@@ -21,7 +21,7 @@ export function getSpotWarrantBargainColumns() {
     })
 }
 
-export function getSpotWarrantBargainDetailColumns(selectedRow: WrOrderDetail) {
+export function getSpotWarrantBargainDetailColumns(selectedRow: QueryWrTradeBargainApplyQsp) {
     const columns = [
         { title: '数量', key: 'applyqty', dataIndex: 'applyqty', align: 'center' },
         { title: '价格', key: 'applyprice', dataIndex: 'applyprice', align: 'center' },

src/views/order/spot_warran/components/spot_warrant_bargain/components/bargain_detail/index.vue

@@ -1,47 +1,50 @@
 <template>
-    <!-- 现货仓单 议价 议价单 -->
-    <Drawer
-        :title="'议价单'"
-        :placement="'right'"
-        class="delistingBottom"
-        :visible="visible"
-        @cancel="cancel"
-    >
-        <div class="listed">
-            <a-form class="inlineForm dialogForm">
-                <div class="formBar">
-                    <a-table
-                        :columns="columns"
-                        class="dialogTable dialogTable2"
-                        :pagination="false"
-                        :expandIcon="expandIcon"
-                        :loading="loading"
-                        :expandIconAsCell="false"
-                        rowKey="applyprice"
-                        :data-source="tableList"
-                    >></a-table>
-                </div>
-                <a-row :gutter="24" type="flex" justify="center">
-                    <a-col :span="24" class="fixedBtns">
-                        <a-form-item class="btnCenter">
-                            <a-button class="cancelBtn" v-if="isMy()" @click="cancelAction">撤销</a-button>
-                            <template v-else>
-                                <a-button class="listedBtn ml10" @click="submit">确认</a-button>
-                                <a-button class="ml10 cancelBtn" @click="refuse">拒绝</a-button>
-                            </template>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-form>
+  <!-- 现货仓单 议价 议价单 -->
+  <Drawer :title="'议价单'"
+          :placement="'right'"
+          class="delistingBottom"
+          :visible="visible"
+          @cancel="cancel">
+    <div class="listed">
+      <a-form class="inlineForm dialogForm">
+        <div class="formBar">
+          <a-table :columns="columns"
+                   class="dialogTable dialogTable2"
+                   :pagination="false"
+                   :expandIcon="expandIcon"
+                   :loading="loading"
+                   :expandIconAsCell="false"
+                   rowKey="applyprice"
+                   :data-source="tableList">></a-table>
         </div>
-    </Drawer>
+        <a-row :gutter="24"
+               type="flex"
+               justify="center">
+          <a-col :span="24"
+                 class="fixedBtns">
+            <a-form-item class="btnCenter">
+              <a-button class="cancelBtn"
+                        v-if="isMy()"
+                        @click="cancelAction">撤销</a-button>
+              <template v-else>
+                <a-button class="listedBtn ml10"
+                          @click="submit">确认</a-button>
+                <a-button class="ml10 cancelBtn"
+                          @click="refuse">拒绝</a-button>
+              </template>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
-import { QueryWrPositionReq, QueryWrTradeBargainApplyReq, WrOrderDetail, WrPosition } from '@/services/go/wrtrade/interface';
+import { QueryWrPositionReq, QueryWrTradeBargainApplyQsp, QueryWrTradeBargainApplyReq, WrOrderDetail, WrPosition } from '@/services/go/wrtrade/interface';
 import { getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hdWROrder } from '@/services/proto/warehousetrade';
@@ -62,18 +65,18 @@ export default defineComponent({
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrOrderDetail>,
+            type: Object as PropType<QueryWrTradeBargainApplyQsp>,
             default: {},
         },
     },
     setup(props, context) {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+        const { loading, tableList, queryTable } = queryTableList<QueryWrTradeBargainApplyQsp>();
         const { visible, cancel } = _closeModal(context);
-        const { wrtradeorderid } = props.selectedRow;
+        const { wrbargainid } = props.selectedRow;
         const param: QueryWrTradeBargainApplyReq = {
             haswr: 1,
-            wrtradeorderid: wrtradeorderid,
+            wrtradeorderid: props.selectedRow.wrtradeorderid,
         };
         queryTable(queryQueryWrTradeBargainApply, param);
         // 我对别人的 => 撤销
@@ -82,7 +85,7 @@ export default defineComponent({
         // 确认
         function submit() {
             const param: WrBargainNoAgreeReq = {
-                WrBargainID: Long.fromString(wrtradeorderid),
+                WrBargainID: Long.fromString(wrbargainid),
                 Status: 1,
             };
             requestResultLoadingAndInfo(wrBargainNoAgree, param, loading, ['确认成功', '确认失败:']).then(() => {
@@ -92,7 +95,7 @@ export default defineComponent({
         // 拒绝
         function refuse() {
             const param: WrBargainNoAgreeReq = {
-                WrBargainID: Long.fromString(wrtradeorderid),
+                WrBargainID: Long.fromString(wrbargainid),
                 Status: 2,
             };
             requestResultLoadingAndInfo(wrBargainNoAgree, param, loading, ['拒绝成功', '拒绝失败:']).then(() => {
@@ -102,7 +105,7 @@ export default defineComponent({
         // 撤销
         function cancelAction() {
             const param: WrBargainBackReq = {
-                WrBargainID: Long.fromString(wrtradeorderid),
+                WrBargainID: Long.fromString(wrbargainid),
             };
             requestResultLoadingAndInfo(wrBargainBack, param, loading, ['撤销成功', '撤销失败:']).then(() => {
                 cancel(true);

src/views/order/spot_warran/components/spot_warrant_bargain/index.vue

@@ -48,7 +48,7 @@
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
 import { queryQueryWrTradeBargainApply, queryWrOrderDetail } from '@/services/go/wrtrade';
-import { QueryWrOrderDetailReq, QueryWrTradeBargainApplyReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { QueryWrOrderDetailReq, QueryWrTradeBargainApplyQsp, QueryWrTradeBargainApplyReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
@@ -66,7 +66,7 @@ export default defineComponent({
     },
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+        const { loading, tableList, queryTable } = queryTableList<QueryWrTradeBargainApplyQsp>();
         // 获取列表数据
         const queryTableAction = () => {
             const param: QueryWrTradeBargainApplyReq = {
@@ -91,7 +91,7 @@ export default defineComponent({
             closeComponent,
             openComponent, // 控制异步组件
             btnList, // 表格按钮
-        } = handleComposeOrderTable<WrOrderDetail>(param);
+        } = handleComposeOrderTable<QueryWrTradeBargainApplyQsp>(param);
 
         return {
             contextMenu,

src/views/order/spot_warran/components/spot_warrant_bargain/setup.ts

@@ -1,5 +1,5 @@
 import { getUserId } from "@/services/bus/account";
-import { WrOrderDetail } from "@/services/go/wrtrade/interface";
+import { QueryWrTradeBargainApplyQsp } from "@/services/go/wrtrade/interface";
 
 export function getSpotWarrantBargainColumns() {
     const columns = [
@@ -21,7 +21,7 @@ export function getSpotWarrantBargainColumns() {
     })
 }
 
-export function getSpotWarrantBargainDetailColumns(selectedRow: WrOrderDetail) {
+export function getSpotWarrantBargainDetailColumns(selectedRow: QueryWrTradeBargainApplyQsp) {
     const columns = [
         { title: '数量', key: 'applyqty', dataIndex: 'applyqty', align: 'center' },
         { title: '价格', key: 'applyprice', dataIndex: 'applyprice', align: 'center' },

swagger-to-ts/swagger.ts

@@ -1,11 +1,47 @@
-export interface Name{
-    autoid	:number;//AutoID 模板id
-createtime	:string;//创建时间
-creatorid	:number;//创建人
-paymenttype	:number;//支付方式 - 1:冻结 2:扣款
-takemode	:number;//提货方式 - 1:无 2:买方自提 3:卖方发货
-templatename	:string;//模板名称
-templatetype	:number;//模板类型 - number;
-//:通用 1:交割 2:仓单贸易 3:预售集采 7:竞拍-竞价式 8:竞拍-大宗式 9:荷兰式–失效枚举：4:竞拍-降价式 (无仓单) 5:挂牌期权 6:竞拍-降价式
-userid	:number;//所属用户
+export interface Name {
+    accountid: number;//摘牌资金账号
+    applyprice: string;//申请价格(议价价格)
+    applyqty: number;//摘牌数量(议价数量)
+    applyremark: string;//申请备注
+    applystatus: number;//申请状态(议价状态) - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
+    applytime: string;//申请时间(议价时间)
+    buyorsell: number;//买卖(挂牌类型) - number;
+    //:买 1:卖
+    confirmremark: string;//确认备注
+    confirmtime: string;//确认时间
+    confirmuserid: number;//确认人
+    deliverygoodscode: string;//品种代码
+    deliverygoodsid: number;//品种ID
+    deliverygoodsname: string;//品种名称
+    deliverymonth: string;//交收月
+    enumdicname: string;//单位名称
+    fixedprice: number;//挂牌价格
+    handlestatus: number;//处理状态
+    marginvalue: number;//履约保证金比例
+    marketid: number;//市场ID
+    matchaccountid: number;//挂牌方资金账号
+    matchuserid: number;//挂牌方用户id
+    matchusername: string;//挂牌方用户名称(已脱敏)
+    minivalue: number;//现货商品最小变动值
+    optioncompare: string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    orderqty: number;//挂牌数量
+    refprice: string;//参考价格
+    retcode: number;//委托返回代码
+    templatename: string;//履约方式(履约模板名称)
+    tradedate: string;//交易日(yyyyMMdd)
+    userid: number;//摘牌人用户ID(议价人ID)
+    username: string;//议价人名字(已脱敏)
+    validtime: string;//有效期限
+    warehouseid: number;//仓库ID
+    warehousename: string;//仓库名称
+    wrbargainid: string;//议价申请单ID(327+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrfactortypeid: string;//仓单要素类型ID(212+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrfactortypename: string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+    wrstandardcode: string;//现货商品代码
+    wrstandardid: number;//现货商品ID
+    wrstandardname: string;//商品名称
+    wrtradeorderid: string;//关联委托单ID
+    wrtypename: string;//商品
 }

swagger-to-ts/swagger.txt

@@ -1,24 +1,127 @@
 {
-    autoid	integer
-AutoID 模板id
+    accountid	integer
+摘牌资金账号
 
-createtime	string
-创建时间
+applyprice	string
+申请价格(议价价格)
 
-creatorid	integer
-创建人
-paymenttype	integer
-支付方式 - 1:冻结 2:扣款
+applyqty	number
+摘牌数量(议价数量)
 
-takemode	integer
-提货方式 - 1:无 2:买方自提 3:卖方发货
+applyremark	string
+申请备注
+
+applystatus	integer
+申请状态(议价状态) - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
+
+applytime	string
+申请时间(议价时间)
+
+buyorsell	integer
+买卖(挂牌类型) - 0:买 1:卖
+
+confirmremark	string
+确认备注
+
+confirmtime	string
+确认时间
+
+confirmuserid	integer
+确认人
+
+deliverygoodscode	string
+品种代码
+
+deliverygoodsid	integer
+品种ID
+
+deliverygoodsname	string
+品种名称
+
+deliverymonth	string
+交收月
+
+enumdicname	string
+单位名称
+
+fixedprice	number
+挂牌价格
+
+handlestatus	integer
+处理状态
+
+marginvalue	number
+履约保证金比例
+
+marketid	integer
+市场ID
+
+matchaccountid	integer
+挂牌方资金账号
+
+matchuserid	integer
+挂牌方用户id
+
+matchusername	string
+挂牌方用户名称(已脱敏)
+
+minivalue	integer
+现货商品最小变动值
+
+optioncompare	string
+选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+
+orderqty	integer
+挂牌数量
+
+refprice	string
+参考价格
+
+retcode	integer
+委托返回代码
 
 templatename	string
-模板名称
+履约方式(履约模板名称)
 
-templatetype	integer
-模板类型 - 0:通用 1:交割 2:仓单贸易 3:预售集采 7:竞拍-竞价式 8:竞拍-大宗式 9:荷兰式–失效枚举：4:竞拍-降价式 (无仓单) 5:挂牌期权 6:竞拍-降价式
+tradedate	string
+交易日(yyyyMMdd)
 
 userid	integer
-所属用户
+摘牌人用户ID(议价人ID)
+
+username	string
+议价人名字(已脱敏)
+
+validtime	string
+有效期限
+
+warehouseid	integer
+仓库ID
+
+warehousename	string
+仓库名称
+
+wrbargainid	string
+议价申请单ID(327+Unix秒时间戳(10位)+xxxxxx)
+
+wrfactortypeid	string
+仓单要素类型ID(212+Unix秒时间戳(10位)+xxxxxx)
+
+wrfactortypename	string
+仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+
+wrstandardcode	string
+现货商品代码
+
+wrstandardid	integer
+现货商品ID
+
+wrstandardname	string
+商品名称
+
+wrtradeorderid	string
+关联委托单ID
+
+wrtypename	string
+商品
 }