art: 提交审核结果和修复接口调用
Some checks failed
Release / lint (push) Successful in 30s
Release / Release (push) Failing after 34s

This commit is contained in:
my_ong 2024-12-10 21:10:12 +08:00
parent 85d999056f
commit 7759438980
9 changed files with 6035 additions and 6102 deletions

View File

@ -242,10 +242,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'MALE'", "'FEMALE'"],
"'MALE'",
"'FEMALE'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "sex", "name": "sex",
@ -433,10 +430,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'ACCOUNT'", "'WECHAT'"],
"'ACCOUNT'",
"'WECHAT'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "type", "name": "type",
@ -1632,10 +1626,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'MALE'", "'FEMALE'"],
"'MALE'",
"'FEMALE'"
],
"typeProperties": [] "typeProperties": []
} }
}, },
@ -2015,11 +2006,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'MENU'", "'BUTTON'", "'OTHER'"],
"'MENU'",
"'BUTTON'",
"'OTHER'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "type", "name": "type",
@ -2176,11 +2163,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'MENU'", "'BUTTON'", "'OTHER'"],
"'MENU'",
"'BUTTON'",
"'OTHER'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "type", "name": "type",
@ -2672,10 +2655,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'MALE'", "'FEMALE'"],
"'MALE'",
"'FEMALE'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "sex", "name": "sex",
@ -3611,10 +3591,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'ALL'", "'PARTIAL'"],
"'ALL'",
"'PARTIAL'"
],
"typeProperties": [] "typeProperties": []
} }
}, },
@ -3661,13 +3638,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'WAIT_SCAN'", "'WAIT_SUBMIT'", "'WAIT_REVIEW'", "'PASS'", "'REJECT'"],
"'WAIT_SCAN'",
"'WAIT_SUBMIT'",
"'WAIT_REVIEW'",
"'PASS'",
"'REJECT'"
],
"typeProperties": [] "typeProperties": []
} }
], ],
@ -3855,6 +3826,37 @@
} }
} }
] ]
},
{
"description": "提交审核",
"name": "submitReview",
"method": "post",
"path": "/submit-review",
"response": {
"typeArgs": [],
"typeName": "",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"parameters": [
{
"required": true,
"in": "body",
"name": "requestBody",
"dataType": {
"typeArgs": [],
"typeName": "ReviewDTO",
"isDefsType": true,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
}
}
]
} }
] ]
}, },
@ -4118,12 +4120,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'PURCHASE_RECEIPT'", "'RETURN_RECEIPT'", "'LOAN_OUT'", "'AUDIT'"],
"'PURCHASE_RECEIPT'",
"'RETURN_RECEIPT'",
"'LOAN_OUT'",
"'AUDIT'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "applyType", "name": "applyType",
@ -4242,10 +4239,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'LOW_VALUE'", "'HIGH_VALUE'"],
"'LOW_VALUE'",
"'HIGH_VALUE'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "assignRule", "name": "assignRule",
@ -4388,16 +4382,27 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'ALL'", "'PARTIAL'"],
"'ALL'",
"'PARTIAL'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "auditType", "name": "auditType",
"description": "盘点类型1: 全盘 2: 部分盘点)", "description": "盘点类型1: 全盘 2: 部分盘点)",
"required": false "required": false
}, },
{
"dataType": {
"typeArgs": [],
"typeName": "boolean",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "confirm",
"description": "是否确认0: 未确认 1: 已确认)",
"required": false
},
{ {
"dataType": { "dataType": {
"typeArgs": [], "typeArgs": [],
@ -4411,34 +4416,6 @@
"name": "createdTime", "name": "createdTime",
"required": false "required": false
}, },
{
"dataType": {
"typeArgs": [],
"typeName": "string",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "exception",
"description": "异常原因",
"required": false
},
{
"dataType": {
"typeArgs": [],
"typeName": "string",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "handle",
"description": "处理摘要",
"required": false
},
{ {
"dataType": { "dataType": {
"typeArgs": [], "typeArgs": [],
@ -4452,20 +4429,6 @@
"name": "id", "name": "id",
"required": false "required": false
}, },
{
"dataType": {
"typeArgs": [],
"typeName": "boolean",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "isConfirm",
"description": "是否确认0: 未确认 1: 已确认)",
"required": false
},
{ {
"dataType": { "dataType": {
"typeArgs": [], "typeArgs": [],
@ -4476,8 +4439,8 @@
"enum": [], "enum": [],
"typeProperties": [] "typeProperties": []
}, },
"name": "result", "name": "reviewRemark",
"description": "结果(系统自动生成)", "description": "审核意见",
"required": false "required": false
}, },
{ {
@ -4487,13 +4450,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'WAIT_SCAN'", "'WAIT_SUBMIT'", "'WAIT_REVIEW'", "'PASS'", "'REJECT'"],
"'WAIT_SCAN'",
"'WAIT_SUBMIT'",
"'WAIT_REVIEW'",
"'PASS'",
"'REJECT'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "reviewResult", "name": "reviewResult",
@ -4535,12 +4492,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'PURCHASE_RECEIPT'", "'RETURN_RECEIPT'", "'LOAN_OUT'", "'AUDIT'"],
"'PURCHASE_RECEIPT'",
"'RETURN_RECEIPT'",
"'LOAN_OUT'",
"'AUDIT'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "type", "name": "type",
@ -4670,16 +4622,27 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'ALL'", "'PARTIAL'"],
"'ALL'",
"'PARTIAL'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "auditType", "name": "auditType",
"description": "盘点类型1: 全盘 2: 部分盘点)", "description": "盘点类型1: 全盘 2: 部分盘点)",
"required": false "required": false
}, },
{
"dataType": {
"typeArgs": [],
"typeName": "boolean",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "confirm",
"description": "是否确认0: 未确认 1: 已确认)",
"required": false
},
{ {
"dataType": { "dataType": {
"typeArgs": [], "typeArgs": [],
@ -4693,34 +4656,6 @@
"name": "createdTime", "name": "createdTime",
"required": false "required": false
}, },
{
"dataType": {
"typeArgs": [],
"typeName": "string",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "exception",
"description": "异常原因",
"required": false
},
{
"dataType": {
"typeArgs": [],
"typeName": "string",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "handle",
"description": "处理摘要",
"required": false
},
{ {
"dataType": { "dataType": {
"typeArgs": [], "typeArgs": [],
@ -4758,20 +4693,6 @@
"description": "物料ids", "description": "物料ids",
"required": false "required": false
}, },
{
"dataType": {
"typeArgs": [],
"typeName": "boolean",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "isConfirm",
"description": "是否确认0: 未确认 1: 已确认)",
"required": false
},
{ {
"dataType": { "dataType": {
"typeArgs": [], "typeArgs": [],
@ -4782,8 +4703,8 @@
"enum": [], "enum": [],
"typeProperties": [] "typeProperties": []
}, },
"name": "result", "name": "reviewRemark",
"description": "结果(系统自动生成)", "description": "审核意见",
"required": false "required": false
}, },
{ {
@ -4793,13 +4714,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'WAIT_SCAN'", "'WAIT_SUBMIT'", "'WAIT_REVIEW'", "'PASS'", "'REJECT'"],
"'WAIT_SCAN'",
"'WAIT_SUBMIT'",
"'WAIT_REVIEW'",
"'PASS'",
"'REJECT'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "reviewResult", "name": "reviewResult",
@ -4841,12 +4756,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'PURCHASE_RECEIPT'", "'RETURN_RECEIPT'", "'LOAN_OUT'", "'AUDIT'"],
"'PURCHASE_RECEIPT'",
"'RETURN_RECEIPT'",
"'LOAN_OUT'",
"'AUDIT'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "type", "name": "type",
@ -5212,10 +5122,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'LOW_VALUE'", "'HIGH_VALUE'"],
"'LOW_VALUE'",
"'HIGH_VALUE'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "assignRule", "name": "assignRule",
@ -5427,12 +5334,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'IN'", "'OUT'", "'OFF'", "'LOST'"],
"'IN'",
"'OUT'",
"'OFF'",
"'LOST'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "status", "name": "status",
@ -5454,6 +5356,55 @@
} }
] ]
}, },
{
"description": "异常数据列表",
"name": "ReviewDTO",
"templateArgs": [],
"properties": [
{
"dataType": {
"typeArgs": [],
"typeName": "string",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "applyId",
"description": "申请单",
"required": false
},
{
"dataType": {
"typeArgs": [],
"typeName": "string",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": [],
"typeProperties": []
},
"name": "remark",
"description": "审核意见",
"required": false
},
{
"dataType": {
"typeArgs": [],
"typeName": "",
"isDefsType": false,
"templateIndex": -1,
"compileTemplateKeyword": "#/definitions/",
"enum": ["'WAIT_SCAN'", "'WAIT_SUBMIT'", "'WAIT_REVIEW'", "'PASS'", "'REJECT'"],
"typeProperties": []
},
"name": "reviewResult",
"description": "审核结果",
"required": false
}
]
},
{ {
"description": "库存明细", "description": "库存明细",
"name": "StockDetailInfo", "name": "StockDetailInfo",
@ -5686,11 +5637,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'INBOUND'", "'OUTBOUND'", "'DISCARD'"],
"'INBOUND'",
"'OUTBOUND'",
"'DISCARD'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "exceptionHandle", "name": "exceptionHandle",
@ -5704,11 +5651,7 @@
"isDefsType": false, "isDefsType": false,
"templateIndex": -1, "templateIndex": -1,
"compileTemplateKeyword": "#/definitions/", "compileTemplateKeyword": "#/definitions/",
"enum": [ "enum": ["'SOCK_IN_BUT_SCAN_NOT_EXIST'", "'SOCK_OUT_BUT_SCAN_EXIST'", "'SOCK_NOT_EXIST_BUT_SCAN_EXIST'"],
"'SOCK_IN_BUT_SCAN_NOT_EXIST'",
"'SOCK_OUT_BUT_SCAN_EXIST'",
"'SOCK_NOT_EXIST_BUT_SCAN_EXIST'"
],
"typeProperties": [] "typeProperties": []
}, },
"name": "exceptionReason", "name": "exceptionReason",

View File

@ -4,34 +4,34 @@ declare namespace material {
*/ */
export interface ApplyDTO { export interface ApplyDTO {
/** 申请人 */ /** 申请人 */
applicant?: string; applicant?: string
/** 申请日期 */ /** 申请日期 */
applyDate?: string; applyDate?: string
/** 申请数量 */ /** 申请数量 */
applyNum?: string; applyNum?: string
/** 申请类型 */ /** 申请类型 */
applyType?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'; applyType?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'
/** 物料编码 */ /** 物料编码 */
code?: string; code?: string
/** 确认数量 */ /** 确认数量 */
confirmNum?: string; confirmNum?: string
/** 物料名称 */ /** 物料名称 */
name?: string; name?: string
/** 备注 */ /** 备注 */
remark?: string; remark?: string
/** 物料规格 */ /** 物料规格 */
spec?: string; spec?: string
/** 物料类型 */ /** 物料类型 */
type?: string; type?: string
} }
/** /**
@ -39,31 +39,31 @@ declare namespace material {
*/ */
export interface ApplyDetail { export interface ApplyDetail {
/** 申请单ID */ /** 申请单ID */
applyId?: number; applyId?: number
/** assignRule */ /** assignRule */
assignRule?: 'LOW_VALUE' | 'HIGH_VALUE'; assignRule?: 'LOW_VALUE' | 'HIGH_VALUE'
/** 确认数量 */ /** 确认数量 */
confirmQuantity?: number; confirmQuantity?: number
/** createdTime */ /** createdTime */
createdTime?: string; createdTime?: string
/** 异常情况说明 */ /** 异常情况说明 */
exceptionRemark?: string; exceptionRemark?: string
/** id */ /** id */
id?: number; id?: number
/** 物料Id */ /** 物料Id */
materialId?: number; materialId?: number
/** 申请数量 */ /** 申请数量 */
quantity?: number; quantity?: number
/** updatedTime */ /** updatedTime */
updatedTime?: string; updatedTime?: string
} }
/** /**
@ -71,51 +71,40 @@ declare namespace material {
*/ */
export interface ApplyForm { export interface ApplyForm {
/** 申请人 */ /** 申请人 */
applicant?: string; applicant?: string
/** 申请日期 */ /** 申请日期 */
applyDate?: string; applyDate?: string
/** 盘点类型1: 全盘 2: 部分盘点) */ /** 盘点类型1: 全盘 2: 部分盘点) */
auditType?: 'ALL' | 'PARTIAL'; auditType?: 'ALL' | 'PARTIAL'
/** createdTime */
createdTime?: string;
/** 异常原因 */
exception?: string;
/** 处理摘要 */
handle?: string;
/** id */
id?: number;
/** 是否确认0: 未确认 1: 已确认) */ /** 是否确认0: 未确认 1: 已确认) */
isConfirm?: boolean; confirm?: boolean
/** 结果(系统自动生成) */ /** createdTime */
result?: string; createdTime?: string
/** id */
id?: number
/** 审核意见 */
reviewRemark?: string
/** 审核结果(1-待扫码 2-待提交 3-待审核 4-审核通过 5退回) */ /** 审核结果(1-待扫码 2-待提交 3-待审核 4-审核通过 5退回) */
reviewResult?: reviewResult?: 'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'
| 'WAIT_SCAN'
| 'WAIT_SUBMIT'
| 'WAIT_REVIEW'
| 'PASS'
| 'REJECT';
/** 盘点审核人 */ /** 盘点审核人 */
reviewer?: string; reviewer?: string
/** 盘点人 */ /** 盘点人 */
taker?: string; taker?: string
/** 类型1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请) */ /** 类型1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请) */
type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'; type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'
/** updatedTime */ /** updatedTime */
updatedTime?: string; updatedTime?: string
} }
/** /**
@ -123,13 +112,13 @@ declare namespace material {
*/ */
export interface ApplyInfo { export interface ApplyInfo {
/** 申请单明细 */ /** 申请单明细 */
applyDetails?: Array<material.ApplyDetail>; applyDetails?: Array<material.ApplyDetail>
/** applyForm */ /** applyForm */
applyForm?: material.ApplyForm; applyForm?: material.ApplyForm
/** 扫码的条码集合 */ /** 扫码的条码集合 */
detailList?: Array<material.MaterialStockDetail>; detailList?: Array<material.MaterialStockDetail>
} }
/** /**
@ -137,54 +126,43 @@ declare namespace material {
*/ */
export interface AuditApplyInfo { export interface AuditApplyInfo {
/** 申请人 */ /** 申请人 */
applicant?: string; applicant?: string
/** 申请日期 */ /** 申请日期 */
applyDate?: string; applyDate?: string
/** 盘点类型1: 全盘 2: 部分盘点) */ /** 盘点类型1: 全盘 2: 部分盘点) */
auditType?: 'ALL' | 'PARTIAL'; auditType?: 'ALL' | 'PARTIAL'
/** createdTime */
createdTime?: string;
/** 异常原因 */
exception?: string;
/** 处理摘要 */
handle?: string;
/** id */
id?: number;
/** 物料ids */
ids?: Array<string>;
/** 是否确认0: 未确认 1: 已确认) */ /** 是否确认0: 未确认 1: 已确认) */
isConfirm?: boolean; confirm?: boolean
/** 结果(系统自动生成) */ /** createdTime */
result?: string; createdTime?: string
/** id */
id?: number
/** 物料ids */
ids?: Array<string>
/** 审核意见 */
reviewRemark?: string
/** 审核结果(1-待扫码 2-待提交 3-待审核 4-审核通过 5退回) */ /** 审核结果(1-待扫码 2-待提交 3-待审核 4-审核通过 5退回) */
reviewResult?: reviewResult?: 'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'
| 'WAIT_SCAN'
| 'WAIT_SUBMIT'
| 'WAIT_REVIEW'
| 'PASS'
| 'REJECT';
/** 盘点审核人 */ /** 盘点审核人 */
reviewer?: string; reviewer?: string
/** 盘点人 */ /** 盘点人 */
taker?: string; taker?: string
/** 类型1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请) */ /** 类型1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请) */
type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'; type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'
/** updatedTime */ /** updatedTime */
updatedTime?: string; updatedTime?: string
} }
/** /**
@ -192,10 +170,10 @@ declare namespace material {
*/ */
export interface ComparisonResDTO { export interface ComparisonResDTO {
/** 库存明细 */ /** 库存明细 */
details?: Array<material.StockDetailInfo>; details?: Array<material.StockDetailInfo>
/** 差异数据 */ /** 差异数据 */
exceptionalData?: Array<material.StocktakingScanExceptionalData>; exceptionalData?: Array<material.StocktakingScanExceptionalData>
} }
/** /**
@ -203,34 +181,34 @@ declare namespace material {
*/ */
export interface Material { export interface Material {
/** 赋码规则(2-低值易耗品(不参与赋码) 1-高价值工具类(参与唯一赋码) */ /** 赋码规则(2-低值易耗品(不参与赋码) 1-高价值工具类(参与唯一赋码) */
assignRule?: 'LOW_VALUE' | 'HIGH_VALUE'; assignRule?: 'LOW_VALUE' | 'HIGH_VALUE'
/** 编码 */ /** 编码 */
code?: string; code?: string
/** createdTime */ /** createdTime */
createdTime?: string; createdTime?: string
/** 备注 */ /** 备注 */
description?: string; description?: string
/** id */ /** id */
id?: number; id?: number
/** 名称 */ /** 名称 */
name?: string; name?: string
/** 规格 */ /** 规格 */
spec?: string; spec?: string
/** 库存数量 */ /** 库存数量 */
stock?: number; stock?: number
/** 类型 */ /** 类型 */
type?: string; type?: string
/** updatedTime */ /** updatedTime */
updatedTime?: string; updatedTime?: string
} }
/** /**
@ -238,25 +216,39 @@ declare namespace material {
*/ */
export interface MaterialStockDetail { export interface MaterialStockDetail {
/** 入库申请单 */ /** 入库申请单 */
applyId?: number; applyId?: number
/** 条码 */ /** 条码 */
barcode?: string; barcode?: string
/** createdTime */ /** createdTime */
createdTime?: string; createdTime?: string
/** id */ /** id */
id?: number; id?: number
/** 物料ID */ /** 物料ID */
materialId?: number; materialId?: number
/** 状态 */ /** 状态 */
status?: 'IN' | 'OUT' | 'OFF' | 'LOST'; status?: 'IN' | 'OUT' | 'OFF' | 'LOST'
/** updatedTime */ /** updatedTime */
updatedTime?: string; updatedTime?: string
}
/**
*
*/
export interface ReviewDTO {
/** 申请单 */
applyId?: string
/** 审核意见 */
remark?: string
/** 审核结果 */
reviewResult?: 'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'
} }
/** /**
@ -264,22 +256,22 @@ declare namespace material {
*/ */
export interface StockDetailInfo { export interface StockDetailInfo {
/** 物料编码 */ /** 物料编码 */
materialCode?: string; materialCode?: string
/** 物料名称 */ /** 物料名称 */
materialId?: number; materialId?: number
/** 物料名称 */ /** 物料名称 */
materialName?: string; materialName?: string
/** 实际库存(明细数据中统计来的) */ /** 实际库存(明细数据中统计来的) */
stockReal?: number; stockReal?: number
/** 在存总数(物料表) */ /** 在存总数(物料表) */
stockTotal?: number; stockTotal?: number
/** 扫码数量 */ /** 扫码数量 */
stockTotalScan?: number; stockTotalScan?: number
} }
/** /**
@ -287,22 +279,22 @@ declare namespace material {
*/ */
export interface StocktakingScanDetail { export interface StocktakingScanDetail {
/** 申请单id */ /** 申请单id */
applyId?: number; applyId?: number
/** 条码 */ /** 条码 */
barcode?: string; barcode?: string
/** createdTime */ /** createdTime */
createdTime?: string; createdTime?: string
/** id */ /** id */
id?: number; id?: number
/** 物料ID */ /** 物料ID */
materialId?: number; materialId?: number
/** updatedTime */ /** updatedTime */
updatedTime?: string; updatedTime?: string
} }
/** /**
@ -310,36 +302,33 @@ declare namespace material {
*/ */
export interface StocktakingScanExceptionalData { export interface StocktakingScanExceptionalData {
/** 申请单id */ /** 申请单id */
applyId?: number; applyId?: number
/** 条码 */ /** 条码 */
barcode?: string; barcode?: string
/** createdTime */ /** createdTime */
createdTime?: string; createdTime?: string
/** 异常处理 */ /** 异常处理 */
exceptionHandle?: 'INBOUND' | 'OUTBOUND' | 'DISCARD'; exceptionHandle?: 'INBOUND' | 'OUTBOUND' | 'DISCARD'
/** 异常类型 */ /** 异常类型 */
exceptionReason?: exceptionReason?: 'SOCK_IN_BUT_SCAN_NOT_EXIST' | 'SOCK_OUT_BUT_SCAN_EXIST' | 'SOCK_NOT_EXIST_BUT_SCAN_EXIST'
| 'SOCK_IN_BUT_SCAN_NOT_EXIST'
| 'SOCK_OUT_BUT_SCAN_EXIST'
| 'SOCK_NOT_EXIST_BUT_SCAN_EXIST';
/** id */ /** id */
id?: number; id?: number
/** 物料ID */ /** 物料ID */
materialId?: number; materialId?: number
/** materialName */ /** materialName */
materialName?: string; materialName?: string
/** 备注 */ /** 备注 */
remark?: string; remark?: string
/** updatedTime */ /** updatedTime */
updatedTime?: string; updatedTime?: string
} }
} }

View File

@ -2,14 +2,15 @@
* @description / * @description /
* *
*/ */
import searchPage from './searchPage'; import searchPage from './searchPage'
import saveApply from './saveApply'; import saveApply from './saveApply'
import detail from './detail'; import detail from './detail'
import searchAuditPage from './searchAuditPage'; import searchAuditPage from './searchAuditPage'
import auditApply from './auditApply'; import auditApply from './auditApply'
import getComparisonRes from './getComparisonRes'; import getComparisonRes from './getComparisonRes'
import updateReviewResult from './updateReviewResult'; import updateReviewResult from './updateReviewResult'
import saveScanData from './saveScanData'; import saveScanData from './saveScanData'
import submitReview from './submitReview'
export default { export default {
searchPage, searchPage,
@ -20,4 +21,5 @@ export default {
getComparisonRes, getComparisonRes,
updateReviewResult, updateReviewResult,
saveScanData, saveScanData,
}; submitReview,
}

View File

@ -0,0 +1,22 @@
/**
* @desc
*/
import { defaultSuccess, defaultError, http } from '@/plugins/axios'
import type { AxiosResponse } from 'axios'
export default async function (
/** 请求体 */
requestBody: material.ReviewDTO,
success: (data: void) => void = defaultSuccess,
fail: (error: { code: string; error?: string }) => void = defaultError,
): Promise<void> {
return http({
method: 'post',
url: `/submit-review`,
data: requestBody,
})
.then((data: AxiosResponse<void, unknown>) => {
success(data.data)
})
.catch((error: { code: string; error?: string }) => fail(error))
}

View File

@ -1,32 +0,0 @@
<template>
<a-row bordered>
<a-col :span="8">
<a-button type="primary" width="90%">开始扫码</a-button>
</a-col>
<a-col :span="8"></a-col>
<a-col :span="8">
<a-input ref="snInput" bordered size="large" placeholder="输入条形码" style="width: 90%" />
</a-col>
</a-row>
<vxe-table
ref="applyDetailTableRef"
border
stripe
show-overflow
max-height="500"
:column-config="{ resizable: true }"
:keyboard-config="{ isEsc: true }"
size="medium"
>
<vxe-column type="seq" title="序号" width="60"></vxe-column>
<vxe-column field="id" title="物料id" :visible="false"></vxe-column>
<vxe-column field="name" title="物料名称" />
<vxe-column field="code" title="编码" />
<vxe-column field="spec" title="规格" />
<vxe-column field="type" title="类型" />
<vxe-column field="times" title="库存数量" />
<vxe-column field="oprator" title="盘点数量" />
</vxe-table>
</template>
<script setup lang="ts"></script>

View File

@ -56,7 +56,7 @@
<!-- 审核弹窗 --> <!-- 审核弹窗 -->
<a-modal v-model:open="openResult" title="盘点异常数据:" width="80%" :confirm-loading="confirmLoading" @ok="submit"> <a-modal v-model:open="openResult" title="盘点异常数据:" width="80%" :confirm-loading="confirmLoading" @ok="submit">
<result-form ref="reviewResultRef" :apply-id="applyIdRef"> <result-form :apply-id="applyIdRef">
<a-form layout="vertical" style="margin-top: 20px"> <a-form layout="vertical" style="margin-top: 20px">
<a-form-item label="审核意见"> <a-form-item label="审核意见">
<a-textarea v-model:value="remark" placeholder="请输入审核意见" :row="3" :maxlength="1000" /> <a-textarea v-model:value="remark" placeholder="请输入审核意见" :row="3" :maxlength="1000" />
@ -83,9 +83,8 @@
const auditPage = ref<IPage<material.ApplyForm>>() const auditPage = ref<IPage<material.ApplyForm>>()
const loading = ref(false) const loading = ref(false)
const confirmLoading = ref(false) const confirmLoading = ref(false)
const reviewResult = ref('PASS') const reviewResult = ref<'PASS' | 'REJECT'>('PASS')
const remark = ref('') const remark = ref('')
const reviewResultRef = ref()
// //
const loadData = async (page = 1, size = 10) => { const loadData = async (page = 1, size = 10) => {
@ -109,7 +108,7 @@
const columns = [ const columns = [
{ {
title: '申请id', title: '申请id',
dataIndex: 'applyId', dataIndex: 'id',
}, },
{ {
title: '盘点类型', title: '盘点类型',
@ -166,9 +165,17 @@
// //
const submit = () => { const submit = () => {
confirmLoading.value = true confirmLoading.value = true
const data = reviewResultRef.value.getTableData() api.materialApi.apply.submitReview(
window.console.log(data) {
applyId: applyIdRef.value,
reviewResult: reviewResult.value,
remark: remark.value,
},
() => {
confirmLoading.value = false confirmLoading.value = false
openResult.value = false openResult.value = false
loadData()
},
)
} }
</script> </script>

View File

@ -74,9 +74,11 @@
const handelEditRender = ref<VxeColumnPropTypes.EditRender<undefined, VxeSelectProps>>({ const handelEditRender = ref<VxeColumnPropTypes.EditRender<undefined, VxeSelectProps>>({
name: 'VxeSelect', name: 'VxeSelect',
options: [ options: [
{ label: '入库+1', value: 'INBOUND' }, { label: '标记为丢失', value: 'MARK_LOST' },
{ label: '不入库-1', value: 'OUTBOUND' }, { label: '保持不变', value: 'MARK_KEEP' },
{ label: '丢弃-1', value: 'DISCARD' }, { label: '标记为归还', value: 'MARK_RETURN' },
{ label: '标记为舍弃', value: 'MARK_DISCARD' },
{ label: '标记为新入库', value: 'MARK_NEW' },
], ],
}) })
</script> </script>

View File

@ -128,7 +128,7 @@
applicant: userStore.userName, applicant: userStore.userName,
type: 'AUDIT', type: 'AUDIT',
applyDate: dayjs() + '', applyDate: dayjs() + '',
isConfirm: false, confirm: false,
reviewResult: 'WAIT_SCAN', reviewResult: 'WAIT_SCAN',
}) })