From 3463845b138a73d1bd64ab0bfa840b9024a3eb2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Wed, 6 Aug 2025 15:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BA=93=E5=AD=98111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusCailiaoshebeiController.java | 15 ++++++++++++++- .../cailiaoshebei/domain/BusCailiaoshebei.java | 6 ++++-- .../cailiaoshebei/domain/BusSuppliesprice.java | 2 +- .../domain/bo/BusCailiaoshebeiEditPlanReq.java | 7 +++++-- .../domain/bo/BusCailiaoshebeiEditReq.java | 3 +-- .../dto/BusCailiaoshebeiEditPlanDto.java | 5 +++++ .../vo/BusSuppliespriceAddPlanSonRes.java | 5 +++-- .../mapper/BusMaterialsorderMapper.java | 3 ++- .../service/IBusMaterialsorderService.java | 2 +- .../impl/BusCailiaoshebeiServiceImpl.java | 2 +- .../impl/BusMaterialsorderServiceImpl.java | 13 +++++++++---- .../out/controller/OutTableController.java | 18 ++++++++++++------ .../cailiaoshebei/BusMaterialsorderMapper.xml | 2 +- 13 files changed, 59 insertions(+), 24 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java index 22a0cf17..d74109e5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java @@ -127,7 +127,7 @@ public class BusCailiaoshebeiController extends BaseController { } /** - * 设计-删除物资-材料设备1 + * 设计-删除物资-材料设备 * * @param ids 主键串 */ @@ -139,6 +139,19 @@ public class BusCailiaoshebeiController extends BaseController { return toAjax(busCailiaoshebeiService.deleteWithValidByIds(List.of(ids), true)); } + /** + * 设计-提交审批按钮 + * + */ + @SaCheckPermission("cailiaoshebei:cailiaoshebei:SubmitForApprovalButton") + @Log(title = "设计-提交审批按钮", businessType = BusinessType.DELETE) + @PostMapping("/SubmitForApprovalButton") + public R submitForApprovalButton() { + + return null; + } + + // /** // * 导出物资-材料设备列表 // */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusCailiaoshebei.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusCailiaoshebei.java index 14a960c9..abedcc32 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusCailiaoshebei.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusCailiaoshebei.java @@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.time.LocalDate; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -77,12 +79,12 @@ public class BusCailiaoshebei extends BaseEntity { /** * 计划到场时间 */ - private Date arrivalTime; + private LocalDate arrivalTime; /** * 计划完成时间 */ - private Date finishTime; + private LocalDate finishTime; /** * 计量单位 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusSuppliesprice.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusSuppliesprice.java index 6afccd53..116a1da8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusSuppliesprice.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusSuppliesprice.java @@ -41,7 +41,7 @@ public class BusSuppliesprice extends BaseEntity { /** * 数量 */ - private int number; + private int num; /** * 合同号 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusCailiaoshebeiEditPlanReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusCailiaoshebeiEditPlanReq.java index e9273526..67bcfe92 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusCailiaoshebeiEditPlanReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusCailiaoshebeiEditPlanReq.java @@ -1,5 +1,6 @@ package org.dromara.cailiaoshebei.domain.bo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -13,6 +14,7 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; +import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -36,17 +38,18 @@ public class BusCailiaoshebeiEditPlanReq extends BaseEntity { * 计划到场时间 */ @NotNull(message = "计划到场时间", groups = { EditGroup.class }) - private Date arrivalTime; + private LocalDate arrivalTime; /** * 计划完成时间 */ @NotNull(message = "计划完成时间", groups = { EditGroup.class }) - private Date finishTime; + private LocalDate finishTime; /** * 物资清单列表 */ + @Size(min = 1, message = "物资清单列表不能为空", groups = { EditGroup.class }) private List listOfMaterialInventory; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusCailiaoshebeiEditReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusCailiaoshebeiEditReq.java index c21768bd..4f022aca 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusCailiaoshebeiEditReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusCailiaoshebeiEditReq.java @@ -32,13 +32,12 @@ public class BusCailiaoshebeiEditReq extends BaseEntity { * 供货商ID (必填) */ @NotNull(message = "供货商ID不能为空", groups = { AddGroup.class }) - private Long supplierId; + private String supplierId; /** * 供货商 (必填) */ @NotBlank(message = "供货商不能为空", groups = { AddGroup.class }) - @Size(max = 64, message = "供货商名称长度不能超过64个字符", groups = {AddGroup.class, EditGroup.class}) private String supplier; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/BusCailiaoshebeiEditPlanDto.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/BusCailiaoshebeiEditPlanDto.java index 9dd41861..9eb3c867 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/BusCailiaoshebeiEditPlanDto.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/BusCailiaoshebeiEditPlanDto.java @@ -8,6 +8,11 @@ import java.io.Serializable; * @Version 1.0 */ public class BusCailiaoshebeiEditPlanDto implements Serializable { + /** + * 材料设备ID + */ + private Long cailiaoshebeiId; + /** * 单价 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusSuppliespriceAddPlanSonRes.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusSuppliespriceAddPlanSonRes.java index baecdfc2..ffec865b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusSuppliespriceAddPlanSonRes.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusSuppliespriceAddPlanSonRes.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -80,13 +81,13 @@ public class BusSuppliespriceAddPlanSonRes implements Serializable { * 计划到场时间 */ @ExcelProperty(value = "计划到场时间") - private Date arrivalTime; + private LocalDate arrivalTime; /** * 计划完成时间 */ @ExcelProperty(value = "计划完成时间") - private Date finishTime; + private LocalDate finishTime; /** * 计量单位 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusMaterialsorderMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusMaterialsorderMapper.java index 8f71f820..9b6443ec 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusMaterialsorderMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusMaterialsorderMapper.java @@ -20,6 +20,7 @@ public interface BusMaterialsorderMapper extends BaseMapperPlus grossOutput( @Param("projectId") Long projectId, @Param("statusArr") String[] statusArr, - @Param("yue") String yue); + @Param("startYue") String startYue, + @Param("endYue") String endYue); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusMaterialsorderService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusMaterialsorderService.java index 2c1b401a..7398b973 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusMaterialsorderService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusMaterialsorderService.java @@ -93,5 +93,5 @@ public interface IBusMaterialsorderService extends IService{ * @param yue 年月查询，不必填 * @return */ - BigDecimal grossOutput(Long projectId,String yue); + BigDecimal grossOutput(Long projectId, String startYue, String endYue); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusCailiaoshebeiServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusCailiaoshebeiServiceImpl.java index 6819f1f3..0006a533 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusCailiaoshebeiServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusCailiaoshebeiServiceImpl.java @@ -188,7 +188,7 @@ public class BusCailiaoshebeiServiceImpl extends ServiceImpl { - num.addAndGet(busSuppliesprice.getNumber()); + num.addAndGet(busSuppliesprice.getNum()); } ); res.setRealQuantity(num.get()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialsorderServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialsorderServiceImpl.java index b8b2c8c5..435fb606 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialsorderServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialsorderServiceImpl.java @@ -230,19 +230,24 @@ public class BusMaterialsorderServiceImpl extends ServiceImpl list = baseMapper.grossOutput(projectId, arr, yue); + List list = baseMapper.grossOutput(projectId, arr, startYue,endYue); //计算出所有的订单数量 BigDecimal resBigDecimal = new BigDecimal(0); for (GrossOutputRes grossOutputRes : list) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java index a5abca13..a6edc136 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.http.HttpStatus; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; +import org.dromara.cailiaoshebei.service.IBusMaterialsorderService; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.FormatsType; import org.dromara.common.core.utils.DateUtils; @@ -68,6 +69,8 @@ public class OutTableController extends BaseController { private final IOutSettlementValueOwnerService settlementValueOwnerService; + private final IBusMaterialsorderService busMaterialsorderService; + /** * 施工产值报表（计划 VS 实际） @@ -262,6 +265,7 @@ public class OutTableController extends BaseController { vo.setProjectId(projectVoId); +// BigDecimal bigDecimal = busMaterialsorderService.grossOutput(projectVoId, null); if("1".equals(bo.getValueType())){ //设计完工产值 BigDecimal designValue = monthPlanService.getDesignValueByProjectId(projectVoId,null); @@ -272,17 +276,18 @@ public class OutTableController extends BaseController { vo.setTotalCompletionOutputValue(constructionValue); }else if ("3".equals(bo.getValueType())) { //采购完工产值 todo: 掉罗成的接口 - BigDecimal purchaseValue = BigDecimal.ZERO; - vo.setTotalCompletionOutputValue(purchaseValue); +// BigDecimal purchaseValue = bigDecimal; +// vo.setTotalCompletionOutputValue(purchaseValue); }else{ //设计完工产值 BigDecimal designValue = monthPlanService.getDesignValueByProjectId(projectVoId,null); //施工完工产值 BigDecimal constructionValue = constructionValueService.getCompleteValue(projectVoId,null); //采购完工产值 todo: 掉罗成的接口 - BigDecimal purchaseValue = BigDecimal.ZERO; - vo.setTotalCompletionOutputValue( designValue.add(constructionValue).add(purchaseValue)); +// BigDecimal purchaseValue = bigDecimal; + +// vo.setTotalCompletionOutputValue( designValue.add(constructionValue).add(purchaseValue)); } @@ -331,9 +336,9 @@ public class OutTableController extends BaseController { //施工完工产值 BigDecimal constructionValue = constructionValueService.getCompleteValue(projectVoId,bo.getMonth()); //采购完工产值 todo: 掉罗成的接口 - BigDecimal purchaseValue = BigDecimal.ZERO; +// BigDecimal purchaseValue = busMaterialsorderService.grossOutput(projectVoId,bo.getMonth()); - vo.setTotalCompletionOutputValue( designValue.add(constructionValue).add(purchaseValue)); +// vo.setTotalCompletionOutputValue( designValue.add(constructionValue).add(purchaseValue)); //分包结算产值 BigDecimal settlementValue = settlementValueSubcontractService.getValueByProjectId(projectVoId,null,bo.getMonth()); @@ -413,6 +418,7 @@ public class OutTableController extends BaseController { }else if("2".equals(bo.getValueType())){ //todo: 掉罗成的接口 +// busMaterialsorderService.grossOutput(projectVoId,bo.getMonth()) vo.setMonthCompletionValue(BigDecimal.ZERO); vo.setAccumulatedCompletionValue(BigDecimal.ZERO); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cailiaoshebei/BusMaterialsorderMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cailiaoshebei/BusMaterialsorderMapper.xml index f9740970..800b48da 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cailiaoshebei/BusMaterialsorderMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cailiaoshebei/BusMaterialsorderMapper.xml @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} - + and DATE_FORMAT(a.actual_arrival, '%Y-%m') = #{yue}