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

src/services/go/ermcp/finance-review/index.ts

@@ -1 +1,31 @@
-/** ================================= 财务审核 ================================**/
+/** ================================= 财务审核 ================================**/
+import {
+    QryBussinessFpRsp,
+    QryBussinessKxRsp,
+    QueryBusinessFpReq,
+    QueryBusinessKxReq
+} from "@/services/go/ermcp/finance-review/interface";
+import {commonSearch_go} from "@/services/go";
+import {QryBusinessDjRsp} from "@/services/go/ermcp/business-review/interface";
+
+/**
+ * 查询财务管理(款项)(对应菜单:财务管理/款项) /Ermcp/QueryBusinessKx
+ * @param req.UserId  // 用户ID (必填)
+ * @constructor
+ */
+export function QueryBusinessKx(req: QueryBusinessKxReq): Promise<QryBussinessKxRsp[]> {
+    return commonSearch_go('/Ermcp/QueryBusinessKx', req).catch((err) => {
+        throw new Error(`财务管理-款项: ${err.message}`);
+    });
+}
+
+/**
+ * 查询财务管理(发票)(对应菜单:财务管理/发票) /Ermcp/QueryBusinessFp
+ * @param req.UserId  // 用户ID (必填)
+ * @constructor
+ */
+export function QueryBusinessFp(req: QueryBusinessFpReq): Promise<QryBussinessFpRsp[]> {
+    return commonSearch_go('/Ermcp/QueryBusinessFp', req).catch((err) => {
+        throw new Error(`财务管理-发票: ${err.message}`);
+    });
+}

src/services/go/ermcp/finance-review/interface.ts

@@ -0,0 +1,96 @@
+/**
+ *  查询财务管理 - 款项 请求
+ */
+export interface QueryBusinessKxReq{
+    UserId: number  // 用户ID
+    relatedid?: string // 现货合同ID, 不填则查所有
+    applystatus?: string  // 申请状态(逗号隔开) 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
+}
+
+/**
+ *  查询财务管理 - 款项 返回
+ */
+export interface QryBussinessKxRsp{
+    applyid	:string;//申请人
+    applyname	:string;//申请人名称
+    applystatus	:number;//申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
+    applytime	:string;//申请时间
+    attachurl	:string;//附件
+    auditid	:string;//审核人ID
+    auditname	:string;//审核人名称
+    audittime	:string;//审核时间
+    buyusername	:string;//采购方名称
+    contractno	:string;//合同编号
+    contractstatus	:number;//合同状态- number;
+//:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+    contracttype	:number;//现货合同类型 - 1:采购 -1:销售
+    deductamount	:number;//退款(非必填)
+    deliverygoodscode	:string;//现货品种代码
+    deliverygoodsid	:number;//现货商品ID
+    deliverygoodsname	:string;//现货品种名称
+    enumdicname	:string;//单位名称
+    goodscode	:string;//点价合约
+    goodsname	:string;//商品名称
+    kxtype	:number;//款项类型 1-收付款(PayAmount字段有值) 2-退款(DeductAmount字段有值) 3-收付款/退款(2个字段都有)
+    operateapplyid	:string;//操作申请ID(6number;
+//3+Unix秒时间戳(1number;
+//位)+xxxxxx)
+    operateapplytype	:number;//操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
+    payamount	:number;//收付款(非必填)
+    pricemove	:number;//升贴水
+    pricetype	:number;//定价类型 - 1:一口价 2:点价 3:暂定价
+    relatedid	:string;//现货合同ID
+    sellusername	:string;//销售方名字
+    userid	:number;//用户ID
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:number;//品类id
+    wrstandardname	:string;//品类名称
+}
+
+/**
+ * 财务管理/发票 请求
+ */
+export interface QueryBusinessFpReq{
+    UserId: number  // 用户ID
+    relatedid?: string // 现货合同ID, 不填则查所有
+    applystatus?: string  // 申请状态(逗号隔开) 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
+}
+
+/**
+ * 财务管理/发票 返回
+ */
+export interface QryBussinessFpRsp{
+    applyid	:string;//申请人
+    applyname	:string;//申请人名称
+    applystatus	:number;//申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
+    applytime	:string;//申请时间
+    attachurl	:string;//附件
+    auditid	:string;//审核人ID
+    auditname	:string;//审核人名称
+    audittime	:string;//审核时间
+    buyusername	:string;//采购方名称
+    contractno	:string;//合同编号
+    contractstatus	:number;//合同状态- number;
+//:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+    contracttype	:number;//现货合同类型 - 1:采购 -1:销售
+    deliverygoodscode	:string;//现货品种代码
+    deliverygoodsid	:number;//现货商品ID
+    deliverygoodsname	:string;//现货品种名称
+    enumdicname	:string;//单位名称
+    goodscode	:string;//点价合约
+    goodsname	:string;//商品名称
+    invoiceAmount	:number;//已开收票金额(销售为开票,采购为收票)
+    operateapplyid	:string;//操作申请ID(6number;
+//3+Unix秒时间戳(1number;
+//位)+xxxxxx)
+    operateapplytype	:number;//操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
+    pricemove	:number;//升贴水
+    pricetype	:number;//定价类型 - 1:一口价 2:点价 3:暂定价
+    relatedid	:string;//现货合同ID
+    sellusername	:string;//销售方名字
+    userid	:number;//用户ID
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:number;//品类id
+    wrstandardname	:string;//品类名称
+}
+

src/services/go/ermcp/search-inventory/index.ts

@@ -1 +1,14 @@
-/** ================================= 库存查询 ================================**/
+import {commonSearch_go} from "@/services/go";
+import {Ermcp3AreaStock} from "@/services/go/ermcp/search-inventory/interface";
+
+/** ================================= 库存查询 ================================**/
+/**
+ * 查询机构库存(库存管理/当前库存) /Ermcp3/QueryAreaStock
+ * @param userid
+ * @constructor
+ */
+export function QueryAreaStock(userid: number): Promise<Ermcp3AreaStock[]>{
+    return commonSearch_go('/Ermcp3/QuerySpotContractBS', {userid}).catch((err) => {
+        throw new Error(`查询机构库存(库存管理/当前库存): ${err.message}`);
+    });
+}

src/services/go/ermcp/search-inventory/interface.ts

@@ -0,0 +1,29 @@
+
+
+// 查询机构库存(库存管理/当前库存)
+export interface Ermcp3AreaStock{
+    brandname	:string;//品牌名称
+    curstock	:number;//期末库存量(今日量)
+    deliverygoodscode	:string;//现货品种代码
+    deliverygoodsid	:number;//现货品种id
+    deliverygoodsname	:string;//现货品种名称
+    enumdicname	:string;//单位名称
+    goodsunitid	:number;//现货商品单位id
+    oristock	:number;//期初库存量(昨日量)
+    spotgoodsbrandid	:number;//现货品牌ID
+    todaybuyinqty	:number;//今日采购入库量
+    todayproduceinqty	:number;//今日生产入库量
+    todayproduceoutqty	:number;//今日生产出库量
+    todayselloutqty	:number;//今日销售出库量
+    unitid	:number;//单位id
+    updatetime	:string;//更新时间
+    userid	:number;//机构ID
+    username	:string;//机构名称
+    warehousecode	:string;//仓库代码
+    warehouseinfoid	:string;//仓库ID
+    warehousename	:string;//仓库名称
+    warehousetype	:number;//仓库类型 - 1 厂库 2 自有库 3 合作库
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:string;//品类ID
+    wrstandardname	:string;//品类名称
+}

src/services/proto/contract/index.ts

@@ -1,15 +1,11 @@
-import {DeliveryGoodsApplyReq} from "@/protoService/delivery/interface";
 import {buildProtoReq50, parseProtoRsp50} from "@/services/socket/protobuf/buildReq";
 import APP from "@/services";
 import {Callback} from "@/utils/websocket";
-import {ErmcpContractOperateApplyReq} from "@/protoService/contract/interface";
+import {ErmcpContractOperateApplyReq} from "@/services/proto/contract/interface";
 
 /**
  * 合同
- * @param info ContractOperateApplyInfo 操作信息
- * @param operateType Int 操作类型-1:登记2:确认3：拒绝4：撤销
- * @param remark String 备注
- * @param operateApplyID Long 暂时传0 操作申请ID(603+Unix秒时间戳(10位)+xxxxxx)//不知道是啥玩意
+ * @param param
  */
 export const operationContractReq = (param: ErmcpContractOperateApplyReq): Promise<any> => {
     return new Promise((resolve, reject) => {

src/services/proto/delivery/index.ts

@@ -1,7 +1,7 @@
-import {DeliveryGoodsApplyReq} from "@/protoService/delivery/interface";
 import {buildProtoReq50, parseProtoRsp50} from "@/services/socket/protobuf/buildReq";
 import APP from "@/services";
 import {Callback} from "@/utils/websocket";
+import {DeliveryGoodsApplyReq} from "@/services/proto/delivery/interface";
 
 /**
  * 现货品种申请请求

src/services/proto/spotcontract/index.ts

@@ -1,15 +1,12 @@
 import {buildProtoReq50, parseProtoRsp50} from "@/services/socket/protobuf/buildReq";
 import APP from "@/services";
 import {Callback} from "@/utils/websocket";
-import {GldErmcpSpotContractOperateReq} from "@/protoService/spotcontract/interface";
+import {GldErmcpSpotContractOperateReq} from "@/services/proto/spotcontract/interface";
 
 /**（重点提醒 这里属于管理端接口，仅用于新增）以上来自android代码  回头需要确认
  * 获取新增采购合同报文
- * @param contractInfo SpotContractInfo 新增合同信息
- * @param OperateType String 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回6:正常完结7:异常终止
- * @param Remark String 备注
- * @param SpotContractID String 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
  * @param
+ * @param param
  */
 export const orderContract = (param: GldErmcpSpotContractOperateReq): Promise<any> => {
     return new Promise((resolve, reject) => {

src/services/proto/warehouse/index.ts

@@ -1,7 +1,7 @@
 import {buildProtoReq50, parseProtoRsp50} from "@/services/socket/protobuf/buildReq";
 import APP from "@/services";
 import {Callback} from "@/utils/websocket";
-import {WarehouseApplyReq, WarehouseStateChangeReq} from "@/protoService/warehouse/interface";
+import {WarehouseApplyReq, WarehouseStateChangeReq} from "@/services/proto/warehouse/interface";
 
 /**
  * 新增 / 修改 仓库信息请求  修改需要传仓库id

src/views/information/warehouse-info/compoments/add/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 新增仓库信息 -->
-  <a-modal class="add-warehouse"
+  <a-modal class="add-warehouse commonModal"
            title="新增仓库信息"
            v-model:visible="visible"
            @cancel="cancel"