From 0e54bd9035f85354df5404fd3f9eed45be807b67 Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Thu, 16 Apr 2026 09:10:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E8=AE=A1=E5=88=92=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/erp/service/stock/ErpStockInServiceImpl.java | 2 +- .../mes/controller/admin/plan/vo/DevicePlanGanttRespVO.java | 2 ++ .../iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java index 7da4df81f..0b32a5864 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java @@ -91,7 +91,7 @@ public class ErpStockInServiceImpl implements ErpStockInService { // 2.2 插入入库单项 stockInItems.forEach(o -> { o.setInId(stockIn.getId()); -// o.setCount(o.getCount()); + o.setCount(o.getCount()); }); stockInItemMapper.insertBatch(stockInItems); // for (ErpStockInItemDO item : stockInItems) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/DevicePlanGanttRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/DevicePlanGanttRespVO.java index 5c1ec0984..99e42d6dd 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/DevicePlanGanttRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/DevicePlanGanttRespVO.java @@ -45,6 +45,8 @@ public class DevicePlanGanttRespVO { private Long planNumber; @Schema(description = "计划编码") private String planCode; + @Schema(description = "计划状态") + private Integer planStatus; @Schema(description = "任务单编码") private String taskCode; @Schema(description = "产品名称") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java index 10750cf11..cb5803707 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java @@ -641,6 +641,7 @@ public class PlanServiceImpl implements PlanService { item.setPlanStartTimeStr(plan.getPlanStartTime().format(DateTimeFormatter.ofPattern(DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND))); item.setPlanEndTimeStr(plan.getPlanEndTime().format(DateTimeFormatter.ofPattern(DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND))); item.setLatestStartTimeStr(plan.getLatestStartTime().format(DateTimeFormatter.ofPattern(DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND))); + item.setPlanStatus(plan.getStatus()!=null ? plan.getStatus() : null); plans.add(item); }