【需求】派工查询逻辑优化

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;
+
 
 }

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();
     }

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<TaskDispatchDO> {
     default PageResult<TaskDispatchDO> selectPage(TaskDispatchPageReqVO reqVO) {
         MPJLambdaWrapper<TaskDispatchDO> 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)

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/taskdispatchselect.vue

@@ -61,7 +61,7 @@
         <el-table-column label="规格型号" align="center" prop="spec" min-width="160" />
         <el-table-column fixed="right" label="生产状态" align="center" prop="dispatchStatus" min-width="140">
           <template #default="scope">
-            <dict-tag :type="DICT_TYPE.BIZ_DISPATCH_STATUS" :value="scope.row.dispatchStatus" />
+            <dict-tag :type="DICT_TYPE.BIZ_PROJECT_PLAN_STATUS" :value="scope.row.dispatchStatus" />
           </template>
         </el-table-column>
       </el-table>
@@ -132,7 +132,7 @@ const queryParams = reactive({
   projectCode: undefined,
   projectSubCode: undefined,
   customerName: undefined,
-  dispatchStatus: undefined,
+  dispatchStatus: 2,
   remark: undefined,
   status: undefined,
   createTime: [],