From 44b2a3005596bfa4fdab189a47e45ed8aed890e5 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Mon, 2 Jun 2025 16:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=85=A7=E8=A1=A8=E6=A0=BC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunxi/mes/module/heli/enums/CodeEnum.java |  19 ++
 .../module/heli/enums/ErrorCodeConstants.java |   1 +
 .../ProjectLeaderController.java              | 102 +++++++++
 .../vo/ProjectLeaderPageReqVO.java            |  31 +++
 .../projectleader/vo/ProjectLeaderRespVO.java |  43 ++++
 .../vo/ProjectLeaderSaveReqVO.java            |  25 ++
 .../projectorder/vo/ProjectOrderRespVO.java   |   3 +-
 .../vo/ProjectOrderSaveReqVO.java             |   4 +-
 .../vo/ProjectOrderSubPageReqVO.java          |   4 +
 .../admin/storage/vo/StorageRespVO.java       |   3 +-
 .../admin/storage/vo/StorageSaveReqVO.java    |   3 +-
 .../projectleader/ProjectLeaderDO.java        |  55 +++++
 .../projectorder/ProjectOrderDO.java          |   4 +
 .../projectorder/ProjectOrderSubDO.java       |   4 +
 .../dal/dataobject/storage/StorageDO.java     |   4 +
 .../projectleader/ProjectLeaderMapper.java    |  46 ++++
 .../projectorder/ProjectOrderSubMapper.java   |   3 +-
 .../projectleader/ProjectLeaderService.java   |  56 +++++
 .../ProjectLeaderServiceImpl.java             |  79 +++++++
 .../projectorder/ProjectOrderServiceImpl.java |  20 +-
 .../serialnumber/SerialNumberService.java     |   7 +
 .../serialnumber/SerialNumberServiceImpl.java |  27 ++-
 .../projectleader/ProjectLeaderMapper.xml     |  12 +
 .../src/api/heli/projectleader/index.ts       |  41 ++++
 mes-ui/mes-ui-admin-vue3/src/utils/dict.ts    |   3 +-
 .../views/heli/PriceQuoteRecord/detail.vue    |   2 +-
 .../src/views/heli/master/MasterForm.vue      |   2 +-
 .../src/views/heli/material/MaterialForm.vue  |   2 +-
 .../src/views/heli/plan/edit.vue              |  57 ++++-
 .../heli/projectleader/ProjectLeaderForm.vue  | 110 +++++++++
 .../src/views/heli/projectleader/index.vue    | 214 ++++++++++++++++++
 .../src/views/heli/projectorder/detail.vue    |  48 +++-
 .../src/views/heli/storage/StorageOut.vue     |  16 +-
 .../src/views/heli/storage/StorageOutsp.vue   |  13 +-
 .../src/views/heli/storage/subproject.vue     |  16 +-
 35 files changed, 1044 insertions(+), 35 deletions(-)
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/ProjectLeaderController.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderPageReqVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderRespVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderSaveReqVO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectleader/ProjectLeaderDO.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectleader/ProjectLeaderMapper.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectleader/ProjectLeaderService.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectleader/ProjectLeaderServiceImpl.java
 create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/projectleader/ProjectLeaderMapper.xml
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/api/heli/projectleader/index.ts
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/projectleader/ProjectLeaderForm.vue
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/projectleader/index.vue

diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java
index 255a7cf..e9e2630 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java
@@ -112,4 +112,23 @@ public enum CodeEnum {
         args[i++] = Long.parseLong(sequenceNo);
         return String.format(this.sequenceTemplate, args);
     }
+    public String getProjectOrderCode( String suffix){
+        // 1. 处理流水号：转为数字并补零到3位（如 "1" → "001"）
+        String sequenceNo;
+        try {
+            sequenceNo = String.format("%03d", Long.parseLong(suffix));
+        } catch (NumberFormatException e) {
+            // 如果 suffix 不是纯数字，截取后3位并尝试补零（兼容旧逻辑）
+            sequenceNo = suffix.length() > 3 ?
+                    suffix.substring(suffix.length() - 3) :
+                    String.format("%3s", suffix).replace(' ', '0');
+        }
+
+        // 2. 获取当前年月（格式：yyyy-MM）并直接拼接流水号
+        String yearMonthWithSequence = new SimpleDateFormat("yyyy-MM").format(new Date())
+                + "-" + sequenceNo;
+
+        // 3. 拼接完整编号（格式：年月-流水号）
+        return yearMonthWithSequence;
+    }
 }
diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
index b316cf4..855c741 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
@@ -53,6 +53,7 @@ public interface ErrorCodeConstants {
     ErrorCode WORKSHOP_NOT_EXISTS = new ErrorCode(1_002_001, "车间不存在");
     ErrorCode CLASSES_NOT_EXISTS = new ErrorCode(1_002_002, "生产班组不存在");
     ErrorCode MOULD_TYPE_NOT_EXISTS = new ErrorCode(1_002_003, "模具类型不存在");
+    ErrorCode PROJECT_LEADER_NOT_EXISTS = new ErrorCode(1_002_004, "项目负责人配置不存在");
 
     /*********库存管理************/
     ErrorCode WAREHOUSE_NOT_EXISTS = new ErrorCode(1_003_001, "仓库不存在");
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/ProjectLeaderController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/ProjectLeaderController.java
new file mode 100644
index 0000000..117b388
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/ProjectLeaderController.java
@@ -0,0 +1,102 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.projectleader;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
+
+import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
+
+import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import com.chanko.yunxi.mes.module.heli.controller.admin.projectleader.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectleader.ProjectLeaderDO;
+import com.chanko.yunxi.mes.module.heli.service.projectleader.ProjectLeaderService;
+
+@Tag(name = "管理后台 - 项目负责人配置")
+@RestController
+@RequestMapping("/heli/project-leader")
+@Validated
+public class ProjectLeaderController {
+
+    @Resource
+    private ProjectLeaderService projectLeaderService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建项目负责人配置")
+    @PreAuthorize("@ss.hasPermission('heli:project-leader:create')")
+    public CommonResult<Long> createProjectLeader(@Valid @RequestBody ProjectLeaderSaveReqVO createReqVO) {
+        return success(projectLeaderService.createProjectLeader(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新项目负责人配置")
+    @PreAuthorize("@ss.hasPermission('heli:project-leader:update')")
+    public CommonResult<Boolean> updateProjectLeader(@Valid @RequestBody ProjectLeaderSaveReqVO updateReqVO) {
+        projectLeaderService.updateProjectLeader(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除项目负责人配置")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:project-leader:delete')")
+    public CommonResult<Boolean> deleteProjectLeader(@RequestParam("id") Long id) {
+        projectLeaderService.deleteProjectLeader(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得项目负责人配置")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:project-leader:query')")
+    public CommonResult<ProjectLeaderRespVO> getProjectLeader(@RequestParam("id") Long id) {
+        ProjectLeaderDO projectLeader = projectLeaderService.getProjectLeader(id);
+        return success(BeanUtils.toBean(projectLeader, ProjectLeaderRespVO.class));
+    }
+    @GetMapping("/getType")
+    @Operation(summary = "获得项目负责人配置")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:project-leader:query')")
+    public CommonResult<ProjectLeaderRespVO> getProjectLeaderType(@RequestParam("type") Long type) {
+        ProjectLeaderDO projectLeader = projectLeaderService.getProjectLeaderType(type);
+        return success(BeanUtils.toBean(projectLeader, ProjectLeaderRespVO.class));
+    }
+    @GetMapping("/page")
+    @Operation(summary = "获得项目负责人配置分页")
+    @PreAuthorize("@ss.hasPermission('heli:project-leader:query')")
+    public CommonResult<PageResult<ProjectLeaderRespVO>> getProjectLeaderPage(@Valid ProjectLeaderPageReqVO pageReqVO) {
+        PageResult<ProjectLeaderDO> pageResult = projectLeaderService.getProjectLeaderPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ProjectLeaderRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出项目负责人配置 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:project-leader:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProjectLeaderExcel(@Valid ProjectLeaderPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ProjectLeaderDO> list = projectLeaderService.getProjectLeaderPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "项目负责人配置.xls", "数据", ProjectLeaderRespVO.class,
+                        BeanUtils.toBean(list, ProjectLeaderRespVO.class));
+    }
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderPageReqVO.java
new file mode 100644
index 0000000..ff1cf37
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderPageReqVO.java
@@ -0,0 +1,31 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.projectleader.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 项目负责人配置分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProjectLeaderPageReqVO extends PageParam {
+
+    @Schema(description = "项目负责人类型", example = "2")
+    private String type;
+
+    @Schema(description = "负责人")
+    private String owner;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderRespVO.java
new file mode 100644
index 0000000..e5b9f1c
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderRespVO.java
@@ -0,0 +1,43 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.projectleader.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat;
+import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 项目负责人配置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ProjectLeaderRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6163")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "项目负责人类型", example = "2")
+    @ExcelProperty(value = "项目负责人类型", converter = DictConvert.class)
+    @DictFormat("he_project_leader") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private String type;
+
+    @Schema(description = "负责人")
+    @ExcelProperty("负责人")
+    private Long owner;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+    @Schema(description = "负责人名称")
+    private String ownerName;
+    @Schema(description = "负责人账号")
+    private String userName;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderSaveReqVO.java
new file mode 100644
index 0000000..81a39e4
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectleader/vo/ProjectLeaderSaveReqVO.java
@@ -0,0 +1,25 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.projectleader.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+
+@Schema(description = "管理后台 - 项目负责人配置新增/修改 Request VO")
+@Data
+public class ProjectLeaderSaveReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6163")
+    private Long id;
+
+    @Schema(description = "项目负责人类型", example = "2")
+    private String type;
+
+    @Schema(description = "负责人")
+    private String owner;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderRespVO.java
index c5d3b15..aa257f6 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderRespVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderRespVO.java
@@ -51,7 +51,8 @@ public class ProjectOrderRespVO {
     @Schema(description = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
     @ExcelProperty("项目名称")
     private String projectName;
-
+    @Schema(description = "项目简码", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    private String projectNameSim;
     @Schema(description = "业务线", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty(value = "业务线", converter = DictConvert.class)
     @DictFormat("heli_business_line") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java
index 415996b..c2ede3c 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java
@@ -41,7 +41,9 @@ public class ProjectOrderSaveReqVO {
     @Schema(description = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
     @NotEmpty(message = "项目名称不能为空")
     private String projectName;
-
+    @Schema(description = "项目简码", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "项目简码不能为空")
+    private String projectNameSim;
     @Schema(description = "业务线", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "业务线不能为空")
     private String businessLine;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSubPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSubPageReqVO.java
index 89c88ef..be3d45f 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSubPageReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSubPageReqVO.java
@@ -23,4 +23,8 @@ public class ProjectOrderSubPageReqVO extends PageParam {
 
     @Schema(description = "子项目名称", example = "赵六")
     private String projectSubName;
+    @Schema(description = "子项目简码", example = "赵六")
+    private String nameSim;
+    @Schema(description = "客户简称", example = "赵六")
+    private String customerName;
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java
index bc42c3c..2da2399 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java
@@ -37,7 +37,8 @@ public class StorageRespVO {
     @Schema(description = "入/出库单号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("入/出库单号")
     private String stockNo;
-
+    @Schema(description = "领料人")
+    private Long materialReceiver;
     @Schema(description = "上游单号")
     @ExcelProperty("上游单号")
     private String headerNo;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java
index 1aec35c..427641d 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java
@@ -27,7 +27,8 @@ public class StorageSaveReqVO {
 
     @Schema(description = "入/出库单号", requiredMode = Schema.RequiredMode.REQUIRED)
     private String stockNo;
-
+    @Schema(description = "领料人" )
+    private String materialReceiver;
     @Schema(description = "上游单号")
     private String headerNo;
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectleader/ProjectLeaderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectleader/ProjectLeaderDO.java
new file mode 100644
index 0000000..5e4ed74
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectleader/ProjectLeaderDO.java
@@ -0,0 +1,55 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.projectleader;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 项目负责人配置 DO
+ *
+ * @author 管理员
+ */
+@TableName("base_project_leader")
+@KeySequence("base_project_leader_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProjectLeaderDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 项目负责人类型
+     *
+     * 枚举 {@link TODO he_project_leader 对应的类}
+     */
+    private String type;
+    /**
+     * 负责人
+     */
+    private String owner;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 负责人名称
+     */
+    @TableField(exist = false)
+    private String ownerName;
+    /**
+     * 负责人账号
+     */
+    @TableField(exist = false)
+    private String userName;
+
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
index 659bfab..4a05525 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
@@ -66,6 +66,10 @@ public class ProjectOrderDO extends BaseDO {
      * 项目名称
      */
     private String projectName;
+    /**
+     * 项目简码
+     */
+    private String projectNameSim;
     /**
      * 业务线
      *
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java
index d603f15..c8261f3 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java
@@ -37,6 +37,10 @@ public class ProjectOrderSubDO extends BaseDO {
      * 子项目名称，唯一
      */
     private String name;
+    /**
+     * 子项目简码
+     */
+    private String nameSim;
     /**
      * 设备型号
      */
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java
index ce24743..dd67d26 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java
@@ -62,6 +62,10 @@ public class  StorageDO extends BaseDO {
      * 备注
      */
     private String description;
+    /**
+     * 领料人
+     */
+    private String materialReceiver;
     /**
      * 状态：1为保存；2为提交；3为作废
      *
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectleader/ProjectLeaderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectleader/ProjectLeaderMapper.java
new file mode 100644
index 0000000..04fd2ad
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectleader/ProjectLeaderMapper.java
@@ -0,0 +1,46 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.projectleader;
+
+import java.util.*;
+
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectleader.ProjectLeaderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.ibatis.annotations.Mapper;
+import com.chanko.yunxi.mes.module.heli.controller.admin.projectleader.vo.*;
+import org.springframework.util.StringUtils;
+
+/**
+ * 项目负责人配置 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface ProjectLeaderMapper extends BaseMapperX<ProjectLeaderDO> {
+
+    default PageResult<ProjectLeaderDO> selectPage(ProjectLeaderPageReqVO reqVO) {
+        MPJLambdaWrapper<ProjectLeaderDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(ProjectLeaderDO.class)
+                .select("a.nickname as ownerName")
+                .leftJoin(AdminUserDO.class,"a",AdminUserDO::getId,ProjectLeaderDO::getOwner);
+        query.eq(!StringUtils.isEmpty(reqVO.getType()), ProjectLeaderDO::getType, reqVO.getType());
+        return selectPage(reqVO, query);
+
+    }
+
+    default ProjectLeaderDO getProjectLeaderType(Long type){
+        MPJLambdaWrapper<ProjectLeaderDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(ProjectLeaderDO.class)
+                .select("a.nickname as ownerName,a.username as userName")
+                .leftJoin(AdminUserDO.class,"a",AdminUserDO::getId,ProjectLeaderDO::getOwner)
+                        .orderByDesc( ProjectLeaderDO::getCreateTime)
+                                .last("limit 1");
+        query.eq(ProjectLeaderDO::getType, type);
+        return selectOne(query);
+    }
+}
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java
index 1b1aac7..151f613 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java
@@ -122,7 +122,8 @@ public interface ProjectOrderSubMapper extends BaseMapperX<ProjectOrderSubDO> {
                 .like(!StringUtils.isEmpty(pageReqVO.getProjectCode()), ProjectOrderDO::getCode, pageReqVO.getProjectCode())
                 .like(!StringUtils.isEmpty(pageReqVO.getProjectName()), ProjectOrderDO::getProjectName, pageReqVO.getProjectName())
                 .like(!StringUtils.isEmpty(pageReqVO.getProjectSubName()), ProjectOrderSubDO::getName, pageReqVO.getProjectSubName())
-                .like(!StringUtils.isEmpty(pageReqVO.getProjectSubCode()), PlanSubDO::getProjectSubCode, pageReqVO.getProjectSubCode());
+                .like(!StringUtils.isEmpty(pageReqVO.getProjectSubCode()), PlanSubDO::getProjectSubCode, pageReqVO.getProjectSubCode())
+                .like(!StringUtils.isEmpty(pageReqVO.getCustomerName()), CustomerDO::getName, pageReqVO.getCustomerName());
 
         return selectPage(pageReqVO, query);
     }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectleader/ProjectLeaderService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectleader/ProjectLeaderService.java
new file mode 100644
index 0000000..6311dcb
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectleader/ProjectLeaderService.java
@@ -0,0 +1,56 @@
+package com.chanko.yunxi.mes.module.heli.service.projectleader;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.projectleader.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectleader.ProjectLeaderDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+
+/**
+ * 项目负责人配置 Service 接口
+ *
+ * @author 管理员
+ */
+public interface ProjectLeaderService {
+
+    /**
+     * 创建项目负责人配置
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createProjectLeader(@Valid ProjectLeaderSaveReqVO createReqVO);
+
+    /**
+     * 更新项目负责人配置
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateProjectLeader(@Valid ProjectLeaderSaveReqVO updateReqVO);
+
+    /**
+     * 删除项目负责人配置
+     *
+     * @param id 编号
+     */
+    void deleteProjectLeader(Long id);
+
+    /**
+     * 获得项目负责人配置
+     *
+     * @param id 编号
+     * @return 项目负责人配置
+     */
+    ProjectLeaderDO getProjectLeader(Long id);
+
+    /**
+     * 获得项目负责人配置分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 项目负责人配置分页
+     */
+    PageResult<ProjectLeaderDO> getProjectLeaderPage(ProjectLeaderPageReqVO pageReqVO);
+
+    ProjectLeaderDO getProjectLeaderType(Long type);
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectleader/ProjectLeaderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectleader/ProjectLeaderServiceImpl.java
new file mode 100644
index 0000000..0ad2acf
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectleader/ProjectLeaderServiceImpl.java
@@ -0,0 +1,79 @@
+package com.chanko.yunxi.mes.module.heli.service.projectleader;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.projectleader.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectleader.ProjectLeaderDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
+
+import com.chanko.yunxi.mes.module.heli.dal.mysql.projectleader.ProjectLeaderMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 项目负责人配置 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class ProjectLeaderServiceImpl implements ProjectLeaderService {
+
+    @Resource
+    private ProjectLeaderMapper projectLeaderMapper;
+
+    @Override
+    public Long createProjectLeader(ProjectLeaderSaveReqVO createReqVO) {
+        // 插入
+        ProjectLeaderDO projectLeader = BeanUtils.toBean(createReqVO, ProjectLeaderDO.class);
+        projectLeaderMapper.insert(projectLeader);
+        // 返回
+        return projectLeader.getId();
+    }
+
+    @Override
+    public void updateProjectLeader(ProjectLeaderSaveReqVO updateReqVO) {
+        // 校验存在
+        validateProjectLeaderExists(updateReqVO.getId());
+        // 更新
+        ProjectLeaderDO updateObj = BeanUtils.toBean(updateReqVO, ProjectLeaderDO.class);
+        projectLeaderMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteProjectLeader(Long id) {
+        // 校验存在
+        validateProjectLeaderExists(id);
+        // 删除
+        projectLeaderMapper.deleteById(id);
+    }
+
+    private void validateProjectLeaderExists(Long id) {
+        if (projectLeaderMapper.selectById(id) == null) {
+            throw exception(PROJECT_LEADER_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ProjectLeaderDO getProjectLeader(Long id) {
+        return projectLeaderMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ProjectLeaderDO> getProjectLeaderPage(ProjectLeaderPageReqVO pageReqVO) {
+        return projectLeaderMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public ProjectLeaderDO getProjectLeaderType(Long type) {
+        return projectLeaderMapper.getProjectLeaderType(type);
+    }
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
index a8a6742..4677a02 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
@@ -116,11 +116,14 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
         createReqVO.setOrderTime(LocalDateTime.now());
         ProjectOrderDO projectOrder = BeanUtils.toBean(createReqVO, ProjectOrderDO.class);
         // 月度流水号
-        SerialNumberDO serialNumberDO = serialNumberService.getSerialNumber(BusinesTypeEnum.PROJECT_ORDER.name(), new SimpleDateFormat("yyyyMM").format(new Date()));
+//        SerialNumberDO serialNumberDO = serialNumberService.getSerialNumber(BusinesTypeEnum.PROJECT_ORDER.name(), new SimpleDateFormat("yyyyMM").format(new Date()));
+//        serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1);
+//         月度流水号
+        SerialNumberDO serialNumberDO = serialNumberService.getSerialNumberPerAnnum(BusinesTypeEnum.PROJECT_ORDER.name());
         serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1);
         // 客户编号
-        CustomerDO customer = customerService.getCustomer(projectOrder.getCustomerId());
-        projectOrder.setCode(PROJECT_ORDER.getCode(customer.getCode(), serialNumberDO.getSerialNumber().toString()));
+//        CustomerDO customer = customerService.getCustomer(projectOrder.getCustomerId());
+        projectOrder.setCode(PROJECT_ORDER.getProjectOrderCode(serialNumberDO.getSerialNumber().toString()));
         projectOrder.setOrderStatus(ProjectOrderStatusEnum.valueOf(createReqVO.getActive()).getCode());
         projectOrderMapper.insert(projectOrder);
 
@@ -280,11 +283,16 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
         //报价生成启动单后再更新时需要生成订单编号
         if(updateObj.getCode()==null){
             // 月度流水号
-            SerialNumberDO serialNumberDO = serialNumberService.getSerialNumber(BusinesTypeEnum.PROJECT_ORDER.name(), new SimpleDateFormat("yyyyMM").format(new Date()));
+//            SerialNumberDO serialNumberDO = serialNumberService.getSerialNumber(BusinesTypeEnum.PROJECT_ORDER.name(), new SimpleDateFormat("yyyyMM").format(new Date()));
+//            serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1);
+//            // 客户编号
+//            CustomerDO customer = customerService.getCustomer(updateObj.getCustomerId());
+//            updateObj.setCode(PROJECT_ORDER.getCode(customer.getCode(), serialNumberDO.getSerialNumber().toString()));
+            SerialNumberDO serialNumberDO = serialNumberService.getSerialNumberPerAnnum(BusinesTypeEnum.PROJECT_ORDER.name());
             serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1);
             // 客户编号
-            CustomerDO customer = customerService.getCustomer(updateObj.getCustomerId());
-            updateObj.setCode(PROJECT_ORDER.getCode(customer.getCode(), serialNumberDO.getSerialNumber().toString()));
+//        CustomerDO customer = customerService.getCustomer(projectOrder.getCustomerId());
+            updateObj.setCode(PROJECT_ORDER.getProjectOrderCode(serialNumberDO.getSerialNumber().toString()));
             // 回写序列记录
             serialNumberService.updateSerialNumber(serialNumberDO);
         }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberService.java
index 01bd55a..53cf988 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberService.java
@@ -67,4 +67,11 @@ public interface SerialNumberService {
      * @return
      */
     SerialNumberDO getSerialNumber(String businessType, String segment);
+
+    /**
+     * 获取序列号记录(按年)
+     * @param businessType
+     * @return
+     */
+    SerialNumberDO getSerialNumberPerAnnum(String businessType);
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberServiceImpl.java
index b8d68ce..5fa7814 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberServiceImpl.java
@@ -105,5 +105,30 @@ public class SerialNumberServiceImpl implements SerialNumberService {
         return serialNumberDO;
     }
 
-
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public SerialNumberDO getSerialNumberPerAnnum(String businessType) {
+        String format = new SimpleDateFormat("yyyy").format(new Date());
+        LambdaQueryWrapperX<SerialNumberDO> query = new LambdaQueryWrapperX<SerialNumberDO>() {{
+            eq(SerialNumberDO::getBusinessType, businessType);
+            eq(SerialNumberDO::getSegment, format);
+            last("LIMIT 1 FOR UPDATE");
+        }};
+        SerialNumberDO serialNumberDO = serialNumberMapper.selectOne(query);
+        if(serialNumberDO == null){
+            // 初始化一条数据
+            try {
+                serialNumberDO = new SerialNumberDO();
+                serialNumberDO.setBusinessType(businessType)
+                        .setSegment(format)
+                        .setSerialNumber(0l);
+                serialNumberMapper.insert(serialNumberDO);
+            }catch (Exception e){
+                // do nothing
+            }
+            // 二次获取
+            serialNumberDO = serialNumberMapper.selectOne(query);
+        }
+        return serialNumberDO;
+    }
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/projectleader/ProjectLeaderMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/projectleader/ProjectLeaderMapper.xml
new file mode 100644
index 0000000..325f3fd
--- /dev/null
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/projectleader/ProjectLeaderMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chanko.yunxi.mes.module.heli.dal.mysql.projectleader.ProjectLeaderMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/projectleader/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/projectleader/index.ts
new file mode 100644
index 0000000..8dfd532
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/projectleader/index.ts
@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+export interface ProjectLeaderVO {
+  id: number
+  type: string
+  owner: string
+  remark: string
+}
+
+// 查询项目负责人配置分页
+export const getProjectLeaderPage = async (params) => {
+  return await request.get({ url: `/heli/project-leader/page`, params })
+}
+
+// 查询项目负责人配置详情
+export const getProjectLeader = async (id: number) => {
+  return await request.get({ url: `/heli/project-leader/get?id=` + id })
+}
+//根据类型查询项目负责人
+export const getProjectLeaderType = async (type: number) => {
+  return await request.get({ url: `/heli/project-leader/getType?type=` + type })
+}
+// 新增项目负责人配置
+export const createProjectLeader = async (data: ProjectLeaderVO) => {
+  return await request.post({ url: `/heli/project-leader/create`, data })
+}
+
+// 修改项目负责人配置
+export const updateProjectLeader = async (data: ProjectLeaderVO) => {
+  return await request.put({ url: `/heli/project-leader/update`, data })
+}
+
+// 删除项目负责人配置
+export const deleteProjectLeader = async (id: number) => {
+  return await request.delete({ url: `/heli/project-leader/delete?id=` + id })
+}
+
+// 导出项目负责人配置 Excel
+export const exportProjectLeader = async (params) => {
+  return await request.download({ url: `/heli/project-leader/export-excel`, params })
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
index 9bd25bd..f0c7d0f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
@@ -278,7 +278,8 @@ export enum DICT_TYPE {
 	HELI_PLANTYPE = 'heli_planType',//生产进度报表中生产状态
 	HELI_PG_PLANTYPE = 'heli_pg_planType',//生产进度报表中派工是否完成状态
   HELI_GRADE='heli_grade',
-  HELI_CGTYPE='heli_cgType'
+  HELI_CGTYPE='heli_cgType',
+  HELI_PROJECT_LEADER='heli_project_leader'
 
 
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue
index 77a5a5b..9a092a4 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue
@@ -33,7 +33,7 @@
 		  </el-col>
 		  <el-col :span="6">
 		    <el-form-item label="业务员" prop="salesman">
-          <el-select class="!w-265px" v-model="formData.salesman"  clearable @update:new-value="handleSelectedUser">
+          <el-select class="!w-265px" v-model="formData.salesman"  clearable @update:new-value="handleSelectedUser" filterable>
             <el-option
 v-for="dict in userInit" :key="dict.id"
                        :label="dict.username+' '+dict.nickname" :value="dict.id" />
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/MasterForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/MasterForm.vue
index ad8bd1b..1905c45 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/MasterForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/MasterForm.vue
@@ -12,7 +12,7 @@
 
       <el-form-item label="借用人" prop="jyUser">
 <!--        <el-input v-model="formData.jyUser" placeholder="请输入借用人" />-->
-        <el-select v-model="formData.jyUser"  placeholder="请选择借用人">
+        <el-select v-model="formData.jyUser"  placeholder="请选择借用人" filterable>
           <el-option
             v-for="user in userList"
             :key="user.id"
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue
index b6ff2a1..730b26f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue
@@ -14,7 +14,7 @@
         <el-input disabled v-model="formData.code" placeholder="系统自动生成" class="!w-250px" />
       </el-form-item>
       <el-form-item label="物料名称" prop="name">
-        <el-input :disabled="formType == 'update'" v-model="formData.name" placeholder="请输入物料名称" class="!w-250px" />
+        <el-input  v-model="formData.name" placeholder="请输入物料名称" class="!w-250px" />
       </el-form-item>
       <el-form-item label="物料类型" prop="materialType">
         <el-select v-model="formData.materialType" clearable placeholder="请选择物料类型" class="!w-250px">
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
index e9bb3b6..f7de722 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
@@ -35,7 +35,11 @@
                         <el-option v-for="dict in userInit" :key="dict.id"
                           :label="dict.username+' '+dict.nickname" :value="dict.id" />
                       </el-select> -->
-                       <UserSelect v-model="formData.projectOwner"  @update:new-value="handleSelectedUser1" class="!w-265px"/>
+<!--                       <UserSelect v-model="formData.projectOwner"  @update:new-value="handleSelectedUser1" class="!w-265px"/>-->
+                      <el-select class="!w-265px" v-model="formData.projectOwner" clearable   filterable>
+                        <el-option v-for="dict in userInit" :key="dict.id"
+                                   :label="dict.username+'  '+dict.nickname" :value="dict.id" />
+                      </el-select>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -379,7 +383,7 @@ class="!w-265px" v-model="row.blankDate" type="date" value-format="x"
                     <template #header>毛坯负责人</template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.blankOwner`" class="mb-0px!">
-                     <el-select class="!w-265px" v-model="row.blankOwner" clearable  @update:new-value="handleSelectedUser6($index,$event)" @change="handleDateChange($index, row.startBlankDate,row.blankDate,'1',row.blankOwner,row.id)" >
+                     <el-select class="!w-265px" v-model="row.blankOwner" clearable  @update:new-value="handleSelectedUser6($index,$event)" @change="handleDateChange($index, row.startBlankDate,row.blankDate,'1',row.blankOwner,row.id)" filterable>
                           <el-option v-for="dict in userInit" :key="dict.id"
                             :label="dict.username+'  '+dict.nickname" :value="dict.id" />
                         </el-select>
@@ -416,7 +420,7 @@ class="!w-265px" v-model="row.twoDimDate" type="date" value-format="x"
                     <template #header>2D负责人</template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.twoDimOwner`" class="mb-0px!">
-                     <el-select class="!w-265px" v-model="row.twoDimOwner"  clearable @update:new-value="handleSelectedUser7($index,$event)" @change="handleDateChange($index, row.startTwoDimDate,row.twoDimDate,'2',row.twoDimOwner,row.id)">
+                     <el-select class="!w-265px" v-model="row.twoDimOwner"  clearable @update:new-value="handleSelectedUser7($index,$event)" @change="handleDateChange($index, row.startTwoDimDate,row.twoDimDate,'2',row.twoDimOwner,row.id)" filterable>
                           <el-option v-for="dict in userInit" :key="dict.id"
                             :label="dict.username+' '+dict.nickname" :value="dict.id" />
                         </el-select>
@@ -449,7 +453,7 @@ class="!w-265px" v-model="row.threeDimDate" type="date" value-format="x"
                     <template #header>3D负责人</template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.threeDimOwner`" class="mb-0px!">
-                        <el-select class="!w-265px" v-model="row.threeDimOwner" clearable @update:new-value="handleSelectedUser8($index,$event)" @change="handleDateChange($index, row.startThreeDimDate,row.threeDimDate,'3',row.threeDimOwner,row.id)">
+                        <el-select class="!w-265px" v-model="row.threeDimOwner" clearable @update:new-value="handleSelectedUser8($index,$event)" @change="handleDateChange($index, row.startThreeDimDate,row.threeDimDate,'3',row.threeDimOwner,row.id)" filterable>
                           <el-option v-for="dict in userInit" :key="dict.id"
                             :label="dict.username+' '+dict.nickname" :value="dict.id" />
                         </el-select>
@@ -504,7 +508,7 @@ style="width: 100%" v-model="row.endDate" type="date" value-format="x"
                 <el-table-column min-width="150" label="责任人" align="center">
                   <template #default="{ row, $index }">
                     <el-form-item :prop="`${$index}.owner`" class="mb-0px!">
-                       <el-select style="width: 100%" v-model="row.owner"  clearable filterable  @update:new-value="handleSelectedUser9($index,$event)" v-if="row.name!='检验'&&row.name!='预验收'">
+                       <el-select style="width: 100%" v-model="row.owner"  clearable filterable  @update:new-value="handleSelectedUser9($index,$event)" v-if="row.name!='检验'&&row.name!='预验收'&&row.name!='装配'">
                           <el-option v-for="dict in mergedArray" :key="dict.id"
                             :label="dict.username+' '+dict.nickname" :value="dict.id" />
                         </el-select>
@@ -512,6 +516,10 @@ style="width: 100%" v-model="row.endDate" type="date" value-format="x"
                         <el-option v-for="dict in userInit2" :key="dict.id"
                                    :label="dict.username+' '+dict.nickname" :value="dict.id" />
                       </el-select>
+                      <el-select style="width: 100%" v-model="row.owner"  clearable filterable  @update:new-value="handleSelectedUser9($index,$event)" v-if="row.name=='装配'">
+                        <el-option v-for="dict in mergedArray1" :key="dict.id"
+                                   :label="dict.username+' '+dict.nickname" :value="dict.id" />
+                      </el-select>
 <!--                          <UserSelect v-model="row.owner"  @update:new-value="handleSelectedUser9($index,$event)" class="!w-265px"/>-->
                     </el-form-item>
                   </template>
@@ -577,6 +585,7 @@ import * as MouldTypeApi from '@/api/heli/mouldtype'
 import { getOperateLogPage } from '@/api/system/operatelog'
 import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue'
 import EquipSelect from '@/views/heli/hlvuestyle/equipSelect.vue'
+import * as ProjectLeaderApi from "@/api/heli/projectleader";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -1565,11 +1574,11 @@ const userInit1 = ref()
 const userInit2= ref()
 const userInit3= ref()
 const mergedArray= ref()
+const mergedArray1= ref()
 const equipInit = ref()
 const mouldTypeList = ref()
 const customerInit = ref()
 onMounted(async () => {
-
   //用户列表数据
   userInit.value = await UserApi.getDeptName("设计部")
   userInit1.value = await UserApi.getDeptName("生产部")
@@ -1583,9 +1592,14 @@ onMounted(async () => {
   // 获取库存信息
   formData.value = await PlanApi.getPlan(query.id)
   formData.value.hasCraft = 1
-
+  const  zp = await ProjectLeaderApi.getProjectLeaderType(4)
+  mergedArray1.value = [...userInit1.value, ...userInit3.value];
+  if (zp) { // 自动过滤 null/undefined
+    console.log(zp)
+    mergedArray1.value.push({ id: zp.owner, username: zp.userName, nickname: zp.ownerName });
+    console.log(mergedArray1.value)
+  }
   await handleInitPlanSub()
-
   var projectInit = await ProjectOrderApi.getProjectOrder(formData.value.projectId)
   customerInit.value = await CustomerApi.getCustomer(projectInit.customerId)
   var businessManInit = await UserApi.getUser(projectInit.businessMan)
@@ -1619,6 +1633,33 @@ onMounted(async () => {
   } else {
     formData.value.craftInfos = eval(formData.value.craftContent)
   }
+  // 计划编制人
+if (formData.value.editor==null||formData.value.editor==undefined){
+  var newVar = await ProjectLeaderApi.getProjectLeaderType(1);
+  formData.value.editor = newVar.owner
+}
+// 计划审核人
+  if (formData.value.auditor==null||formData.value.auditor==undefined){
+    const  newVar =   await ProjectLeaderApi.getProjectLeaderType(2)
+    formData.value.auditor =newVar.owner
+  }
+  // 计划批准人
+  if (formData.value.approver==null||formData.value.approver==undefined){
+    const  newVar = await ProjectLeaderApi.getProjectLeaderType(3)
+    formData.value.approver =newVar.owner
+  }
+  //装配的负责人
+  const  craftInfos = formData.value.craftInfos;
+  for (var i = 0; i < craftInfos.length; i++) {
+  if (craftInfos[i].name=='装配'){
+    if (craftInfos[i].owner==null||craftInfos[i].owner==undefined||craftInfos[i].owner==''){
+      if (zp!=null){
+        craftInfos[i].owner =zp.owner
+
+      }
+    }
+  }
+  }
 })
 
 //项目负责人
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectleader/ProjectLeaderForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectleader/ProjectLeaderForm.vue
new file mode 100644
index 0000000..8105f0d
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectleader/ProjectLeaderForm.vue
@@ -0,0 +1,110 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="150px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="项目负责人类型" prop="type">
+        <el-select v-model="formData.type" placeholder="请选择项目负责人类型">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_PROJECT_LEADER)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="负责人" prop="owner">
+        <UserSelect v-model="formData.owner" placeholder="请选择负责人" @update:newValue="handleSelectedUser" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as ProjectLeaderApi from '@/api/heli/projectleader'
+import UserSelect from "@/views/heli/hlvuestyle/userSelect.vue";
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as UserApi from "@/api/system/user";
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  type: undefined,
+  owner: undefined,
+  remark: undefined,
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ProjectLeaderApi.getProjectLeader(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+const handleSelectedUser = (newValue: any) => {
+  formData.value.owner = newValue?.id
+}
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ProjectLeaderApi.ProjectLeaderVO
+    if (formType.value === 'create') {
+      await ProjectLeaderApi.createProjectLeader(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProjectLeaderApi.updateProjectLeader(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    type: undefined,
+    owner: undefined,
+    remark: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectleader/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectleader/index.vue
new file mode 100644
index 0000000..c0c1e29
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectleader/index.vue
@@ -0,0 +1,214 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="150px"
+    >
+      <el-form-item label="项目负责人类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择项目负责人类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_PROJECT_LEADER)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="负责人" prop="owner">-->
+<!--        <el-select-->
+<!--          v-model="queryParams.owner"-->
+<!--          placeholder="请选择负责人"-->
+<!--          clearable-->
+<!--          class="!w-240px"-->
+<!--        >-->
+<!--          <el-option label="请选择字典生成" value="" />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="备注" prop="remark">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.remark"-->
+<!--          placeholder="请输入备注"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="创建时间" prop="createTime">-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.createTime"-->
+<!--          value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--          type="daterange"-->
+<!--          start-placeholder="开始日期"-->
+<!--          end-placeholder="结束日期"-->
+<!--          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['heli:project-leader:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          @click="handleExport"-->
+<!--          :loading="exportLoading"-->
+<!--          v-hasPermi="['heli:project-leader:export']"-->
+<!--        >-->
+<!--          <Icon icon="ep:download" class="mr-5px" /> 导出-->
+<!--        </el-button>-->
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="序号" type="index" width="80" />
+      <el-table-column label="项目负责人类型" align="center" prop="type">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_PROJECT_LEADER" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="负责人" align="center" prop="ownerName" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:project-leader:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['heli:project-leader:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ProjectLeaderForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import download from '@/utils/download'
+import * as ProjectLeaderApi from '@/api/heli/projectleader'
+import ProjectLeaderForm from './ProjectLeaderForm.vue'
+import * as UserApi from "@/api/system/user";
+
+defineOptions({ name: 'ProjectLeader' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: undefined,
+  owner: undefined,
+  remark: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProjectLeaderApi.getProjectLeaderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProjectLeaderApi.deleteProjectLeader(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProjectLeaderApi.exportProjectLeader(queryParams)
+    download.excel(data, '项目负责人配置.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 5659462..2b38c7d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -75,6 +75,15 @@ class="!w-250px" :disabled="alterDisabled || detailDisabled || priceDisabled"
 										</el-form-item>
 									</el-col>
 								</el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="项目简码" prop="projectNameSim">
+                      <el-input
+                        class="!w-250px" :disabled="alterDisabled || detailDisabled || priceDisabled"
+                        v-model="formData.projectNameSim" placeholder="请输入项目简码" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
 								<el-row>
 									<el-col :span="24">
 										<el-form-item label="项目开始日期" prop="projectStartTime">
@@ -165,7 +174,7 @@ v-model="formData.fiveFuKuan"
                       <el-tree-select
 class="!w-250px" v-model="formData.businessMan"
                                       :data="userList" :props="userProps" check-strictly node-key="id"
-                                      clearable placeholder="请选择业务员"
+                                      clearable placeholder="请选择业务员" filterable
                                       :disabled="alterDisabled || detailDisabled || priceDisabled" />
 <!--											<UserSelect :disabled="alterDisabled || detailDisabled || priceDisabled"-->
 <!--												v-model="formData.businessMan" @update:newValue="handleSelectedUser" />-->
@@ -186,6 +195,16 @@ class="!w-250px" v-model="formData.businessLine"
 										</el-form-item>
 									</el-col>
 								</el-row>
+                <el-row>
+                  <el-col :span="24">
+                    &ensp;
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    &ensp;
+                  </el-col>
+                </el-row>
 								<el-row>
 									<el-col :span="24">
 										<el-form-item label="项目结束日期" prop="projectEndTime">
@@ -405,7 +424,7 @@ class="!w-250px" :disabled="alterDisabled || detailDisabled || priceDisabled"
 						</el-row>
 						<el-row>
 							<el-col :span="24">
-								<el-form-item label="价格（元）" prop="price">
+								<el-form-item label="含税价格（元）" prop="price">
 									<div style="display: flex; align-items: center">
 										<el-input-number
 v-model="formData.price"
@@ -575,6 +594,18 @@ ref="projectOrderSubFormRef" :model="formData.projectOrderSubs"
 											</el-form-item>
 										</template>
 									</el-table-column>
+                  <el-table-column min-width="200" align="center">
+                    <template #header> <span class="hl-table_header">*</span>子项目简码 </template>
+                    <template #default="{ row, $index }">
+                      <el-form-item
+                        :prop="`${$index}.nameSim`" :rules="subFormRules.nameSim"
+                        class="mb-0px!">
+                        <el-input
+                          :disabled="detailDisabled || row.id || priceDisabled" v-model="row.nameSim"
+                          placeholder="请输入子项目简码" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
 									<el-table-column label="设备型号" min-width="150" align="center">
 										<!-- <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.deviceModel`" :rules="subFormRules.deviceModel" class="mb-0px!">
@@ -879,6 +910,7 @@ type="textarea" v-model="formData.activeOpinion" placeholder="请输入打回原
 		businessDeptId: undefined,
 		customerId: undefined,
 		projectName: undefined,
+    projectNameSim:undefined,
 		businessLine: undefined,
 		blueprintNo: undefined,
 		hasPrice: 1,
@@ -957,6 +989,11 @@ type="textarea" v-model="formData.activeOpinion" placeholder="请输入打回原
 			message: '项目名称不能为空',
 			trigger: 'blur'
 		}],
+    projectNameSim: [{
+      required: true,
+      message: '项目简码不能为空',
+      trigger: 'blur'
+    }],
 		businessLine: [{
 			required: true,
 			message: '所属业务线不能为空',
@@ -1026,6 +1063,11 @@ type="textarea" v-model="formData.activeOpinion" placeholder="请输入打回原
 			message: '子项目名称不能为空',
 			trigger: 'blur'
 		}],
+    nameSim: [{
+      required: true,
+      message: '子项目简码不能为空',
+      trigger: 'blur'
+    }],
 		amount: [{
 			required: true,
 			message: '数量不能为空',
@@ -1902,7 +1944,7 @@ type="textarea" v-model="formData.activeOpinion" placeholder="请输入打回原
 			detailDisabled.value = true
 		}
     if ('audit,approve'.indexOf(query.active) > -1){
-      auditDisabled.value = false
+      auditDisabled.value = true
     }
 		queryData(query.active, query.id)
 		// 绑定默认业务员
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index d15fff1..c1bce7b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -41,6 +41,8 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_OUT_TYPE_NEW)" :key="dic
               </el-col>
 
 
+
+
 			<el-col :span="24">
 			    <el-form-item v-if="show" prop="projectSubName" label="子项目名称">
 			 <el-input v-model="formData.projectSubName"  :disabled="ctrView || ctrSave" readonly>
@@ -50,8 +52,15 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_OUT_TYPE_NEW)" :key="dic
 			 </el-input>
 			    </el-form-item>
 			  </el-col>
-			</el-row>
 
+			</el-row>
+            <el-row>
+            <el-col :span="24">
+              <el-form-item label="领料人" prop="materialReceiver">
+                <UserSelect v-model="formData.materialReceiver"  placeholder="请选择领料人" @update:newValue="handleSelectedUser" class="!w-700px" :disabled="ctrView || ctrSave"/>
+              </el-form-item>
+            </el-col>
+            </el-row>
 
 
 
@@ -421,6 +430,7 @@ import * as UserApi from '@/api/system/user'
 import materials from './materials.vue'
 import projects from './subproject.vue'
 import { Search, } from '@element-plus/icons-vue'
+import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue'
 const reload: any = inject('reload')
 const showZF = ref(true);
 const { t } = useI18n() // 国际化
@@ -438,6 +448,7 @@ const formData = ref({
   stockType: 2,
   stockInType: 1,
   projectSubName:undefined,
+  materialReceiver:undefined,
   pickmode:undefined,
   pickcar:undefined,
   projectNo:undefined,
@@ -728,6 +739,9 @@ const handleStatus = async (num) => {
   }
 
 }
+const handleSelectedUser = (newValue: any) => {
+  formData.value.materialReceiver = newValue?.id
+}
 const handleClick = (event) => {
   openProjectOrderDialog()
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue
index d9d50e6..2a27c05 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue
@@ -51,7 +51,13 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_OUT_TYPE)" :key="dict.va
 			    </el-form-item>
 			  </el-col>
 			</el-row>
-
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="领料人" prop="materialReceiver">
+                  <UserSelect v-model="formData.materialReceiver"  placeholder="请选择领料人" @update:newValue="handleSelectedUser" class="!w-700px" :disabled="ctrView || ctrSave"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
 
 
@@ -409,6 +415,7 @@ import * as UserApi from '@/api/system/user'
 
 import materials from './materials.vue'
 import projects from './subproject.vue'
+import UserSelect from "@/views/heli/hlvuestyle/userSelect.vue";
 
 const reload: any = inject('reload')
 
@@ -492,7 +499,9 @@ const openProjectForm = (scope) => {
   proOpenFormRef.value.open(scope)
 }
 
-
+const handleSelectedUser = (newValue: any) => {
+  formData.value.materialReceiver = newValue?.id
+}
 const getList = async (arrMat) => {
 
   arrMat.forEach((row) => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/subproject.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/subproject.vue
index 2c4667b..7807b08 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/subproject.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/subproject.vue
@@ -3,13 +3,16 @@
     <ContentWrap class="borderxx">
       <el-form class="-mb-15px" :model="queryReqVo" :inline="true" label-width="108px">
         <el-form-item label=" 项目编号：" label-width="150px">
-          <el-input v-model="queryReqVo.projectCode" placeholder="项目编号" class="!w-240px" v-bind:disabled="!chkboxEnable" />
+          <el-input v-model="queryReqVo.projectCode" placeholder="项目编号" class="!w-200px" v-bind:disabled="!chkboxEnable" clearable />
         </el-form-item>
         <el-form-item label=" 项目名称：" label-width="150px">
-          <el-input v-model="queryReqVo.projectName" placeholder="项目名称" class="!w-240px" v-bind:disabled="!chkboxEnable" />
+          <el-input v-model="queryReqVo.projectName" placeholder="项目名称" class="!w-200px" v-bind:disabled="!chkboxEnable" clearable />
         </el-form-item>
         <el-form-item label="子项目名称">
-          <el-input v-model="queryReqVo.projectSubName" placeholder="子项目名称" class="!w-240px" v-bind:disabled="!chkboxEnable" />
+          <el-input v-model="queryReqVo.projectSubName" placeholder="子项目名称" class="!w-200px" v-bind:disabled="!chkboxEnable" clearable />
+        </el-form-item>
+        <el-form-item label="客户简称">
+          <el-input v-model="queryReqVo.customerName" placeholder="客户简称" class="!w-200px" v-bind:disabled="!chkboxEnable"  clearable/>
         </el-form-item>
         <el-form-item>
           <el-button @click="handleQuery" type="primary" v-bind:disabled="!chkboxEnable">
@@ -23,8 +26,9 @@
     <el-card class="hl-table">
       <el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" :reserve-selection="true" selection min-width="1800">
         <el-table-column type="selection" width="55" />
-        <el-table-column label="序号" type="index" min-width="120" align="center" />
+        <el-table-column label="序号" type="index" min-width="30" align="center" />
         <el-table-column prop="projectCode" label="项目编号" min-width="120" align="center" />
+        <el-table-column prop="customerName" label="客户简称" min-width="140" align="center" />
         <el-table-column prop="projectName" label="项目名称" min-width="140" align="center" />
         <el-table-column prop="projectSubName" label="子项目名称" min-width="120" align="center" />
       </el-table>
@@ -84,7 +88,8 @@ const queryReqVo: any = reactive({
   pageSize: 10,
   projectCode: undefined,
   projectName: undefined,
-  projectSubName: undefined
+  projectSubName: undefined,
+  customerName:undefined
 })
 /** 搜索按钮操作 */
 const handleQuery = async () => {
@@ -96,6 +101,7 @@ const resetQuery = () => {
   queryReqVo.projectCode = ''
   queryReqVo.projectName = ''
   queryReqVo.projectSubName = ''
+  queryReqVo.customerName=''
   handleQuery()
 }