From d61785cca4bc225eae903953633dffbf26954610 Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Tue, 14 May 2024 15:46:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E6=B4=BE?= =?UTF-8?q?=E5=B7=A5=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/taskdispatch/vo/TaskDispatchRespVO.java | 3 +++ .../biz/dal/dataobject/taskdispatch/TaskDispatchDO.java | 3 +++ .../module/biz/dal/mysql/taskdispatch/TaskDispatchMapper.java | 4 ++-- .../src/views/biz/storage/taskdispatchselect.vue | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/vo/TaskDispatchRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/vo/TaskDispatchRespVO.java index 66eb639f..2f55f318 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/vo/TaskDispatchRespVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/vo/TaskDispatchRespVO.java @@ -127,5 +127,8 @@ public class TaskDispatchRespVO { @Schema(description = "生产车间名称") private String workshopName; + @Schema(description = "计划状态") + private Integer planStatus; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDO.java index 710b480c..8182ef60 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDO.java @@ -158,6 +158,9 @@ public class TaskDispatchDO extends BaseDO { @TableField(exist = false) private Long warehouseId; + @TableField(exist = false) + private Integer planStatus; + public boolean canSave(){ return TaskDispatchStatusEnum.SAVE.getCode() == this.dispatchStatus.intValue(); } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchMapper.java index 19065190..470c5a4b 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchMapper.java @@ -29,10 +29,10 @@ public interface TaskDispatchMapper extends BaseMapperX { default PageResult selectPage(TaskDispatchPageReqVO reqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(TaskDispatchDO.class) - .select("a.plan_no as planCode", "e.name as customerName") + .select("a.plan_no as planCode,a.status as planStatus", "e.name as customerName") .select("c.code as projectCode", "c.project_end_time as projectEndTime") .select("f.name workshopName", "g.end_time requiredCompletedDate", "u1.nickname as ownerName") - .select("d.name as projectSubName", "d.code as projectSubCode") + .select("d.name as projectSubName", "d.code as projectSubCode", "d.spec") .select("b.amount", "d.unit") .leftJoin(PlanDO.class, "a", PlanDO::getId, TaskDispatchDO::getPlanId) .leftJoin(ProjectOrderSubDO.class, "b", ProjectOrderSubDO::getId, TaskDispatchDO::getProjectSubId) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/taskdispatchselect.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/taskdispatchselect.vue index 9a7941c6..f89a85cd 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/taskdispatchselect.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/taskdispatchselect.vue @@ -61,7 +61,7 @@ @@ -132,7 +132,7 @@ const queryParams = reactive({ projectCode: undefined, projectSubCode: undefined, customerName: undefined, - dispatchStatus: undefined, + dispatchStatus: 2, remark: undefined, status: undefined, createTime: [],