diff --git a/src/api/mes/dv/inventoryRequest.js b/src/api/mes/dv/inventoryRequest.js new file mode 100644 index 0000000..002a002 --- /dev/null +++ b/src/api/mes/dv/inventoryRequest.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' +// 查询设备点检结果列表 +export function listRequest(query) { + return request({ + url: 'inventoryRequestController/list', + method: 'get', + params: query + }) +} + +// 新增计划 +export function addRequest(data) { + return request({ + url: 'inventoryRequestController/save', + method: 'post', + data: data + }) +} + +// 查询结果细 +export function getRequest(RequestId) { + return request({ + url: 'inventoryRequestController/' + RequestId, + method: 'get' + }) +} + +// 修改计划 +export function updateRequest(data) { + return request({ + url: 'inventoryRequestController/', + method: 'put', + data: data + }) +} + +// 删除设备 +export function delRequest(RequestId) { + return request({ + url: 'inventoryRequestController/' + RequestId, + method: 'delete' + }) +} + +// 批量删除设备 +export function delRequests(RequestId) { + return request({ + url: 'inventoryRequestController/del/' + RequestId, + method: 'delete' + }) +} + diff --git a/src/api/mes/dv/inventoryTask.js b/src/api/mes/dv/inventoryTask.js index 1dfd157..d70db3c 100644 --- a/src/api/mes/dv/inventoryTask.js +++ b/src/api/mes/dv/inventoryTask.js @@ -50,3 +50,11 @@ export function delMachinerys(machineryId) { }) } +// 重新定检任务 +export function rechecklMachinerys(machineryId) { + return request({ + url: 'InventoryTaskController/recheck/' + machineryId, + method: 'delete' + }) +} + diff --git a/src/components/wm/InOutTypeCmps.vue b/src/components/wm/InOutTypeCmps.vue new file mode 100644 index 0000000..2b5115e --- /dev/null +++ b/src/components/wm/InOutTypeCmps.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/components/wm/InventoryCmps.vue b/src/components/wm/InventoryCmps.vue new file mode 100644 index 0000000..48f2476 --- /dev/null +++ b/src/components/wm/InventoryCmps.vue @@ -0,0 +1,115 @@ + + + + + diff --git a/src/components/wm/SelecAreaCmps.vue b/src/components/wm/SelecAreaCmps.vue index 6718321..1228cf9 100644 --- a/src/components/wm/SelecAreaCmps.vue +++ b/src/components/wm/SelecAreaCmps.vue @@ -22,14 +22,13 @@ - - + @@ -51,8 +50,17 @@ export default { // 新增弹窗控制 addVisible: false, total: 0, - pagination: { - currentPage: 1 + queryParams: { + pageNum: 1, + pageSize: 10, + areaCode: null, + areaName: null, + locationId: null, + area: null, + maxLoa: null, + positionX: null, + positionY: null, + positionZ: null, }, multipleSelection: [], tableData: [], diff --git a/src/components/wm/SelecLocationCmps.vue b/src/components/wm/SelecLocationCmps.vue index a962552..84c6078 100644 --- a/src/components/wm/SelecLocationCmps.vue +++ b/src/components/wm/SelecLocationCmps.vue @@ -16,14 +16,13 @@ - - + @@ -45,8 +44,14 @@ export default { // 新增弹窗控制 addVisible: false, total: 0, - pagination: { - currentPage: 1 + queryParams: { + pageNum: 1, + pageSize: 10, + locationCode: null, + locationName: null, + warehouseId: null, + area: null, + areaFlag: null, }, multipleSelection: [], tableData: [], diff --git a/src/components/wm/SelectWareHouseCmps.vue b/src/components/wm/SelectWareHouseCmps.vue index f4a931e..63eef6e 100644 --- a/src/components/wm/SelectWareHouseCmps.vue +++ b/src/components/wm/SelectWareHouseCmps.vue @@ -18,14 +18,13 @@ - - + @@ -45,8 +44,14 @@ export default { // 新增弹窗控制 addVisible: false, total: 0, - pagination: { - currentPage: 1 + queryParams: { + pageNum: 1, + pageSize: 10, + warehouseCode: null, + warehouseName: null, + location: null, + area: null, + charge: null, }, multipleSelection: [], tableData: [], diff --git a/src/views/mes/dv/Inventory/InventoryRequest.vue b/src/views/mes/dv/Inventory/InventoryRequest.vue new file mode 100644 index 0000000..1c9d858 --- /dev/null +++ b/src/views/mes/dv/Inventory/InventoryRequest.vue @@ -0,0 +1,500 @@ + + + diff --git a/src/views/mes/qc/Inventory/InventoryTask.vue b/src/views/mes/dv/Inventory/InventoryTask.vue similarity index 90% rename from src/views/mes/qc/Inventory/InventoryTask.vue rename to src/views/mes/dv/Inventory/InventoryTask.vue index ba2d6d9..0a39a2f 100644 --- a/src/views/mes/qc/Inventory/InventoryTask.vue +++ b/src/views/mes/dv/Inventory/InventoryTask.vue @@ -85,6 +85,11 @@ {{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }} + + + @@ -124,7 +138,7 @@ - + @@ -145,7 +159,7 @@ - + - + - + - + - - - - - - - -
返回 保存 @@ -286,18 +292,15 @@ import { getMachinery, updateMachinery, delMachinery, - delMachinerys + delMachinerys, + rechecklMachinerys } from "@/api/mes/dv/inventoryTask"; import {listMdItem} from "@/api/mes/md/mdItem"; import {listQctemplate} from "@/api/mes/qc/qctemplate"; -// import Checkmachinery from "./machinery.vue" -// import Checksubject from "./subject.vue" import {genCode} from "@/api/system/autocode/rule" -import Log from "@/views/monitor/job/log.vue"; export default { - name: "Checkplan", + name: "InventoryTask", dicts: ['mes_cycle_type','mes_order_status','dv_plan_type'], - // components:{Checkmachinery,Checksubject}, data() { return { Datelist:[{name:"年",value:"年"},{name:"月",value:"月"},{name:"日",value:"日"}], @@ -350,9 +353,24 @@ export default { name: [ {required: true, message: "计划名称不能为空", trigger: "blur"} ], - uomId: [ - {required: true, message: "计划类型不能为空", trigger: "blur"} + productId: [ + {required: true, message: "物料不能为空", trigger: "blur"} ], + planPeriod: [ + {required: true, message: "计划规则不能为空", trigger: "blur"} + ], + finishTime: [ + {required: true, message: "结束时间不能为空", trigger: "blur"} + ], + startTime: [ + {required: true, message: "开始时间不能为空", trigger: "blur"} + ], + belowTime: [ + {required: true, message: "结束时间不能为空", trigger: "blur"} + ], + superiorTime: [ + {required: true, message: "开始时间不能为空", trigger: "blur"} + ] } }; }, @@ -369,6 +387,17 @@ export default { this.listQctemplateList = response.rows; }) }, + //重新定检 + recheckTask(row){ + const planIds = row.wmsInventoryID; + this.$modal.confirm('是否确认重新定检计划编号为"' + planIds + '"的数据项？').then(function () { + return rechecklMachinerys(planIds); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("修改成功,请前往工装定检结果页面录入该定检的结果"); + }).catch(() => { + }); + }, //获取物料集合 getMdItem(){ this.loading=true diff --git a/src/views/mes/wm/area/index.vue b/src/views/mes/wm/area/index.vue index a9231da..75b0254 100644 --- a/src/views/mes/wm/area/index.vue +++ b/src/views/mes/wm/area/index.vue @@ -180,7 +180,7 @@
- +
@@ -193,7 +193,7 @@
- +
@@ -241,7 +241,7 @@ - +
@@ -306,6 +306,12 @@ export default { ], areaName: [ { required: true, message: "库位名称不能为空", trigger: "blur" } + ], + locationId: [ + { required: true, message: "库区不能为空", trigger: "blur" } + ], + attr1: [ + { required: true, message: "上级库位名称不能为空", trigger: "blur" } ] } }; diff --git a/src/views/mes/wm/location/index.vue b/src/views/mes/wm/location/index.vue index 25fd32a..efa56ed 100644 --- a/src/views/mes/wm/location/index.vue +++ b/src/views/mes/wm/location/index.vue @@ -133,7 +133,7 @@ - +
@@ -185,7 +185,7 @@ - +
@@ -244,6 +244,9 @@ export default { ], locationName: [ { required: true, message: "库区名称不能为空", trigger: "blur" } + ], + warehouseName: [ + { required: true, message: "库房不能为空", trigger: "blur" } ] } }; diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue index 9f9f507..f837a39 100644 --- a/src/views/mes/wm/warehouse/index.vue +++ b/src/views/mes/wm/warehouse/index.vue @@ -153,9 +153,10 @@ - - - +
+ + +
@@ -182,6 +183,9 @@ 取 消
+ + +
@@ -189,11 +193,13 @@ import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse,changeFrozenState } from "@/api/mes/wm/warehouse"; import {genCode} from "@/api/system/autocode/rule" import BarcodeImg from "@/components/barcodeImg/index.vue" +import InOutTypeCmps from "@/components/wm/InOutTypeCmps.vue"; export default { name: "Warehouse", - components: { BarcodeImg } , + components: {InOutTypeCmps, BarcodeImg } , data() { return { + selectWareHouseVisible:false, //是否有效 fig:false, //自动生成编码 @@ -260,6 +266,12 @@ export default { this.getList(); }, methods: { + //设置库房类型 + selectType(row) { + this.form.attr1 = row.typeId; + this.form.attr2 = row.name; + this.selectWareHouseVisible = false; + }, //修改库房是否有效 isFig(val){ this.form.attr3=val?1:0