diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskPageReqVO.java index 2e4abb863..e4b42653c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskPageReqVO.java @@ -21,6 +21,15 @@ public class TaskPageReqVO extends PageParam { @Schema(description = "编码") private String code; + @Schema(description = "任务单名称") + private String taskName; + + @Schema(description = "客户ID") + private Long customerId; + + @Schema(description = "客户名称") + private String customerName; + @Schema(description = "下达日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] orderDate; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskRespVO.java index 35beb7949..e3a7dea10 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskRespVO.java @@ -22,6 +22,18 @@ public class TaskRespVO { @ExcelProperty("编码") private String code; + @Schema(description = "任务单名称", example = "订单生产任务") + @ExcelProperty("任务单名称") + private String taskName; + + @Schema(description = "客户ID", example = "1024") + @ExcelProperty("客户ID") + private Long customerId; + + @Schema(description = "客户名称", example = "某某客户") + @ExcelProperty("客户名称") + private String customerName; + @Schema(description = "下达日期") @ExcelProperty("下达日期") private LocalDateTime orderDate; @@ -82,4 +94,4 @@ public class TaskRespVO { private Long storedPlanNumber; -} \ No newline at end of file +} diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskSaveReqVO.java index 07b35d002..4be065de1 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskSaveReqVO.java @@ -23,6 +23,15 @@ public class TaskSaveReqVO { @Schema(description = "编码", requiredMode = Schema.RequiredMode.REQUIRED) private String code; + @Schema(description = "任务单名称", example = "订单生产任务") + private String taskName; + + @Schema(description = "客户ID", example = "1024") + private Long customerId; + + @Schema(description = "客户名称", example = "某某客户") + private String customerName; + @Schema(description = "下达日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime orderDate; @@ -59,4 +68,4 @@ public class TaskSaveReqVO { @Schema(description = "是否完成排产0-否 1-是 ", example = "1") private Integer isScheduled; -} \ No newline at end of file +} diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/task/TaskDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/task/TaskDO.java index 7308d042d..aa91d3a54 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/task/TaskDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/task/TaskDO.java @@ -33,6 +33,18 @@ public class TaskDO extends BaseDO { * 编码 */ private String code; + /** + * 任务单名称 + */ + private String taskName; + /** + * 客户ID + */ + private Long customerId; + /** + * 客户名称快照 + */ + private String customerName; /** * 下达日期 */ @@ -75,4 +87,4 @@ public class TaskDO extends BaseDO { @Schema(description = "任务单类型", example = "你猜") private String taskType; -} \ No newline at end of file +} diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/task/TaskMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/task/TaskMapper.java index a392d6c6e..33e8fb83d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/task/TaskMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/task/TaskMapper.java @@ -25,6 +25,9 @@ public interface TaskMapper extends BaseMapperX { default PageResult selectPage(TaskPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TaskDO::getCode, reqVO.getCode()) + .likeIfPresent(TaskDO::getTaskName, reqVO.getTaskName()) + .eqIfPresent(TaskDO::getCustomerId, reqVO.getCustomerId()) + .likeIfPresent(TaskDO::getCustomerName, reqVO.getCustomerName()) .betweenIfPresent(TaskDO::getOrderDate, reqVO.getOrderDate()) .betweenIfPresent(TaskDO::getDeliveryDate, reqVO.getDeliveryDate()) .eqIfPresent(TaskDO::getStatus, reqVO.getStatus()) @@ -39,6 +42,9 @@ public interface TaskMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TaskDO::getCode, reqVO.getCode()) + .likeIfPresent(TaskDO::getTaskName, reqVO.getTaskName()) + .eqIfPresent(TaskDO::getCustomerId, reqVO.getCustomerId()) + .likeIfPresent(TaskDO::getCustomerName, reqVO.getCustomerName()) .betweenIfPresent(TaskDO::getOrderDate, reqVO.getOrderDate()) .betweenIfPresent(TaskDO::getDeliveryDate, reqVO.getDeliveryDate()) .inIfPresent(TaskDO::getStatus, TaskStatusEnum.getEnablePlanStatus()) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java index 713bf103e..e5ceaa10f 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java @@ -23,6 +23,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.enums.CapacityT import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.PlanSaveReqVO; import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.PlanStatusEnum; import cn.iocoder.yudao.module.mes.controller.admin.task.vo.*; +import cn.iocoder.yudao.module.mes.dal.dataobject.customer.CrmCustomerDO; import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; import cn.iocoder.yudao.module.mes.dal.dataobject.organization.OrganizationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.plan.PlanDO; @@ -31,6 +32,7 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.task.TaskDetailDO; import cn.iocoder.yudao.module.mes.dal.dataobject.task.ViewTaskProductSummary; import cn.iocoder.yudao.module.mes.dal.mysql.baogongrecord.BaogongRecordMapper; import cn.iocoder.yudao.module.mes.dal.mysql.calholiday.CalHolidayMapper; +import cn.iocoder.yudao.module.mes.dal.mysql.customer.CrmCustomerMapper; import cn.iocoder.yudao.module.mes.dal.mysql.deviceledger.DeviceLedgerMapper; import cn.iocoder.yudao.module.mes.dal.mysql.organization.OrganizationMapper; import cn.iocoder.yudao.module.mes.dal.mysql.plan.PlanMapper; @@ -82,6 +84,8 @@ public class TaskServiceImpl implements TaskService { @Resource private TaskDetailMapper taskDetailMapper; @Resource + private CrmCustomerMapper customerMapper; + @Resource private MesNoRedisDAO noRedisDAO; @@ -127,6 +131,7 @@ public class TaskServiceImpl implements TaskService { public Long createTask(TaskSaveReqVO createReqVO) { // 插入 TaskDO task = BeanUtils.toBean(createReqVO, TaskDO.class); + fillCustomerName(task); if (StringUtils.isEmpty(task.getCode())) { // 1.4 生成订单号,并校验唯一性 @@ -158,6 +163,7 @@ public class TaskServiceImpl implements TaskService { validateTaskExists(updateReqVO.getId()); // 更新 TaskDO updateObj = BeanUtils.toBean(updateReqVO, TaskDO.class); + fillCustomerName(updateObj); taskMapper.updateById(updateObj); // 更新子表 @@ -186,6 +192,18 @@ public class TaskServiceImpl implements TaskService { } } + private void fillCustomerName(TaskDO task) { + if (task.getCustomerId() == null) { + task.setCustomerName(null); + return; + } + CrmCustomerDO customer = customerMapper.selectById(task.getCustomerId()); + if (customer == null) { + throw exception(CUSTOMER_NOT_EXISTS); + } + task.setCustomerName(customer.getName()); + } + @Override public List getTaskList(Collection ids) { if (CollUtil.isEmpty(ids)) {