【需求】每日报工完善

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/vo/TaskReportPageReqVO.java

@@ -65,4 +65,9 @@ public class TaskReportPageReqVO extends PageParam {
     @Schema(description = "零件名称")
     private String materialName;
 
+    @Schema(description = "计划单号")
+    private String planCode;
+
+    @Schema(description = "派工单号")
+    private String dispatchCode;
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java

@@ -1,6 +1,5 @@
 package com.chanko.yunxi.mes.module.biz.dal.mysql.taskreport;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
 import com.chanko.yunxi.mes.module.biz.controller.admin.taskreport.vo.TaskReportPageReqVO;
@@ -51,7 +50,10 @@ public interface TaskReportMapper extends BaseMapperX<TaskReportDO> {
                 .eq(reqVO.getDispatchDetailId() != null, TaskReportDO::getDispatchDetailId, reqVO.getDispatchDetailId())
                 .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode())
                 .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName())
-                .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName());
+                .and(!StringUtils.isEmpty(reqVO.getProjectSubName()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubName()).or().like(MaterialDO::getCode, reqVO.getProjectSubName()))
+                .like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode())
+                .like(!StringUtils.isEmpty(reqVO.getDispatchCode()), TaskDispatchDO::getCode, reqVO.getDispatchCode())
+        ;
 
         return selectPage(reqVO, query);
     }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java

@@ -783,13 +783,7 @@ public class ChanjetManager {
     @Transactional(rollbackFor = Exception.class)
     public void deleteTaskReport(Long id) throws ChanjetApiException {
         taskReportService.deleteTaskReport(id);
-
-        // TODO 如用id做code
-        DeleteReportReqVO.DeleteReportDTO dto = new DeleteReportReqVO.DeleteReportDTO(String.valueOf(id));
-        SimpleChanjetResponse response = (SimpleChanjetResponse) chanjetSpi.execute(DELETE_REPORT, new DeleteReportReqVO(dto));
-        if(!response.isSuccess()){
-            throw new RuntimeException(response.getMessage());
-        }
+        // do nothing
     }
 
     /**

mes-ui/mes-ui-admin-vue3/src/views/biz/taskreport/index.vue

@@ -11,16 +11,16 @@
           <el-input v-model="queryParams.projectCode" placeholder="请输入生产订单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
         </el-form-item>
         <!-- 新增生产计划单号 -->
-        <el-form-item label="生产计划单号" prop="projectCode">
-          <el-input v-model="queryParams.projectCode" placeholder="请输入生产计划单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+        <el-form-item label="生产计划单号" prop="planCode">
+          <el-input v-model="queryParams.planCode" placeholder="请输入生产计划单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
         </el-form-item>
         <!-- 新增生产派工单号 -->
-        <el-form-item label="生产派工单号" prop="projectCode">
-          <el-input v-model="queryParams.projectCode" placeholder="请输入生产计划单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+        <el-form-item label="生产派工单号" prop="dispatchCode">
+          <el-input v-model="queryParams.dispatchCode" placeholder="请输入生产派工单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
         </el-form-item>
         <!-- 项目名称修改i为产品编码名称 -->
-        <el-form-item label="产品编码/名称" prop="projectName">
-          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
+        <el-form-item label="产品编码/名称" prop="projectSubName">
+          <el-input v-model="queryParams.projectSubName" placeholder="请输入产品编码/名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
         </el-form-item>
         <el-form-item style="margin-left: 20px">
           <el-button @click="handleQuery" type="primary">
@@ -40,13 +40,13 @@
         <!-- 项目编号修改为生产订单号 -->
         <el-table-column fixed label="生产订单号" align="center" prop="projectCode" width="220" />
         <!-- 新增生产计划单号 -->
-        <el-table-column fixed label="生产计划单号" align="center" prop="projectCode" width="220" />
+        <el-table-column fixed label="生产计划单号" align="center" prop="planCode" width="220" />
         <!-- 派工单号修改为生产派工单号 -->
         <el-table-column label="生产派工单号" align="center" prop="dispatchCode" width="180" />
         <!-- 新增产品编码 -->
-        <el-table-column fixed label="产品编码" align="center" prop="projectCode" width="180" />
+        <el-table-column fixed label="产品编码" align="center" prop="projectSubCode" width="180" />
         <!-- 项目名称修改为产品名称 -->
-        <el-table-column fixed label="产品名称" align="center" prop="projectName" width="180" />
+        <el-table-column fixed label="产品名称" align="center" prop="projectSubName" width="180" />
         <el-table-column label="规格型号" align="center" prop="spec" width="160" />
         <el-table-column label="报工工序" align="center" prop="procedureName" width="160" />
         <el-table-column label="报工人" align="center" prop="ownerName" />