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

.gitignore

@@ -15,7 +15,8 @@ pnpm-debug.log*
 
 # Editor directories and files
 .idea
-# .vscode
+.vscode
+.vs
 *.suo
 *.ntvs*
 *.njsproj

src/goServiceAPI/ermcp/exposure-report/index.ts

@@ -1 +1,20 @@
-/** ================================= 敞口报表 ================================**/
+/** ================================= 敞口报表 ================================**/
+
+import APP from '@/services';
+import * as type from './interface';
+import {commonSearch_go} from '@/goServiceAPI/index';
+import {QueryExposureDayReportReq} from "./interface";
+
+/**
+ * 查询敞口日报表
+ * @param queryInfo 查询信息
+ * @returns 敞口日报表
+ */
+export async function QueryExposureDayReport(queryInfo:QueryExposureDayReportReq):Promise<type.QueryExposureDayReportRsp[]>
+{
+    try {
+        return commonSearch_go('/Ermcp/QryReportDayExposure', { queryInfo });
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}

src/goServiceAPI/ermcp/exposure-report/interface.ts

@@ -0,0 +1,42 @@
+/**
+ * 查询敞口日报表请求
+ */
+export interface QueryExposureDayReportReq{
+    userid:number;  
+    tradedate:string;   
+}
+/**
+ * 查询敞口日报表回应
+ */
+export interface QueryExposureDayReportRsp{
+    areauserid:number;
+    buyfutureqty:number;
+    buyplanqty:number;
+    buypricedqty:number;
+    diffFutuqty:number;
+    diffSpotqty:number;
+    enumdicname:string;
+    middlegoodscode:string;
+    middlegoodshedgeratio:number;
+    middlegoodsid:number;
+    middlegoodsname:string;
+    needhedgeexposoure:number;
+    needhedgeratio:number;
+    oritotalFutuqty:number;
+    oritotalspotqty:number;
+    oribuyfutureqty:number;
+    oribuyplanqty:number;
+    oribuypricedqty:number;
+    orisellfutureqty:number;
+    orisellplanqty:number;
+    orisellpricedqty:number;
+    reckondate:string;
+    sellfutureqty:number;
+    sellplanqty:number;
+    sellpricedqty:number;
+    totalexposure:number;
+    totalfutureqty:number;
+    totalhedgeratio:number;
+    totalneedhedgeqty:number;
+    totalspotqty:number;   
+}

src/goServiceAPI/ermcp/finance-report/index.ts

@@ -1 +1,63 @@
-/** ================================= 财务报表 ================================**/
+/** ================================= 财务报表 ================================**/
+
+import APP from '@/services';
+import * as type from './interface';
+import {commonSearch_go} from '@/goServiceAPI/index';
+import {QueryFinanceDayReportReq} from "./interface";
+import {QueryFinanceMonthReportReq} from "./interface";
+
+/**
+ * 查询财务日报表
+ * @param queryInfo 查询信息
+ * @returns 财务日报表数据
+ */
+export async function QueryFinanceDayReport(queryInfo:QueryFinanceDayReportReq):Promise<type.QueryFinanceDayReportRsp[]>
+{
+    try {
+        return commonSearch_go('/Ermcp/QryReportDayFinance', { queryInfo });
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}
+
+/**
+ * 查询财务发票日报表
+ * @param queryInfo 查询信息
+ * @returns 财务发票日报表
+ */
+export async function QueryFinanceInvoiceDayReport(queryInfo:QueryFinanceDayReportReq):Promise<type.QueryFinanceInvoiceDayReportRsp[]>
+{
+    try {
+        return commonSearch_go('/Ermcp/QryReportDayFinanceFp', { queryInfo });
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}
+
+/**
+ * 查询财务付款日报表
+ * @param queryInfo 查询信息
+ * @returns 财务付款日报表
+ */
+export async function QueryFinancePayDayReport(queryInfo:QueryFinanceDayReportReq):Promise<type.QueryFinancePayDayReportRsp[]>
+{
+    try {
+        return commonSearch_go('/Ermcp/QryReportDayFinanceKx', { queryInfo });
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}
+
+/**
+ * 查询财务月报表
+ * @param queryInfo 查询信息
+ * @returns 财务月报表数据
+ */
+ export async function QueryFinanceMonthReport(queryInfo:QueryFinanceMonthReportReq):Promise<type.QueryFinanceMonthReportRsp[]>
+ {
+     try {
+         return commonSearch_go('/Ermcp/QryReportMonthFinance', { queryInfo });
+     } catch (err) {
+         throw new Error(err.message);
+     }
+ }

src/goServiceAPI/ermcp/finance-report/interface.ts

@@ -0,0 +1,102 @@
+ /**
+  * 财务报表查询请求
+  */
+ export interface QueryFinanceDayReportReq{
+    userid:number;  
+    tradedate:string;   
+}
+/**
+ * 财务日报表查询回应
+ */
+export interface QueryFinanceDayReportRsp{
+    areauserid:number;
+    collectinvoiceamount:number;
+    collectinvoicecount:number;
+    collectmoneyamount:number;
+    collectmoneycount:number;
+    payinvoiceamount:number;
+    payinvoicecount:number;
+    paymoneyamount:number;
+    paymoneycount:number;
+    reckondate:string;
+    updatetime:string;
+}
+/**
+ * 财务发票日报表查询回应
+ */
+export interface QueryFinanceInvoiceDayReportRsp{
+    applyid:number;
+    applyname:string;
+    biztype:number;
+    brandname:string;
+    contracttype:number;
+    enumdicname:string;
+    logdatetime:string;
+    logid:string;
+    logtypename:string;
+    logvalue:string;
+    modelname:string;
+    operatelogtype:number;
+    optypename:string;
+    relatedid:string;
+    relatedno:string;
+    tradedate:string;
+    userid:number;
+    wrstandardcode:string;
+    wrstandardid:number;
+    wrstandardname:string;
+}
+/**
+ * 财务付款日报表查询回应
+ */
+export interface QueryFinancePayDayReportRsp{
+    applyid:number;
+    applyname:string;
+    biztype:number;
+    brandname:string;
+    contracttype:number;
+    enumdicname:string;
+    logdatetime:string;
+    logid:string;
+    logtypename:string;
+    logvalue:string;
+    modelname:string;
+    operatelogtype:number;
+    optypename:string;
+    relatedid:string;
+    relatedno:string;
+    tradedate:string;
+    userid:number;
+    wrstandardcode:string;
+    wrstandardid:number;
+    wrstandardname:string;
+}
+
+
+/**
+  * 财务月报表查询请求
+  */
+ export interface QueryFinanceMonthReportReq{
+    userid:number;  
+    cycletime:string;   
+}
+
+/**
+ * 财务月报表查询回应
+ */
+ export interface QueryFinanceMonthReportRsp{
+    areauserid:number;
+    collectinvoiceamount:number;
+    collectinvoicecount:number;
+    collectmoneyamount:number;
+    collectmoneycount:number;
+    cycletime:string;
+    cycletype:number;
+    dayfr:QueryFinanceDayReportRsp[];
+    payinvoiceamount:number;
+    payinvoicecount:number;
+    paymoneyamount:number;
+    paymoneycount:number;
+    updatetime:string;
+}
+

src/goServiceAPI/ermcp/inventory-report/index.ts

@@ -1 +1,33 @@
-/** ================================= 库存报表 ================================**/
+/** ================================= 库存报表 ================================**/
+import APP from '@/services';
+import * as type from './interface';
+import {commonSearch_go} from '@/goServiceAPI/index';
+import {QueryAreaStockReportReq} from "./interface";
+import {QueryAreaStockReportDetailReq} from "./interface";
+/**
+ * 查询库存报表
+ * @param queryInfo 查询信息 
+ * @returns 库存报表
+ */
+export async function QueryAreaStockReport(queryInfo:QueryAreaStockReportReq):Promise<type.QueryAreaStockReportRsp[]>
+{
+    try {
+        return commonSearch_go('/Ermcp3/QueryAreaStockReport', { queryInfo });
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}
+
+/**
+ * 查询库存明细报表
+ * @param queryInfo 查询信息 
+ * @returns 库存明细报表
+ */
+export async function QueryAreaStockReportDetail(queryInfo:QueryAreaStockReportDetailReq):Promise<type.QueryAreaStockReportDetailRsp[]>
+{
+    try {
+        return commonSearch_go('/Ermcp3/QueryAreaStockReportDetail', { queryInfo });
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}

src/goServiceAPI/ermcp/inventory-report/interface.ts

@@ -0,0 +1,107 @@
+
+/**
+ * 查询库存报表请求
+ */
+export interface QueryAreaStockReportReq{
+    userid:number;
+    querytype:number;
+    querydate:string;
+    deliverygoodsid?:number;
+    wrstandardid?:number;
+    spotgoodsbrandid?:number;
+    warehouseinfoid?:number;
+
+}
+
+/**
+ * 查询库存报表回应
+ */
+export interface QueryAreaStockReportRsp{
+brandname:string;
+curstock:number;
+deliverygoodscode:string;
+deliverygoodsid:number;
+deliverygoodsname:string;
+enumdicname:string;
+goodsunitid:number;
+oristock:number;
+spotgoodsbrandid:number;
+todaybuyinqty:number;
+todayproduceinqty:number;
+todayproduceoutqty:number;
+todayselloutqty:number;
+unitid:number;
+updatetime:string;
+userid:number;
+username:string;
+warehousecode:string;
+warehouseinfoid:string;
+warehousename:string;
+warehousetype:number;
+wrstandardcode:string;
+wrstandardid:number;
+wrstandardname:string;
+}
+
+/**
+ * 查询库存报表明细请求
+ */
+export interface QueryAreaStockReportDetailReq{
+    userid:number;
+    querytype:number;
+    detailtype:number;
+    querydate:string;
+    deliverygoodsid?:number;
+    wrstandard?:number;
+    spotgoodsbrandid?:number;
+    warehouseinfoid?:number;
+}
+
+/**
+ * 查询库存报表明细回应
+ */
+export interface QueryAreaStockReportDetailRsp{
+    applyid:number;
+    applyname:string;
+    applyremark:string;
+    applysrc:number;
+    applystatus:number;
+    applytime:string;
+    auditid:number;
+    auditname:string;
+    auditremark:string;
+    auditsrc:number;
+    audittime:string;
+    audittradedate:string;  
+    brandname:string;
+    buynickname:string;
+    buyuserid:number;
+    buyusername:string;
+    contractno:string;
+    contractqty:number;
+    contracttype:number;
+    deliverygoodscode:string;
+    deliverygoodsid:number;
+    deliverygoodsname:string;
+    enumdicname:string;
+    inoutapplyid:string;
+    inouttype:number;
+    pricetype:number;
+    qty:number;
+    sellnickname:string;
+    selluserid:number;
+    sellusername:string;
+    spotcontractid:string;
+    spotgoodsbrandid:number;
+    unitid:number;
+    //updatetime:string;
+    userid:number;
+    //username:string;
+    warehousecode:string;
+    warehouseinfoid:string;
+    warehousename:string;
+    warehousetype:number;
+    wrstandardcode:string;
+    wrstandardid:number;
+    wrstandardname:string;
+  }

src/goServiceAPI/ermcp/purchase/index.ts

@@ -1 +1,20 @@
-/** ================================= 采购 ================================**/
+import {commonSearch_go} from "@/goServiceAPI";
+import {Ermcp3SellBuyContract, SellBuyContractReq} from "@/goServiceAPI/ermcp/purchase/interface";
+
+/** ================================= 采购 ================================**/
+/**
+ * 查询采购信息(这个接口和销售是同一个接口) /Ermcp3/QuerySpotContractBS
+ * @param req.areauserid 所属机构ID (必填)
+ * @param req.contracttype 合同类型 1-采购, -1-销售 (必填)
+ * @param req.querytype 查询类型 1-全部 2-待点价 3-履约结算 4-已完成 (必填)
+ * @param req.userid 用户id
+ * @param req.usertype 用户类型 2-机构 7-企业成员
+ * @param req.contractid 合同ID(SpotContractId)
+ * @constructor
+ */
+export function QueryPurchase( req : SellBuyContractReq) : Promise<Ermcp3SellBuyContract[]>{
+    return commonSearch_go('/Ermcp3/QuerySpotContractBS', {req})
+        .catch(err => {
+            throw new Error(`查询采购信息: ${err.message}`);
+        })
+}

src/goServiceAPI/ermcp/purchase/interface.ts

@@ -0,0 +1,71 @@
+/**
+ * 查询合同请求
+ */
+export interface SellBuyContractReq{
+    areauserid: number  //  所属机构ID
+    contracttype: number // 合同类型 1-采购, -1-销售
+    querytype: number // 查询类型 1-全部 2-待点价 3-履约结算 4-已完成
+    userid?: number // 用户ID
+    usertype?: number // 用户类型 2-机构 7-企业成员
+    contractid?: string // 合同ID(SpotContractId)
+}
+
+/**
+ * 查询合同返回
+ */
+export interface Ermcp3SellBuyContract{
+    accountname	:string;//账户名称
+    attachment	:string;//附件
+    audittime	:string;//审核时间
+    brandname	:string;//品牌名称
+    contracctstatus	:number;//合同状态- number;
+//:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+    contractmargin	:number;//合同保证金
+    contractno	:string;//合同编号
+    contracttype	:number;//合同类型 1-采购, -1-销售
+    convertfactor	:number;//标仓系数(品类)
+    createtime	:string;//创建时间
+    daikaiamount	:number;//应收(开)票额
+    deliveryenddate	:string;//交割结束日
+    deliverygoodscode	:string;//现货品种代码
+    deliverygoodsid	:number;//现货商品ID
+    deliverygoodsname	:string;//现货品种名称
+    deliverystartdate	:string;//交割开始日
+    enddate	:string;//点价结束日
+    enumdicname	:string;//单位名称
+    goodscode	:string;//点价商品代码
+    goodsid	:number;//点价商品ID
+    goodsname	:string;//点价商品名称
+    invoiceamount	:number;//已开票额
+    loanamount	:number;//贷款总额=已定价额+调整金额
+    margin	:number;//保证金
+    nickname	:string;//账户昵称
+    payamount	:number;//已收付额(收款或付款)
+    preinvoiceamount	:number;//预收(开)票额
+    prepayamount	:number;//预收付额
+    price	:number;//价格
+    pricedamount	:number;//已定价额
+    pricedavg	:number;//已点均价
+    pricedqty	:number;//已定价量
+    pricemove	:number;//升贴水
+    pricetype	:number;//定价类型 - 1:一口价 2:点价 3:暂定价
+    producttype	:number;//产品类型 - 1:标准仓单 2:等标 3:非标
+    qty	:number;//合同量
+    reckonadjustamount	:number;//调整金额
+    reckonedamount	:number;//实际已收付额(已确定额,已收付总额-已退款总额)
+    reckonotheramount	:number;//其它费用
+    reckonrealqty	:number;//已确定量
+    remark	:string;//备注
+    spotcontractid	:string;//合同ID
+    spotgoodsbrandid	:number;//现货品牌ID(DGFactoryItem表的ID)
+    spotgoodsdesc	:string;//商品型号(商品规格)
+    startdate	:string;//点价开始日
+    totalamount	:number;//合计总额
+    unpayamount	:number;//应收付款额(应支付或应收款)
+    unpricedqty	:number;//未定价量
+    unsureqty	:number;//未确定量
+    userid	:number;//机构ID
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:number;//品类ID
+    wrstandardname	:string;//品类名称
+}

src/goServiceAPI/ermcp/sell/index.ts

@@ -1 +1,20 @@
-/** ================================= 销售 ================================**/
+/** ================================= 销售 ================================**/
+import {Ermcp3SellBuyContract, SellBuyContractReq} from "@/goServiceAPI/ermcp/purchase/interface";
+import {commonSearch_go} from "@/goServiceAPI";
+
+/**
+ * 查询销售信息(这个接口和采购是同一个接口) /Ermcp3/QuerySpotContractBS
+ * @param req.areauserid 所属机构ID (必填)
+ * @param req.contracttype 合同类型 1-采购, -1-销售 (必填)
+ * @param req.querytype 查询类型 1-全部 2-待点价 3-履约结算 4-已完成 (必填)
+ * @param req.userid 用户id
+ * @param req.usertype 用户类型 2-机构 7-企业成员
+ * @param req.contractid 合同ID(SpotContractId)
+ * @constructor
+ */
+export function QueryWareHouse(req : SellBuyContractReq) : Promise<Ermcp3SellBuyContract[]>{
+    return commonSearch_go('/Ermcp3/QuerySpotContractBS', {req})
+        .catch(err => {
+            throw new Error(`查询销售信息: ${err.message}`);
+        })
+}

src/goServiceAPI/ermcp/spot-report/index.ts

@@ -1 +1,64 @@
-/** ================================= 现货报表 ================================**/
+/** ================================= 现货报表 ================================**/
+import APP from '@/services';
+import * as type from './interface';
+import {commonSearch_go} from '@/goServiceAPI/index';
+import {QuerySpotDayReportReq} from "./interface";
+import {QuerySpotDayReportDetailReq} from "./interface";
+import {QuerySpotMonthReportReq} from "./interface";
+import {QuerySpotMonthReportDetailReq} from "./interface";
+/**
+ * 查询现货报表
+ * @param queryInfo 查询信息 
+ * @returns 现货报表
+ */
+ export async function QuerySpotDayReport(queryInfo:QuerySpotDayReportReq):Promise<type.QuerySpotDayReportRsp[]>
+ {
+     try {
+         return commonSearch_go('/Ermcp/QryReportDaySpot', { queryInfo });
+     } catch (err) {
+         throw new Error(err.message);
+     }
+ }
+ 
+ /**
+  * 查询现货明细报表
+  * @param queryInfo 查询信息 
+  * @returns 现货明细报表
+  */
+ export async function QuerySpotDayReportDetail(queryInfo:QuerySpotDayReportDetailReq):Promise<type.QuerySpotDayReportDetailRsp[]>
+ {
+     try {
+         return commonSearch_go('/Ermcp/QryReportDaySpotDetail', { queryInfo });
+     } catch (err) {
+         throw new Error(err.message);
+     }
+ }
+
+
+ /**
+ * 查询现货月报表
+ * @param queryInfo 查询信息
+ * @returns 现货月报表数据
+ */
+  export async function QuerySpotMonthReport(queryInfo:QuerySpotMonthReportReq):Promise<type.QuerySpotMonthReportRsp[]>
+  {
+      try {
+          return commonSearch_go('/Ermcp/QryReportMonthSpot', { queryInfo });
+      } catch (err) {
+          throw new Error(err.message);
+      }
+  }
+
+   /**
+  * 查询现货月报表明细
+  * @param queryInfo 查询信息 
+  * @returns 现货月报表明细
+  */
+ export async function QuerySpotMonthReportDetail(queryInfo:QuerySpotMonthReportDetailReq):Promise<type.QuerySpotMonthReportDetailRsp[]>
+ {
+     try {
+         return commonSearch_go('/Ermcp/QryReportMonthSpotDetail', { queryInfo });
+     } catch (err) {
+         throw new Error(err.message);
+     }
+ }

src/goServiceAPI/ermcp/spot-report/interface.ts

@@ -0,0 +1,116 @@
+
+/**
+ * 查询现货报表请求
+ */
+ export interface QuerySpotDayReportReq{
+    userid:number;    
+    tradedate:string;    
+}
+
+/**
+ * 查询现货报表回应
+ */
+export interface QuerySpotDayReportRsp{
+areauserid:number;
+buyinqty:number;
+enumdicname:string;
+reckondate:string;
+selloutqty:number;
+todaybuyreckonqty:number;
+todaysellreckonqty:number;
+totalbuypricedqty:number;
+totalsellpricedqty:number;
+wrstandardcode:string;
+wrstandardid:number;
+wrstandardname:string;
+}
+
+/**
+ * 查询现货报表明细请求
+ */
+ export interface QuerySpotDayReportDetailReq{
+    userid:number;    
+    wrstandardid:number;
+    tradedate:string;    
+}
+
+/**
+ * 查询现货报表明细回应
+ */
+export interface QuerySpotDayReportDetailRsp{
+        applyid:number;
+        applyname:string;
+        biztype:number;
+        brandname:string;
+        contracttype:number;
+        enumdicname:string;
+        logdatetime:string;
+        logid:number;
+        logtypename:string;
+        logvalue:string;
+        modelname:string;
+        operatelogtype:number;
+        optypename:string;
+        relatedid:number;
+        relatedno:string;
+        tradedate:string;
+        userid:number;
+        wrstandardcode:string;
+        wrstandardid:number;
+        wrstandardname:string;
+}
+
+/**
+ * 查询现货月报表请求
+ */
+export interface QuerySpotMonthReportReq{
+    userid:number;    
+    cycletime:string;    
+}
+
+/**
+ * 查询现货月报表回应
+ */
+ export interface QuerySpotMonthReportRsp{
+    areauserid:number;
+    buyinqty:number;
+    cycletime:string;
+    cycletype:number;
+    enumdicname:string;    
+    selloutqty:number;
+    todaybuyreckonqty:number;
+    todaysellreckonqty:number;
+    totalbuypricedqty:number;
+    totalsellpricedqty:number;
+    wrstandardcode:string;
+    wrstandardid:number;
+    wrstandardname:string;
+    }
+
+
+    /**
+ * 查询现货月报表明细请求
+ */
+ export interface QuerySpotMonthReportDetailReq{
+    userid:number;    
+    wrstandardid:number;
+    cycletime:string;    
+}
+
+/**
+ * 查询现货月报表明细回应
+ */
+export interface QuerySpotMonthReportDetailRsp{
+    areauserid:number;
+    buyinqty:number;   
+    enumdicname:string;    
+    reckondate:string;
+    selloutqty:number;
+    todaybuyreckonqty:number;
+    todaysellreckonqty:number;
+    totalbuypricedqty:number;
+    totalsellpricedqty:number;
+    wrstandardcode:string;
+    wrstandardid:number;
+    wrstandardname:string;
+}

src/goServiceAPI/ermcp/warehouse-info/index.ts

@@ -1 +1,16 @@
-/** ================================= 仓库信息 ================================**/
+/** ================================= 仓库信息 ================================**/
+import {commonSearch_go} from "@/goServiceAPI";
+import {ErmcpWareHouseInfo, WareHouseInfoReq} from "@/goServiceAPI/ermcp/warehouse-info/interface";
+
+/**
+ * 查询仓库信息 /Ermcp/QueryWarehouseInfo
+ * @param req.userid 用户id(必填)
+ * @param req.status 仓库状态(可多项,逗号隔开) 1:正常 2:注销 3:待审核 4:审核拒绝
+ * @constructor
+ */
+export function QueryWareHouse( req : WareHouseInfoReq) : Promise<ErmcpWareHouseInfo[]>{
+    return commonSearch_go('/Ermcp/QueryWarehouseInfo', {req})
+        .catch(err => {
+            throw new Error(`查询仓库信息: ${err.message}`);
+        })
+}

src/goServiceAPI/ermcp/warehouse-info/interface.ts

@@ -0,0 +1,30 @@
+/**
+ * 查询仓单信息请求
+ */
+export interface WareHouseInfoReq{
+    userid: number // 用户ID
+    status?: string // 仓库状态(可多项,逗号隔开) 1:正常 2:注销 3:待审核 4:审核拒绝
+}
+/**
+ * 仓库信息
+ */
+export interface ErmcpWareHouseInfo{
+    address	:string;//详细地址
+    areauserid	:number;//所属机构
+    autoid	:number;//自增ID(仓库ID)
+    cityid	:number;//市
+    contactname	:string;//联系人
+    contactnum	:string;//联系电话
+    countryid	:number;//国家
+    createtime	:string;//创建时间
+    districtid	:number;//区
+    hasvideo	:number;//是否有视频 - number;
+//:无 1:有
+    provinceid	:number;//省
+    remark	:string;//审核备注
+    videourl	:string;//视频地址
+    warehousecode	:string;//仓库代码
+    warehousename	:string;//仓库名称
+    warehousestatus	:number;//仓库状态 - 1:正常 2:注销 3:待审核 4:审核拒绝
+    warehousetype	:number;//仓库类型 - 1 厂库 2 自有库 3 合作库
+}