Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/THJ_Mobile

src/business/order/index.ts

@@ -10,7 +10,6 @@ import { queryWrOrderDetail,
          queryTHJPurchaseTransferOrderDetail } from '@/services/api/order'
 import { useLoginStore } from '@/stores'
 import { formatDate } from '@/filters'
-import { useNavigation } from '@/hooks/navigation'
 
 // 查询仓单持有记录
 export function useQueryHoldLB() {

src/business/trade/index.ts

@@ -10,6 +10,7 @@ import {
     spotPresalePlayment,
     wrListingCancelOrder,
     spotPresaleDeliveryConfirm,
+    wrOutApply,
     spotPresaleBreachOfContractApply
 } from '@/services/api/trade'
 import { formatDate } from "@/filters";
@@ -52,14 +53,13 @@ export function useSpotPresaleDeliveryConfirm() {
     const { getUserId } = useLoginStore()
     const loading = shallowRef(false)
 
-
-    const confirmSubmit = (id: number) => {
+    const confirmSubmit = (id: string) => {
         loading.value = true
         return spotPresaleDeliveryConfirm({
             data: {
                 UserID: getUserId(),
                 Remark: '',
-                WRTradeDetailID: Long.fromNumber(id),
+                WRTradeDetailID: Long.fromString(id),
                 ClientSerialNo: v4(), // 客户端流水号
                 ClientType: ClientType.Web // 终端类型
             },
@@ -80,12 +80,12 @@ export function useSpotPresaleBreachOfContractApply() {
     const loading = shallowRef(false)
     const { getUserId } = useLoginStore()
 
-    const applySubmit = (id: number) => {
+    const applySubmit = (id: string) => {
         loading.value = true
         return spotPresaleBreachOfContractApply({
             data: {
                 UserID: getUserId(),
-                WRTradeDetailID: Long.fromNumber(id),
+                WRTradeDetailID: Long.fromString(id),
                 ClientSerialNo: v4(), // 客户端流水号
                 ClientType: ClientType.Web // 终端类型
             },
@@ -106,18 +106,18 @@ export function useSpotPresalePlayment() {
     const loading = shallowRef(false)
     const { getUserId } = useLoginStore()
 
-    const formData = ref<Partial<Proto.SpotPresalePlaymentReq>>({
+    const formData = reactive<Partial<Proto.SpotPresalePlaymentReq>>({
         UserID: getUserId(), // 用户ID，必填
         ClientType: ClientType.Web, // 终端类型
         ClientSerialNo: v4(), // 客户端流水号
     })
 
-    const playmentSubmit = (id: number) => {
+    const playmentSubmit = (id: string) => {
         loading.value = true
         return spotPresalePlayment({
             data: {
                 ...formData,
-                WRTradeDetailID: Long.fromNumber(id),
+                WRTradeDetailID: Long.fromString(id),
             },
             complete: () => {
                 loading.value = false
@@ -136,23 +136,22 @@ export function useSpotPresaleTransferListing() {
     const loading = shallowRef(false)
     const { getUserId } = useLoginStore()
 
-    const formData = ref<Partial<Proto.SpotPresaleTransferListingReq>>({
+    const formData = reactive<Partial<Proto.SpotPresaleTransferListingReq>>({
         UserID: getUserId(), // 用户ID，必填
         ClientType: ClientType.Web, // 终端类型
         ClientSerialNo: v4(), // 客户端流水号
     })
 
-    const listingSubmit = (id: number) => {
+    const listingSubmit = (id: string) => {
         /// 转让价格不能为0
-        if (!formData.value.TransferPrice) {
+        if (!formData.TransferPrice) {
             return Promise.reject('转让价格不能为0')
         }
         loading.value = true
-
         return spotPresaleTransferListing({
             data: {
                 ...formData,
-                WRTradeDetailID: Long.fromNumber(id),
+                WRTradeDetailID: Long.fromString(id),
             },
             complete: () => {
                 loading.value = false
@@ -172,12 +171,12 @@ export function useSpotPresaleTransferCancel() {
     const loading = shallowRef(false)
     const { getUserId } = useLoginStore()
 
-    const transferCancelSubmit = (id: number) => {
+    const transferCancelSubmit = (id: string) => {
         loading.value = true
         return spotPresaleTransferCancel({
             data: {
                 UserID: getUserId(),
-                WRTradeDetailID: Long.fromNumber(id),
+                WRTradeDetailID: Long.fromString(id),
                 ClientSerialNo: v4(), // 客户端流水号
                 ClientType: ClientType.Web // 终端类型
             },
@@ -254,4 +253,44 @@ export function useWrListingCancelOrder() {
         loading,
         cancelSubmit
     }
+}
+
+// 仓单明细挂牌请求接口
+export function useWrOutInApply(holdlb: Model.HoldLBRsp) {
+    const loading = shallowRef(false)
+    const { getUserId, getFirstAccountId, getLoginId } = useLoginStore()
+
+    const formData = reactive<Partial<Proto.WROutApplyReq>>({
+        AppointmentRemark: '',
+        UserID: getUserId(),             // 用户ID，必填
+        AccountID: getFirstAccountId(),  // 申请人账户ID
+        CreatorID: getLoginId(),         // 创建人ID
+        WRStandardID: holdlb.wrstandardid,
+        WarehouseID: holdlb.warehouseid,
+        ClientSerialID: Number(v4()),    // 客户端流水号
+    })
+
+    const applySubmit = (qty: number) => {
+        loading.value = true
+        return wrOutApply({
+            data: {
+                ...formData,
+                WROutInDetails: [{
+                    LadingBillID: holdlb.ladingbillid,
+                    SubNum: holdlb.subnum,
+                    Qty: qty,
+                    OutQty: qty,
+                }]
+            },
+            complete: () => {
+                loading.value = false
+            }
+        })
+    }
+
+    return {
+        loading,
+        formData,
+        applySubmit
+    }
 }

src/packages/mobile/router/index.ts

@@ -232,6 +232,16 @@ const routes: Array<RouteRecordRaw> = [
         path: 'transferdetail',
         name: 'transfer-detail',
         component: () => import('../views/mine/order/detail/transfer/index.vue'),
+      },
+      {
+        path: 'pickup',
+        name: 'warehouse-pickup',
+        component: () => import('../views/mine/order/pickup/index.vue'),
+      },
+      {
+        path: 'listing',
+        name: 'warehouse-listing',
+        component: () => import('../views/mine/order/listing/index.vue'),
       }
     ]
   },

src/packages/mobile/views/mine/order/detail/purchasetrade/index.less

@@ -1,2 +0,0 @@
-
-

src/packages/mobile/views/mine/order/detail/purchasetrade/index.vue

@@ -196,5 +196,5 @@ const cancelDialog = () => {
 </script>
 
 <style lang="less">
-@import './index.less';
+
 </style>

src/packages/mobile/views/mine/order/detail/transfer/index.vue

@@ -84,5 +84,4 @@ const spotCancelSubmit = () => {
 </script>
 
 <style lang="less">
-@import './index.less';
 </style>

src/packages/mobile/views/mine/order/listing/index.vue

@@ -0,0 +1,7 @@
+<template>
+    <app-view class="mine-order">
+        <template #header>
+            <app-navbar title="供求挂牌" />
+        </template>
+    </app-view>
+</template>

src/packages/mobile/views/mine/order/pickup/index.vue

@@ -0,0 +1,11 @@
+<template>
+    <app-view class="mine-order">
+        <template #header>
+            <app-navbar title="提货" />
+        </template>
+    </app-view>
+</template>
+
+<script lang="ts" setup>
+
+</script>

src/services/api/trade/index.ts

@@ -20,42 +20,42 @@ export function spotPresaleDeliveryConfirm(params: TradeParams<Proto.SpotPresale
  * 铁合金现货预售违约确认
  */
 export function spotPresaleBreachOfContractConfirm(params: TradeParams<Proto.SpotPresaleBreachOfContractConfirmReq, Proto.SpotPresaleBreachOfContractConfirmRsp>) {
-    return tradeServerRequest('SpotPresaleBreachOfContractConfirmReq', 'SpotPresaleBreachOfContractConfirmRsp', params);
+    return tradeServerRequest('SpotPresaleBreachOfContractConfirmReq', 'SpotPresaleBreachOfContractConfirmRsp', params, Market.THJ);
 }
 
 /**
  * 铁合金现货预售违约申请接口请求
  */
 export function spotPresaleBreachOfContractApply(params: TradeParams<Proto.SpotPresaleBreachOfContractApplyReq, Proto.SpotPresaleBreachOfContractApplyRsp>) {
-    return tradeServerRequest('SpotPresaleBreachOfContractApplyReq', 'SpotPresaleBreachOfContractApplyRsp', params);
+    return tradeServerRequest('SpotPresaleBreachOfContractApplyReq', 'SpotPresaleBreachOfContractApplyRsp', params, Market.THJ);
 }
 
 /**
  * 铁合金现货预售付款处理接口请求
  */
 export function spotPresalePlayment(params: TradeParams<Proto.SpotPresalePlaymentReq, Proto.SpotPresalePlaymentRsp>) {
-    return tradeServerRequest('SpotPresalePlaymentReq', 'SpotPresalePlaymentRsp', params);
+    return tradeServerRequest('SpotPresalePlaymentReq', 'SpotPresalePlaymentRsp', params, Market.THJ);
 }
 
 /**
  * 挂牌撤单请求
  */
 export function wrListingCancelOrder(params: TradeParams<Proto.WRListingCancelOrderReq, Proto.WRListingCancelOrderRsp>) {
-    return tradeServerRequest('WRListingCancelOrderReq', 'WRListingCancelOrderRsp', params);
+    return tradeServerRequest('WRListingCancelOrderReq', 'WRListingCancelOrderRsp', params, Market.THJ);
 }
 
 /**
  * 仓单出库申请
  */
 export function wrOutApply(params: TradeParams<Proto.WROutApplyReq, Proto.WROutApplyRsp>) {
-    return tradeServerRequest('WROutApplyReq', 'WROutApplyRsp', params);
+    return tradeServerRequest('WROutApplyReq', 'WROutApplyRsp', params, Market.THJ);
 }
 
 /**
  * 持仓单挂牌请求
  */
 export function hdWROrder(params: TradeParams<Proto.HdWROrderReq, Proto.HdWROrderRsp>) {
-    return tradeServerRequest('HdWROrderReq', 'HdWROrderRsp', params);
+    return tradeServerRequest('HdWROrderReq', 'HdWROrderRsp', params, Market.THJ);
 }
 
 /**
@@ -69,14 +69,14 @@ export function hdWRDealOrder(params: TradeParams<Proto.HdWRDealOrderReq, Proto.
  * 铁合金现货预售转让挂牌接口请求
  */
 export function spotPresaleTransferListing(params: TradeParams<Proto.SpotPresaleTransferListingReq, Proto.SpotPresaleTransferListingRsp>) {
-    return tradeServerRequest('SpotPresaleTransferListingReq', 'SpotPresaleTransferListingRsp', params);
+    return tradeServerRequest('SpotPresaleTransferListingReq', 'SpotPresaleTransferListingRsp', params, Market.THJ);
 }
 
 /**
  * 铁合金现货预售转让撤销接口请求
  */
 export function spotPresaleTransferCancel(params: TradeParams<Proto.SpotPresaleTransferCancelReq, Proto.SpotPresaleTransferCancelRsp>) {
-    return tradeServerRequest('SpotPresaleTransferCancelReq', 'SpotPresaleTransferCancelRsp', params);
+    return tradeServerRequest('SpotPresaleTransferCancelReq', 'SpotPresaleTransferCancelRsp', params, Market.THJ);
 }
 
 /**

src/services/http/index.ts

@@ -101,7 +101,6 @@ const httpService = new (class {
 
     httpRequest = async <T extends Payload>(url: string, method: Method, params: HttpParams<T>) => {
         const { data, success, fail, complete } = params
-        console.log('queryParam', params)
         await this.request(url, method, data).then((res) => {
             const data = res.data as HttpResponse<T['rsp']>
             switch (data.code) {

src/types/model/order.d.ts

@@ -284,7 +284,7 @@ declare namespace Model {
         /// 支付尾款成功交易日
         payedtradedate: string
         /// 预售申请ID(184+Unix秒时间戳(10位)+xxxxxx)
-        presaleapplyid: number
+        presaleapplyid: string
         /// 发票信息
         receiptinfo: string
         /// 剩余货款 = 到期总货款 - 已付定金 - 优惠金额
@@ -324,13 +324,13 @@ declare namespace Model {
         /// 仓库名称
         warehousename: string
         /// 仓单要素类型ID
-        wrfactortypeid: number
+        wrfactortypeid: string
         /// 现货商品ID
         wrstandardid: number
         /// 现货商品名称
         wrstandardname: string
         /// 采购成交单ID(321+Unix秒时间戳(10位)+xxxxxx)
-        wrtradedetailid: number
+        wrtradedetailid: string
     }
 
     /* 查询仓单持有记录 请求*/
@@ -570,7 +570,7 @@ declare namespace Model {
         /// 市场ID(固定为(64202)
         marketid: number
         /// 预售申请ID(184+Unix秒时间戳(10位)+xxxxxx)
-        presaleapplyid: number
+        presaleapplyid: string
         /// 备注
         remark: string
         /// 卖方账号ID
@@ -588,7 +588,7 @@ declare namespace Model {
         /// 转让金额
         transferamount: number
         /// 协议转让ID(332+Unix秒时间戳(10位)+xxxxxx)
-        transferid: number
+        transferid: string
         /// 转让价格
         transferprice: number
         /// 数量
@@ -600,11 +600,11 @@ declare namespace Model {
         /// 仓库ID
         warehouseid: number
         /// 仓单要素类型ID
-        wrfactortypeid: number
+        wrfactortypeid: string
         /// 现货商品ID
         wrstandardid: number
         /// 采购成交单ID(321+Unix秒时间戳(10位)+xxxxxx)
-        wrtradedetailid: number
+        wrtradedetailid: string
         /// 现货商品名称
         wrstandardname: string
         /// 预售价格

src/types/proto/trade.d.ts

@@ -25,8 +25,8 @@ declare global {
             Header?: IMessageHead;
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
-            PresaleApplyID: number; // 预售申请ID
-            WRTradeDetailID: number; // 成交单ID
+            PresaleApplyID: string; // 预售申请ID
+            WRTradeDetailID: string; // 成交单ID
             ClientSerialNo: string; // 客户端流水号
         }
 
@@ -46,7 +46,7 @@ declare global {
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
             UserID: number; // 用户ID，必填
-            WRTradeDetailID: number; // 采购成交单ID
+            WRTradeDetailID: string; // 采购成交单ID
             ClientSerialNo: string; // 客户端流水号
         }
 
@@ -67,7 +67,7 @@ declare global {
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
             UserID: number; // 用户ID，必填
-            WRTradeDetailID: number; // 采购成交单ID
+            WRTradeDetailID: string; // 采购成交单ID
             ClientSerialNo: string; // 客户端流水号
         }
 
@@ -86,7 +86,7 @@ declare global {
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
             UserID: number; // 用户ID，必填
-            WRTradeDetailID: number; // 采购成交单ID
+            WRTradeDetailID: string; // 采购成交单ID
             ClientSerialNo: string; // 客户端流水号
         }
 
@@ -104,7 +104,7 @@ declare global {
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
             UserID: number; // 用户ID，必填
-            WRTradeDetailID: number; // 采购成交单ID
+            WRTradeDetailID: string; // 采购成交单ID
             ClientSerialNo: string; // 客户端流水号
         }
 
@@ -127,8 +127,8 @@ declare global {
             Header?: IMessageHead;
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
-            WRTradeCancelID ?: number // 仓单贸易撤单号
-            OldWRTradeOrderID?: number // 目标仓单贸易委托单ID
+            WRTradeCancelID ?: string // 仓单贸易撤单号
+            OldWRTradeOrderID?: string // 目标仓单贸易委托单ID
             UserID?: number // 用户ID
             AccountID?: number // 资金账号
             CancelQty?: number // 撤单数量
@@ -147,24 +147,24 @@ declare global {
         // 仓单出库申请
         interface WROutApplyReq {
             Header?: IMessageHead;
-            ClientSerialID: number; // 客户端唯一ID
-            WRStandardID: number; // 仓单标准ID
-            WarehouseID: number; // 仓库ID
-            UserID: number; // 申请人ID
-            AccountID: number; // 申请人账户ID
-            Mobile: string; // 申请人手机号
-            AppointmentDate: string; // 预约出库时间（格式：20200101）
-            AppointmentModel: number; // 预约方式:1-物流,2-自送，3-自提
-            CountryID: number; // 国家
-            ProvinceID: number; // 省
-            DistrictID: number; // 区
-            CityID: number; // 市
-            Address: string; // 详细地址
-            ContactName: string; // 收货人提货人
-            ContactNum: string; // 收货人提货人手机
-            AppointmentRemark: string; // 预约备注
-            CreatorID: number; // 创建人ID
-            WROutInDetails: WROutInDetail; // 仓单出库提单明细数据
+            ClientSerialID?: number; // 客户端唯一ID
+            WRStandardID?: number; // 仓单标准ID
+            WarehouseID?: number; // 仓库ID
+            UserID?: number; // 申请人ID
+            AccountID?: number; // 申请人账户ID
+            Mobile?: string; // 申请人手机号
+            AppointmentDate?: string; // 预约出库时间（格式：20200101）
+            AppointmentModel?: number; // 预约方式:1-物流,2-自送，3-自提
+            CountryID?: number; // 国家
+            ProvinceID?: number; // 省
+            DistrictID?: number; // 区
+            CityID?: number; // 市
+            Address?: string; // 详细地址
+            ContactName?: string; // 收货人提货人
+            ContactNum?: string; // 收货人提货人手机
+            AppointmentRemark?: string; // 预约备注
+            CreatorID?: number; // 创建人ID
+            WROutInDetails: WROutInDetail[]; // 仓单出库提单明细数据
         }
 
         // 仓单出库申请响应
@@ -172,7 +172,7 @@ declare global {
             Header?: IMessageHead; // 消息头
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
-            ClientSerialID: number; // 客户端唯一ID
+            ClientSerialID: string; // 客户端唯一ID
         }
 
         // 要素类型明细
@@ -306,8 +306,8 @@ declare global {
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
             UserID: number; // 用户ID，必填
-            TransferID: number; // 协议转让ID
-            WRTradeDetailID: number; // 采购成交单ID
+            TransferID: string; // 协议转让ID
+            WRTradeDetailID: string; // 采购成交单ID
             ClientSerialNo: string; // 客户端流水号
         }
 
@@ -326,7 +326,7 @@ declare global {
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
             TransferID: number; // 协议转让ID
-            WRTradeDetailID: number; // 采购成交单ID
+            WRTradeDetailID: string; // 采购成交单ID
             ClientSerialNo: string; // 客户端流水号
         }
 
@@ -346,7 +346,7 @@ declare global {
             RetCode: number; // 返回码
             RetDesc: string; // 描述信息
             UserID: number; // 用户ID
-            TransferID: number; // 协议转让ID
+            TransferID: string; // 协议转让ID
             ClientSerialNo: string; // 客户端流水号
         }
     }