diff --git a/src/api/wmsManagement/wmPolishInspectionWorkorder.js b/src/api/wmsManagement/wmPolishInspectionWorkorder.js new file mode 100644 index 0000000..9e57fd9 --- /dev/null +++ b/src/api/wmsManagement/wmPolishInspectionWorkorder.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' + +/** +* 后道检验工单表分页查询 +* @param {查询条件} data +*/ +export function listWmPolishInspectionWorkorder(query) { + return request({ + url: '/mes/wm/WmPolishInspectionWorkorder/list', + method: 'get', + params: query, + }) +} + +/** +* 新增后道检验工单表 +* @param data +*/ +export function addWmPolishInspectionWorkorder(data) { + return request({ + url: '/mes/wm/WmPolishInspectionWorkorder', + method: 'post', + data: data, + }) +} +/** +* 修改后道检验工单表 +* @param data +*/ +export function updateWmPolishInspectionWorkorder(data) { + return request({ + url: '/mes/wm/WmPolishInspectionWorkorder', + method: 'PUT', + data: data, + }) +} +/** +* 获取后道检验工单表详情 +* @param {Id} +*/ +export function getWmPolishInspectionWorkorder(id) { + return request({ + url: '/mes/wm/WmPolishInspectionWorkorder/' + id, + method: 'get' + }) +} + +/** +* 删除后道检验工单表 +* @param {主键} pid +*/ +export function delWmPolishInspectionWorkorder(pid) { + return request({ + url: '/mes/wm/WmPolishInspectionWorkorder/' + pid, + method: 'delete' + }) +} diff --git a/src/api/wmsManagement/wmPolishWorkorder.js b/src/api/wmsManagement/wmPolishWorkorder.js new file mode 100644 index 0000000..9ab3fc5 --- /dev/null +++ b/src/api/wmsManagement/wmPolishWorkorder.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' + +/** +* 分页查询 +* @param {查询条件} data +*/ +export function listWmPolishWorkorder(query) { + return request({ + url: '/mes/wm/WmPolishWorkorder/list', + method: 'get', + params: query, + }) +} + +/** +* 新增 +* @param data +*/ +export function addWmPolishWorkorder(data) { + return request({ + url: '/mes/wm/WmPolishWorkorder', + method: 'post', + data: data, + }) +} +/** +* 修改 +* @param data +*/ +export function updateWmPolishWorkorder(data) { + return request({ + url: '/mes/wm/WmPolishWorkorder', + method: 'PUT', + data: data, + }) +} +/** +* 获取详情 +* @param {Id} +*/ +export function getWmPolishWorkorder(id) { + return request({ + url: '/mes/wm/WmPolishWorkorder/' + id, + method: 'get' + }) +} + +/** +* 删除 +* @param {主键} pid +*/ +export function delWmPolishWorkorder(pid) { + return request({ + url: '/mes/wm/WmPolishWorkorder/' + pid, + method: 'delete' + }) +} diff --git a/src/router/index.js b/src/router/index.js index 3fc0dab..9471dcd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -101,7 +101,23 @@ export const constantRoutes = [{ path: '/thirtyFQC', component: (resolve) => require(['@/views/qualityManagement/FQC/thirtyFQC.vue'], resolve), hidden: true - } + }, + { + path: '/polishManagement/WmPolishWorkOrder', + component: (resolve) => require(['@/views/wmsManagement/WmPolishInventory/WmPolishWorkOrder.vue'], resolve), + hidden: true + }, + { + path: '/polishManagement/PolishReport', + component: (resolve) => require(['@/views/wmsManagement/WmPolishInventory/PolishReport.vue'], resolve), + hidden: true + }, + { + path: '/polishManagement/PolishFQC', + component: (resolve) => require(['@/views/wmsManagement/WmPolishInventory/PolishFQC.vue'], resolve), + hidden: true + }, + ] export default new Router({ diff --git a/src/views/qualityManagement/FQC/thirtyFQC.vue b/src/views/qualityManagement/FQC/thirtyFQC.vue index 0cfc2a0..83673da 100644 --- a/src/views/qualityManagement/FQC/thirtyFQC.vue +++ b/src/views/qualityManagement/FQC/thirtyFQC.vue @@ -846,7 +846,6 @@ if (res.code == 200) { if (res.data != undefined) { this.CurrentWorkorder = res.data - this.$message.success('更新今日工单号成功') this.$loading() return GetcheckItemTable({ workorderID: this.CurrentWorkorder.clientWorkorder }) @@ -874,12 +873,13 @@ workOrderCompleted() { // 待保存的工单信息 const saveWorkorderInfo = JSON.parse(JSON.stringify(this.CurrentWorkorder)); + const timeStr = this.$dayjs().format("YYYY-MM-DD HH:mm:ss"); this.$modal .confirm('是否确认完成本工单？') .then(() => { this.$notify.success(`已完成工单${saveWorkorderInfo.clientWorkorder}，即将跳转下一个工单`); // 毛坯库存出库 - this.$notify.success(`工单${saveWorkorderInfo.clientWorkorder},开始同步毛坯库存！`) + this.$notify.success(`工单${saveWorkorderInfo.clientWorkorder},开始同步毛坯库存！`); const queryData = { workOrderId: saveWorkorderInfo.clientWorkorder } @@ -888,7 +888,7 @@ this.$notify.success(`工单${saveWorkorderInfo.clientWorkorder},毛坯库存已扣除！`) } }).catch((err) => { - + }) //todo 更改这个工单状态为2 this.getNext_current_workorder().then(() => { diff --git a/src/views/wmsManagement/WmPolishInventory/PolishFQC.vue b/src/views/wmsManagement/WmPolishInventory/PolishFQC.vue index 02409e3..fd7b4d9 100644 --- a/src/views/wmsManagement/WmPolishInventory/PolishFQC.vue +++ b/src/views/wmsManagement/WmPolishInventory/PolishFQC.vue @@ -1,4 +1,5 @@ + + \ No newline at end of file diff --git a/src/views/wmsManagement/WmPolishInventory/WmPolishWorkOrder.vue b/src/views/wmsManagement/WmPolishInventory/WmPolishWorkOrder.vue new file mode 100644 index 0000000..b9501db --- /dev/null +++ b/src/views/wmsManagement/WmPolishInventory/WmPolishWorkOrder.vue @@ -0,0 +1,410 @@ + + + + + diff --git a/src/views/wmsManagement/WmPolishInventory/WorkOrderRecord.vue b/src/views/wmsManagement/WmPolishInventory/WorkOrderRecord.vue new file mode 100644 index 0000000..8d6d669 --- /dev/null +++ b/src/views/wmsManagement/WmPolishInventory/WorkOrderRecord.vue @@ -0,0 +1,447 @@ + + + \ No newline at end of file diff --git a/src/views/wmsManagement/WmPolishInventory/index.vue b/src/views/wmsManagement/WmPolishInventory/index.vue index f8ab7a2..d399cde 100644 --- a/src/views/wmsManagement/WmPolishInventory/index.vue +++ b/src/views/wmsManagement/WmPolishInventory/index.vue @@ -176,10 +176,17 @@ /> - + + + 入库 + 出库 + 盘点 + + + @@ -191,8 +198,14 @@ - - + + + + + + + + @@ -230,13 +243,24 @@ - + - - + + - - + + + + + @@ -333,6 +357,7 @@ export default { type: 1, status: 1, partnumber: '', + remark: '', actionTime: new Date(), }, columns: [ @@ -433,7 +458,7 @@ export default { type: 1, status: 1, actionTime: new Date(), - remark: undefined, + remark: '', createdBy: undefined, createdTime: undefined, updatedBy: undefined, @@ -551,8 +576,8 @@ export default { resetRecordQuery() { this.RecordQueryParams.pageNum = 1 this.RecordQueryParams.changeType = -1 - this.RecordQueryParams.startTime = null - this.RecordQueryParams.endTime = null + // this.RecordQueryParams.startTime = '' + // this.RecordQueryParams.endTime = '' this.getRecordList() }, getRecordList() { @@ -581,7 +606,7 @@ export default { if (valid) { const _opertype = this.opertype if (_opertype === 1) { - this.form.remark = '手动入库 ' + this.form.remark; + this.form.remark = '手动入库 ' + this.form.remark doWmPolishWarehousing(this.form) .then((res) => { this.msgSuccess('入库成功') @@ -592,7 +617,7 @@ export default { //TODO 错误逻辑 }) } else if (_opertype === 2) { - this.form.remark = '手动出库 ' + this.form.remark; + this.form.remark = '手动出库 ' + this.form.remark doWmPolishRetrieval(this.form) .then((res) => { this.msgSuccess('出库成功') @@ -603,7 +628,7 @@ export default { //TODO 错误逻辑 }) } else if (_opertype === 3) { - this.form.remark = '手动盘点 ' + this.form.remark; + this.form.remark = '手动盘点 ' + this.form.remark doWmPolishStocktaking(this.form) .then((res) => { this.msgSuccess('盘点成功') @@ -619,4 +644,4 @@ export default { }, }, } - + \ No newline at end of file