From 799d46c5f995a09c8ee328d806e585858766a7da Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Mon, 15 Dec 2025 14:50:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0mes=E5=90=8C=E6=AD=A5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkOrderController.java | 20 ++++++++ .../controller/WorkPlanController.java | 5 +- .../scheduling/entity/WorkPlanEntity.java | 48 ++++++++++++++----- .../service/impl/WorkPlanServiceImpl.java | 2 + .../src/main/resources/application-dev.yml | 1 + 5 files changed, 61 insertions(+), 15 deletions(-) diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java index ab86042..23932b9 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java @@ -43,6 +43,7 @@ import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.scheduling.scheduling.dto.WorkOrderDto; import org.springblade.scheduling.scheduling.entity.WorkOrderEntity; import org.springblade.scheduling.scheduling.vo.WorkOrderVO; @@ -51,6 +52,7 @@ import org.springblade.scheduling.scheduling.service.IWorkOrderService; import org.springblade.scheduling.scheduling.wrapper.WorkOrderWrapper; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -191,4 +193,22 @@ public class WorkOrderController extends BladeController { return R.data(workOrderService.schedulingCount(workOrderDto)); } + /** + * 车间订单表 排产 + */ + @GetMapping("/sendToOldMesTest/{workOrderId}") + @Operation(summary = "排产统计", description = "传入WorkOrderDto") + public R sendToOldMesTest(@PathVariable Long workOrderId) { + List workOrderEntityList = new ArrayList<>(); + WorkOrderEntity workOrder = workOrderService.getById(workOrderId); + + if (ObjectUtil.isEmpty(workOrder)) { + return R.fail("未找到工单"); + } + + workOrderEntityList.add(workOrder); + workOrderService.sendWorkOrderToOldMes(workOrderEntityList); + return R.success(); + } + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkPlanController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkPlanController.java index 4dd0d0e..9e77b28 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkPlanController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkPlanController.java @@ -25,6 +25,7 @@ */ package org.springblade.scheduling.scheduling.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -162,8 +163,8 @@ public class WorkPlanController extends BladeController { */ @PostMapping("/updateWorkPlan") @Operation(summary = "更新作业计划", description = "") - public R updateWorkPlan(@RequestBody WorkPlanEntity entity) { - workPlanService.updateWorkPlan(entity.getId(), entity.getFactStartTime(), entity.getFactEndTime()); + public R updateWorkPlan(@RequestBody JSONObject entity) { + workPlanService.updateWorkPlan(entity.getLong("id"), entity.getDate("factStartTime"), entity.getDate("factEndTime")); return R.success(); } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkPlanEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkPlanEntity.java index 664ae9f..4bc4394 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkPlanEntity.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkPlanEntity.java @@ -25,16 +25,16 @@ */ package org.springblade.scheduling.scheduling.entity; -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableName; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.tenant.mp.TenantEntity; + import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; /** * 车间作业计划 实体类 @@ -47,6 +47,28 @@ import java.io.Serial; @Schema(description = "MesWorkPlan对象") @EqualsAndHashCode(callSuper = true) public class WorkPlanEntity extends BaseEntity { + /** + * TODO 工序状态要调整到常量类中 + * 工序状态：未开始 + */ + public static Integer STATUS_NO_START = 1; + /** + * 工序状态：加工中 + */ + public static Integer STATUS_START = 2; + /** + * 工序状态：报工完成 + */ + public static Integer STATUS_WORK_OK = 3; + /** + * 工序状态：已完成 + */ + public static Integer STATUS_COMPLETE = 5; + /** + * 工序状态：已返工 + */ + public static Integer STATUS_VOIDED = 6; + @Serial private static final long serialVersionUID = 1L; @@ -142,27 +164,27 @@ public class WorkPlanEntity extends BaseEntity { @Schema(description = "实际结束") private Date factEndTime; /** - * + * */ @Schema(description = "") private Short bindStatus; /** - * + * */ @Schema(description = "") private Integer workQty; /** - * + * */ @Schema(description = "") private Long receiveMan; /** - * + * */ @Schema(description = "") private BigDecimal hours; /** - * + * */ @Schema(description = "") private Long caId; @@ -172,7 +194,7 @@ public class WorkPlanEntity extends BaseEntity { @Schema(description = "打印标记类型：1、生产过程") private Short printType; /** - * + * */ @Schema(description = "") private Long subsidiaryTeam; @@ -202,7 +224,7 @@ public class WorkPlanEntity extends BaseEntity { @Schema(description = "工艺文件编号/版本号") private String papers; /** - * + * */ @Schema(description = "") private String referenceFile; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java index c6f3db5..b4d16ad 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java @@ -68,9 +68,11 @@ public class WorkPlanServiceImpl extends BaseServiceImpl