commit 新增接口

public/proto/mtp.proto

@@ -1391,3 +1391,46 @@ message t2bExchConfirmBusinessRsp {
   required int32 Status = 5; // 状态（0成功,其他数值参考银行服务的错误码）
   required string ExchTicket = 6; // 交易所流水号（操作流水，非被审核交易的流水）
 }
+
+// 提货单操作请求 0 29 184
+message GoodsPickupOperateReq {
+	optional MessageHead Header = 1; // MessageHead
+	optional uint32 operatetype = 2; // uint32 操作类型-1:提货单上传物流信息 2:取货确认(自提) 3:收货确认(邮寄)
+		optional uint64 takeorderid = 3; // uint64 提货单号
+		optional uint64 userid = 4; // uint64 用户ID
+		optional uint64 loginid = 5; // uint64 登录ID
+		optional TradeGoodsInfo info = 6; // TradeGoodsInfo 提货单信息
+}
+
+// 提货单操作响应 0 29 185
+message GoodsPickupOperateRsp {
+	optional MessageHead Header = 1; // MessageHead 消息头
+	optional int32 RetCode = 2; // int32 返回码
+	optional string RetDesc = 3; // string 描述信息
+	optional uint64 takeorderid = 4; // uint64 提货单号
+	optional uint64 userid = 5; // uint64 用户ID
+	optional uint64 loginid = 6; // uint64 登录ID
+}
+
+// 提货单信息 0 29 186
+message TradeGoodsInfo {
+	optional string expresscompany = 1; // string 物流公司
+	optional string expressnum = 2; // string 物流单号
+}
+
+// 商品提货确认请求 0 3 95
+message GoodsPickupConfirmReq {
+	optional MessageHead Header = 1; // MessageHead
+	optional uint64 TakeOrderID = 2; // uint64 提货单号
+	optional uint64 Auditer = 3; // uint64 审核人
+	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 客户端流水号
+}
+

src/services/funcode/index.ts

@@ -140,7 +140,15 @@ export const funCode: Code = {
     CustomerInfoOperateReq: 1900731,  // 客户资料操作请求
     CustomerInfoOperateRsp: 1900732,  // 客户资料操作响应
 
+
+    // 之前管理端的一些接口
+
     t2bExchConfirmBusinessReq: 589899,  // 交易所审核结果通知请求
     t2bExchConfirmBusinessRsp: 589900,  // 交易所审核结果通知应答
 
+    GoodsPickupOperateReq: 1900728, // 提货单操作请求
+    GoodsPickupOperateRsp:1900729,  // 提货单操作响应
+
+    GoodsPickupConfirmReq: 196703, // 商品提货确认请求
+    GoodsPickupConfirmRsp: 196704, // 商品提货确认响应
 };

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

@@ -61,8 +61,10 @@ export function queryReckonPriceLog(req: QueryReckonPriceLogReq): Promise<QhjRec
  * @param req
  */
 export function queryRSTriggerLog(status?: 1 | 2 | 3): Promise<QhjRSTriggerLog[]> {
-    const userid = getUsrId();
-    const param = status ? { userid, status } : { userid }
+    // fixme 不传userid
+    // const userid = getUsrId();
+    // const param = status ? { userid, status } : { userid }
+    const param =  status ? { status } : {  }
     return commonSearch_go('/Qhj/QueryRSTriggerLog', param).catch((err) => {
         throw new Error(`查询定投记录: ${err}`);
     });
@@ -74,8 +76,9 @@ export function queryRSTriggerLog(status?: 1 | 2 | 3): Promise<QhjRSTriggerLog[]
  * @param req
  */
 export function queryRStrategy(status?: 1 | 2 | 3): Promise<QhjRStrategy[]> {
-    const userid = getUsrId();
-    const param = status ? { userid, status } : { userid }
+    // fixme 不传userid
+    // const userid = getUsrId();
+    const param =  status ? { status } : {  }
     return commonSearch_go('/Qhj/QueryRStrategy', param).catch((err) => {
         throw new Error(`查询定投设置: ${err}`);
     });
@@ -87,8 +90,9 @@ export function queryRStrategy(status?: 1 | 2 | 3): Promise<QhjRStrategy[]> {
  * @param 合同id
  */
 export function queryContract(scfcontractid?: number): Promise<QhjContract[]> {
-    const userid = getUsrId();
-    const param = scfcontractid ? { userid, scfcontractid } : { userid }
+    // fixme 不传userid
+    // const userid = getUsrId();
+    const param = scfcontractid ? { scfcontractid } : {  }
     return commonSearch_go('/Qhj/QueryContract', param).catch((err) => {
         throw new Error(`查询融资明细(合同): ${err}`);
     });
@@ -102,7 +106,6 @@ export function queryContract(scfcontractid?: number): Promise<QhjContract[]> {
 export function queryCustomerInfo(req: QueryCustomerInfoReq): Promise<QhjCustomer[]> {
     const userid = getUsrId();
     req.userid = userid;
-    console.log(req);
 
     return commonSearch_go('/Qhj/QueryCustomerInfo', req).catch((err) => {
         throw new Error(`查询客户资料: ${err}`);

src/services/proto/manager/index.ts

@@ -2,7 +2,12 @@
  *****************     管理端接口  *******************
  */
 import {protoMiddleware} from "@/services/socket/protobuf/buildReq";
-import {t2bExchConfirmBusinessReq, t2bExchConfirmBusinessRsp} from "@/services/proto/manager/interface";
+import {
+    GoodsPickupConfirmReq, GoodsPickupConfirmRsp,
+    GoodsPickupOperateReq, GoodsPickupOperateRsp,
+    t2bExchConfirmBusinessReq,
+    t2bExchConfirmBusinessRsp
+} from "@/services/proto/manager/interface";
 
 /**
  * 交易所审核结果通知请求
@@ -12,3 +17,18 @@ export const t2bExchConfirmBusiness = (param: t2bExchConfirmBusinessReq): Promis
     return protoMiddleware<t2bExchConfirmBusinessReq>(param, 't2bExchConfirmBusinessReq', 't2bExchConfirmBusinessRsp', 2)
 }
 
+/**
+ * 提货相关操作接口  //  （提货单操作请求）
+ * @param param
+ */
+export const goodsPickupOperate = (param: GoodsPickupOperateReq): Promise<GoodsPickupOperateRsp> => {
+    return protoMiddleware<GoodsPickupOperateReq>(param, 'GoodsPickupOperateReq', 'GoodsPickupOperateRsp', 2)
+}
+
+/**
+ * 商品提货确认请求  //  （完成备货功能）
+ * @param param
+ */
+export const goodsPickupConfirm = (param: GoodsPickupConfirmReq): Promise<GoodsPickupConfirmRsp> => {
+    return protoMiddleware<GoodsPickupConfirmReq>(param, 'GoodsPickupConfirmReq', 'GoodsPickupConfirmRsp', 2)
+}

src/services/proto/manager/interface.ts

@@ -24,3 +24,43 @@ export interface t2bExchConfirmBusinessRsp {
     Status: number; // 状态（0成功,其他数值参考银行服务的错误码）
     ExchTicket: string; // 交易所流水号（操作流水，非被审核交易的流水）
 }
+
+// 提货单操作请求 0 29 184
+export interface GoodsPickupOperateReq {
+    operatetype: number; // uint32 操作类型-1:提货单上传物流信息 2:取货确认(自提) 3:收货确认(邮寄)
+    takeorderid : number; // uint64 提货单号
+    userid: number; // uint64 用户ID
+    loginid: number; // uint64 登录ID
+    info?: TradeGoodsInfo // TradeGoodsInfo 提货单信息
+}
+
+// 提货单操作响应 0 29 185
+export interface GoodsPickupOperateRsp {
+    RetCode: number; // int32 返回码
+    RetDesc: string; // string 描述信息
+    takeorderid: number; // uint64 提货单号
+    userid: number; // uint64 用户ID
+    loginid: number; // uint64 登录ID
+}
+
+// 提货单信息 0 29 186
+export interface TradeGoodsInfo {
+    expresscompany: string; // string 物流公司
+    expressnum: string; // string 物流单号
+}
+
+// 商品提货确认请求 0 3 95
+export interface  GoodsPickupConfirmReq {
+    TakeOrderID: number // uint64 提货单号
+    Auditer: number // uint64 审核人
+    CheckRemark: string // string 审核备注
+    ClientTicket: string // string 客户端流水号
+}
+// 商品提货确认响应 0 3 96
+export interface  GoodsPickupConfirmRsp {
+    RetCode: number // int32 返回码
+    RetDesc: string // string 描述信息
+    ClientTicket: string // string 客户端流水号
+}
+
+

src/services/request/serviceURL.ts

@@ -76,12 +76,12 @@ export const getUplodaUrl = (): string => {
 
 export const setServiceURL = (config: URL): void => {
     // console.log('URL', config);
-    // 外网环境（175），外包同事使用
-    if (process.env.NODE_ENV === 'development') {
-        serviceURL.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
-        serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
-        serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
-    }
+    //外网环境（175），外包同事使用
+    // if (process.env.NODE_ENV === 'development') {
+    //     serviceURL.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
+    //     serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
+    //     serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
+    // }
     serviceURL = config;
     console.log(serviceURL);
 

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

@@ -8,7 +8,11 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-      <a-button key="submit"
+        <a-button key="submit"
+                  type="primary"
+                  :loading="loading"
+                  @click="submit">完成备货</a-button>
+      <a-button key="cancel"
                 type="primary"
                 :loading="loading"
                 @click="cancel">关闭</a-button>
@@ -21,23 +25,50 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
+import {
+    GoodsPickupConfirmReq,
+    GoodsPickupOperateReq,
+    t2bExchConfirmBusinessReq,
+    TradeGoodsInfo
+} from "@/services/proto/manager/interface";
+import {getTimeValue} from "@/utils/time";
+import {getUserId} from "@/services/bus/account";
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {goodsPickupConfirm, goodsPickupOperate, t2bExchConfirmBusiness} from "@/services/proto/manager";
+import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
+import {getLongTypeLoginID} from "@/services/bus/login";
+import {getUUID} from "ant-design-vue/es/vc-select/utils/commonUtil";
 
 export default defineComponent({
     name: 'platinum_pick_query_complete_stocking',
     components: { CommomDetail },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjTradeGoodsPickup>,
             default: {},
         },
     },
     setup(props, context) {
         const { visible, cancel } = closeModal('platinum_pick_query_complete_stocking');
         const loading = ref<boolean>(false);
+        function submit() {
+            let reqParams: GoodsPickupConfirmReq = {
+                TakeOrderID: props.selectedRow.takeorderid, // uint64 提货单号
+                Auditer: getUserId(), // uint64 审核人
+                CheckRemark: "", // string 审核备注
+                ClientTicket: getUserId().toString(), // string 客户端流水号
+            }
+
+            requestResultLoadingAndInfo(goodsPickupConfirm, reqParams, loading, ['完成备货成功', '完成备货失败:']).then(() => {
+                cancel();
+                context.emit('refresh');
+            });
+        }
         return {
             cancel,
             visible,
             loading,
+            submit,
         };
     },
 });

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

@@ -8,6 +8,10 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
+        <a-button key="submit"
+                  type="primary"
+                  :loading="loading"
+                  @click="submit">确认收货</a-button>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
@@ -21,23 +25,42 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
+import {GoodsPickupConfirmReq, GoodsPickupOperateReq, TradeGoodsInfo} from "@/services/proto/manager/interface";
+import {getUserId} from "@/services/bus/account";
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {goodsPickupConfirm, goodsPickupOperate} from "@/services/proto/manager";
+import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
+import {getLongTypeLoginID} from "@/services/bus/login";
 
 export default defineComponent({
     name: 'platinum_pick_query_receipt',
     components: { CommomDetail },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjTradeGoodsPickup>,
             default: {},
         },
     },
     setup(props, context) {
         const { visible, cancel } = closeModal('platinum_pick_query_receipt');
         const loading = ref<boolean>(false);
+        function submit() {
+            let reqParams: GoodsPickupOperateReq = {
+                operatetype: 3, // uint32 操作类型-1:提货单上传物流信息 2:取货确认(自提) 3:收货确认(邮寄)
+                takeorderid : props.selectedRow.takeorderid, // uint64 提货单号
+                userid: getUserId(), // uint64 用户ID
+                loginid: Number(getLongTypeLoginID()) // uint64 登录ID
+            }
+            requestResultLoadingAndInfo(goodsPickupOperate, reqParams, loading, ['确认收货成功', '确认收货失败:']).then(() => {
+                cancel();
+                context.emit('refresh');
+            });
+        }
         return {
             cancel,
             visible,
             loading,
+            submit,
         };
     },
 });

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

@@ -1,80 +1,111 @@
 <template>
-  <!-- 提货查询 上传物流-->
-  <a-modal class="add-custom upload_logistics"
-           title="上传物流"
-           centered
-           v-model:visible="visible"
-           :maskClosable="false"
-           @cancel="cancel"
-           width="600px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">完成</a-button>
-    </template>
-    <a-form class="inlineForm mt10"
-            ref="formRef">
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="物流公司"
-                       name="">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      placeholder="请选择物流公司">
-              <a-select-option value="顺丰快递">
-                顺丰快递
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="物流单号"
-                       name="">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入物流单号" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-    <!-- <CommomDetail :selectedRow="selectedRow" /> -->
-  </a-modal>
+    <!-- 提货查询 上传物流-->
+    <a-modal class="add-custom upload_logistics"
+             title="上传物流"
+             centered
+             v-model:visible="visible"
+             :maskClosable="false"
+             @cancel="cancel"
+             width="600px">
+        <template #footer>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @click="submit">上传物流信息
+            </a-button>
+            <a-button key="cancel"
+                      type="primary"
+                      :loading="loading"
+                      @click="cancel">完成
+            </a-button>
+        </template>
+        <a-form class="inlineForm mt10"
+                ref="formRef">
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="物流公司"
+                                 name="">
+                        <a-select class="inlineFormSelect"
+                                  style="width: 200px"
+                                  placeholder="请选择物流公司">
+                            <a-select-option value="顺丰快递">
+                                顺丰快递
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="物流单号"
+                                 name="">
+                        <a-input class="dialogInput"
+                                 style="width: 200px"
+                                 placeholder="请输入物流单号"/>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+        <!-- <CommomDetail :selectedRow="selectedRow" /> -->
+    </a-modal>
 </template>
 <script lang="ts">
-import { defineComponent, PropType, ref } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import CommomDetail from '../common-detail/index.vue';
+    import {defineComponent, PropType, ref} from 'vue';
+    import {closeModal} from '@/common/setup/modal/index';
+    import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
+    import CommomDetail from '../common-detail/index.vue';
+    import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
+    import {GoodsPickupOperateReq, TradeGoodsInfo} from "@/services/proto/manager/interface";
+    import {getUserId} from "@/services/bus/account";
+    import {getLongTypeLoginID} from "@/services/bus/login";
+    import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+    import {goodsPickupOperate} from "@/services/proto/manager";
 
-export default defineComponent({
-    name: 'platinum_pick_query_upload_logistics',
-    components: { CommomDetail },
-    props: {
-        selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
-            default: {},
+    export default defineComponent({
+        name: 'platinum_pick_query_upload_logistics',
+        components: {CommomDetail},
+        props: {
+            selectedRow: {
+                type: Object as PropType<QhjTradeGoodsPickup>,
+                default: {},
+            },
         },
-    },
-    setup(props, context) {
-        const { visible, cancel } = closeModal('platinum_pick_query_upload_logistics');
-        const loading = ref<boolean>(false);
-        return {
-            cancel,
-            visible,
-            loading,
-        };
-    },
-});
+        setup(props, context) {
+            const {visible, cancel} = closeModal('platinum_pick_query_upload_logistics');
+            const loading = ref<boolean>(false);
+
+            function submit() {
+                let reqParams: GoodsPickupOperateReq = {
+                    operatetype: 1, // uint32 操作类型-1:提货单上传物流信息 2:取货确认(自提) 3:收货确认(邮寄)
+                    takeorderid: props.selectedRow.takeorderid, // uint64 提货单号
+                    userid: getUserId(), // uint64 用户ID
+                    loginid: Number(getLongTypeLoginID()), // uint64 登录ID
+                    info: {
+                        expresscompany: "1111", // string 物流公司
+                        expressnum: "2222" // string 物流单号
+                    }
+                }
+                requestResultLoadingAndInfo(goodsPickupOperate, reqParams, loading, ['上传物流信息成功', '上传物流信息失败:']).then(() => {
+                    cancel();
+                    context.emit('refresh');
+                });
+            }
+
+            return {
+                cancel,
+                visible,
+                loading,
+                submit,
+            };
+        },
+    });
 </script>
 
 <style lang="less">
-.upload_logistics {
-    .ant-form.inlineForm .ant-row.ant-form-item .ant-form-item-label {
-        width: 200px;
-        text-align: right;
+    .upload_logistics {
+        .ant-form.inlineForm .ant-row.ant-form-item .ant-form-item-label {
+            width: 200px;
+            text-align: right;
+        }
     }
-}
 </style>