diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionCommissionBo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionCommissionBo.java index 002daa2b..dabab8f2 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionCommissionBo.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionCommissionBo.java @@ -1,5 +1,6 @@ package com.klp.mes.is.domain.bo; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -57,11 +58,13 @@ public class IsInspectionCommissionBo extends BaseEntity { /** * 委托日期 */ + @DateTimeFormat("yyyy-MM-dd") private Date commissionDate; /** * 要求完成日期 */ + @DateTimeFormat("yyyy-MM-dd") private Date deadline; /** diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionTaskBo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionTaskBo.java index 857c64f9..02e28726 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionTaskBo.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionTaskBo.java @@ -1,5 +1,6 @@ package com.klp.mes.is.domain.bo; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -42,11 +43,13 @@ public class IsInspectionTaskBo extends BaseEntity { /** * 任务开始时间 */ + @DateTimeFormat("yyyy-MM-dd") private Date startTime; /** * 任务完成时间 */ + @DateTimeFormat("yyyy-MM-dd") private Date endTime; /** diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java index 33a019f4..09c8d423 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java @@ -1,5 +1,6 @@ package com.klp.mes.is.domain.bo; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -42,11 +43,13 @@ public class IsSampleInventoryBo extends BaseEntity { /** * 入库时间 */ + @DateTimeFormat("yyyy-MM-dd") private Date storageTime; /** * 有效期至 */ + @DateTimeFormat("yyyy-MM-dd") private Date expirationDate; /** @@ -62,6 +65,7 @@ public class IsSampleInventoryBo extends BaseEntity { /** * 最后更新时间 */ + @DateTimeFormat("yyyy-MM-dd") private Date lastUpdate; /** diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionCommissionVo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionCommissionVo.java index cf2d3577..4292eed6 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionCommissionVo.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionCommissionVo.java @@ -1,6 +1,8 @@ package com.klp.mes.is.domain.vo; import java.util.Date; + +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -68,12 +70,14 @@ public class IsInspectionCommissionVo { /** * 委托日期 */ + @DateTimeFormat("yyyy-MM-dd") @ExcelProperty(value = "委托日期") private Date commissionDate; /** * 要求完成日期 */ + @DateTimeFormat("yyyy-MM-dd") @ExcelProperty(value = "要求完成日期") private Date deadline; diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java index caae7b49..6fc88c9f 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java @@ -1,6 +1,8 @@ package com.klp.mes.is.domain.vo; import java.util.Date; + +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -49,12 +51,14 @@ public class IsInspectionTaskVo { /** * 任务开始时间 */ + @DateTimeFormat("yyyy-MM-dd") @ExcelProperty(value = "任务开始时间") private Date startTime; /** * 任务完成时间 */ + @DateTimeFormat("yyyy-MM-dd") @ExcelProperty(value = "任务完成时间") private Date endTime; diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java index 2c0233bd..5a94aabe 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java @@ -1,6 +1,8 @@ package com.klp.mes.is.domain.vo; import java.util.Date; + +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -49,12 +51,14 @@ public class IsSampleInventoryVo { /** * 入库时间 */ + @DateTimeFormat("yyyy-MM-dd") @ExcelProperty(value = "入库时间") private Date storageTime; /** * 有效期至 */ + @DateTimeFormat("yyyy-MM-dd") @ExcelProperty(value = "有效期至") private Date expirationDate; @@ -74,6 +78,7 @@ public class IsSampleInventoryVo { /** * 最后更新时间 */ + @DateTimeFormat("yyyy-MM-dd") @ExcelProperty(value = "最后更新时间") private Date lastUpdate; diff --git a/klp-ui/src/api/mes/is/inspectionCommission.js b/klp-ui/src/api/mes/is/inspectionCommission.js new file mode 100644 index 00000000..bcd4bca7 --- /dev/null +++ b/klp-ui/src/api/mes/is/inspectionCommission.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询检验委托单表列表 +export function listInspectionCommission(query) { + return request({ + url: '/is/inspectionCommission/list', + method: 'get', + params: query + }) +} + +// 查询检验委托单表详细 +export function getInspectionCommission(commissionId) { + return request({ + url: '/is/inspectionCommission/' + commissionId, + method: 'get' + }) +} + +// 新增检验委托单表 +export function addInspectionCommission(data) { + return request({ + url: '/is/inspectionCommission', + method: 'post', + data: data + }) +} + +// 修改检验委托单表 +export function updateInspectionCommission(data) { + return request({ + url: '/is/inspectionCommission', + method: 'put', + data: data + }) +} + +// 删除检验委托单表 +export function delInspectionCommission(commissionId) { + return request({ + url: '/is/inspectionCommission/' + commissionId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/mes/is/inspectionTask.js b/klp-ui/src/api/mes/is/inspectionTask.js new file mode 100644 index 00000000..ef38aa8c --- /dev/null +++ b/klp-ui/src/api/mes/is/inspectionTask.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询检验任务表列表 +export function listInspectionTask(query) { + return request({ + url: '/is/inspectionTask/list', + method: 'get', + params: query + }) +} + +// 查询检验任务表详细 +export function getInspectionTask(taskId) { + return request({ + url: '/is/inspectionTask/' + taskId, + method: 'get' + }) +} + +// 新增检验任务表 +export function addInspectionTask(data) { + return request({ + url: '/is/inspectionTask', + method: 'post', + data: data + }) +} + +// 修改检验任务表 +export function updateInspectionTask(data) { + return request({ + url: '/is/inspectionTask', + method: 'put', + data: data + }) +} + +// 删除检验任务表 +export function delInspectionTask(taskId) { + return request({ + url: '/is/inspectionTask/' + taskId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/mes/is/sampleInventory.js b/klp-ui/src/api/mes/is/sampleInventory.js new file mode 100644 index 00000000..a496937a --- /dev/null +++ b/klp-ui/src/api/mes/is/sampleInventory.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询样品库存表列表 +export function listSampleInventory(query) { + return request({ + url: '/is/sampleInventory/list', + method: 'get', + params: query + }) +} + +// 查询样品库存表详细 +export function getSampleInventory(sampleId) { + return request({ + url: '/is/sampleInventory/' + sampleId, + method: 'get' + }) +} + +// 新增样品库存表 +export function addSampleInventory(data) { + return request({ + url: '/is/sampleInventory', + method: 'post', + data: data + }) +} + +// 修改样品库存表 +export function updateSampleInventory(data) { + return request({ + url: '/is/sampleInventory', + method: 'put', + data: data + }) +} + +// 删除样品库存表 +export function delSampleInventory(sampleId) { + return request({ + url: '/is/sampleInventory/' + sampleId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/mes/is/inspectionCommission/index.vue b/klp-ui/src/views/mes/is/inspectionCommission/index.vue new file mode 100644 index 00000000..b62d091a --- /dev/null +++ b/klp-ui/src/views/mes/is/inspectionCommission/index.vue @@ -0,0 +1,351 @@ + + + diff --git a/klp-ui/src/views/mes/is/inspectionTask/index.vue b/klp-ui/src/views/mes/is/inspectionTask/index.vue new file mode 100644 index 00000000..1bfdc218 --- /dev/null +++ b/klp-ui/src/views/mes/is/inspectionTask/index.vue @@ -0,0 +1,382 @@ + + + diff --git a/klp-ui/src/views/mes/is/sampleInventory/index.vue b/klp-ui/src/views/mes/is/sampleInventory/index.vue new file mode 100644 index 00000000..b71d973e --- /dev/null +++ b/klp-ui/src/views/mes/is/sampleInventory/index.vue @@ -0,0 +1,377 @@ + + +