From cd36d7125e3bae18f2675b9a4966af61342811e5 Mon Sep 17 00:00:00 2001 From: siontion Date: Tue, 27 Feb 2024 15:31:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 采购订单 批量下载 --- .../vo/PurchaseOrderPageReqVO.java | 3 + .../purchaseorder/vo/PurchaseOrderRespVO.java | 4 + .../vo/PurchaseOrderMaterialPageReqVO.java | 2 +- .../vo/PurchaseOrderMaterialRespVO.java | 2 +- .../vo/PurchaseOrderMaterialSaveReqVO.java | 82 +++++++++---------- .../PurchaseOrderMaterialDO.java | 2 +- .../dal/mysql/material/MaterialMapper.java | 3 +- .../purchaseorder/PurchaseOrderMapper.java | 6 +- .../src/views/heli/materialplan/edit.vue | 4 +- .../src/views/heli/purchaseorder/edit.vue | 12 +-- .../src/views/heli/purchaseorder/index.vue | 30 ++++++- 11 files changed, 92 insertions(+), 58 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java index 56a898e6..d35716b6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java @@ -19,6 +19,9 @@ public class PurchaseOrderPageReqVO extends PageParam { @Schema(description = "自增字段，唯一") private Long id; + @Schema(description = "选中采购编号") + private List ids; + @Schema(description = "采购单号") private String purchaseNo; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java index ae16c66c..1790be5f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java @@ -11,6 +11,9 @@ 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; +import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; +import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + @Schema(description = "管理后台 - 采购订单 Response VO") @Data @ExcelIgnoreUnannotated @@ -24,6 +27,7 @@ public class PurchaseOrderRespVO { private String purchaseNo; @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) @ExcelProperty("单据日期") private LocalDateTime createTime; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialPageReqVO.java index 5cb03c7c..f0ff45d2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialPageReqVO.java @@ -23,7 +23,7 @@ public class PurchaseOrderMaterialPageReqVO extends PageParam { private Long materialId; @Schema(description = "采购数量") - private Long purchaseAmount; + private BigDecimal purchaseAmount; @Schema(description = "暂估价金额") private BigDecimal estimatedPrice; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialRespVO.java index f67b0713..d04b44d5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialRespVO.java @@ -29,7 +29,7 @@ public class PurchaseOrderMaterialRespVO { @Schema(description = "采购数量") @ExcelProperty("采购数量") - private Long purchaseAmount; + private BigDecimal purchaseAmount; @Schema(description = "暂估价金额") @ExcelProperty("暂估价金额") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialSaveReqVO.java index 6f8c1006..fb53aa3c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermaterial/vo/PurchaseOrderMaterialSaveReqVO.java @@ -1,41 +1,41 @@ -package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermaterial.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 采购单物料新增/修改 Request VO") -@Data -public class PurchaseOrderMaterialSaveReqVO { - - @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED) - private Long id; - - @Schema(description = "采购单编号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "采购单编号不能为空") - private Long purchaseOrderId; - - @Schema(description = "物料id") - private Long materialId; - - @Schema(description = "采购数量") - private Long purchaseAmount; - - @Schema(description = "暂估价金额") - private BigDecimal estimatedPrice; - - @Schema(description = "实际价金额") - private BigDecimal actualPrice; - - @Schema(description = "预计到期日期") - private LocalDateTime arriveTime; - - @Schema(description = "备注") - private String description; - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermaterial.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 采购单物料新增/修改 Request VO") +@Data +public class PurchaseOrderMaterialSaveReqVO { + + @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED) + private Long id; + + @Schema(description = "采购单编号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "采购单编号不能为空") + private Long purchaseOrderId; + + @Schema(description = "物料id") + private Long materialId; + + @Schema(description = "采购数量") + private BigDecimal purchaseAmount; + + @Schema(description = "暂估价金额") + private BigDecimal estimatedPrice; + + @Schema(description = "实际价金额") + private BigDecimal actualPrice; + + @Schema(description = "预计到期日期") + private LocalDateTime arriveTime; + + @Schema(description = "备注") + private String description; + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermaterial/PurchaseOrderMaterialDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermaterial/PurchaseOrderMaterialDO.java index be11b635..9b7b6e52 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermaterial/PurchaseOrderMaterialDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermaterial/PurchaseOrderMaterialDO.java @@ -41,7 +41,7 @@ public class PurchaseOrderMaterialDO extends BaseDO { /** * 采购数量 */ - private Long purchaseAmount; + private BigDecimal purchaseAmount; /** * 暂估价金额 */ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java index 935f4a35..19893847 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java @@ -35,8 +35,7 @@ public interface MaterialMapper extends BaseMapperX { .like(!StringUtils.isEmpty(reqVO.getCode()), MaterialDO::getCode, reqVO.getCode()) .eq(!StringUtils.isEmpty(reqVO.getMaterialType()), MaterialDO::getMaterialType, reqVO.getMaterialType()) .eq(reqVO.getStatus() != null, MaterialDO::getStatus, reqVO.getStatus()) - .eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name()) - .eq(!StringUtils.isEmpty(reqVO.getVirtualPart()), MaterialDO::getVirtualPart, reqVO.getVirtualPart()); + .eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name()); if(!StringUtils.isEmpty(reqVO.getCodeAndName())){ query.like(MaterialDO::getName, reqVO.getCodeAndName()).or().like(MaterialDO::getCode, reqVO.getCodeAndName()); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorder/PurchaseOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorder/PurchaseOrderMapper.java index 043cb3df..7930413a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorder/PurchaseOrderMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorder/PurchaseOrderMapper.java @@ -40,7 +40,8 @@ public interface PurchaseOrderMapper extends BaseMapperX { .apply(reqVO.getCreateTime() != null, "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", reqVO.getCreateTime()) .eq(reqVO.getStatus() != null, PurchaseOrderDO::getStatus, reqVO.getStatus()) .eq(reqVO.getPurchaseType() != null, PurchaseOrderDO::getPurchaseType, reqVO.getPurchaseType()) - .eq(reqVO.getGoodsType() != null, PurchaseOrderDO::getGoodsType, reqVO.getGoodsType()); + .eq(reqVO.getGoodsType() != null, PurchaseOrderDO::getGoodsType, reqVO.getGoodsType()) + .in(reqVO.getIds() != null && !reqVO.getIds().isEmpty(),PurchaseOrderDO::getId,reqVO.getIds()); return selectPage(reqVO, query); } @@ -80,7 +81,8 @@ public interface PurchaseOrderMapper extends BaseMapperX { .apply(reqVO.getCreateTime() != null, "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", reqVO.getCreateTime()) .eq(reqVO.getStatus() != null, PurchaseOrderDO::getStatus, reqVO.getStatus()) .eq(reqVO.getPurchaseType() != null, PurchaseOrderDO::getPurchaseType, reqVO.getPurchaseType()) - .eq(reqVO.getGoodsType() != null, PurchaseOrderDO::getGoodsType, reqVO.getGoodsType()); + .eq(reqVO.getGoodsType() != null, PurchaseOrderDO::getGoodsType, reqVO.getGoodsType()) + .in(reqVO.getIds() != null && !reqVO.getIds().isEmpty(),PurchaseOrderDO::getId,reqVO.getIds()); return selectPage(reqVO, query); } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue index 23ad7ac2..85f5e3c7 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue @@ -126,7 +126,7 @@ @@ -447,7 +447,7 @@ const onAddItem = () => { matType: '', matSpec: '', matUnit: '', - requireAmount: '', + requireAmount: undefined, requireArriveTime: '', projectSubId: '', description: '' diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue index 9fa63fa7..5d1e59cf 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue @@ -186,7 +186,7 @@ @@ -194,7 +194,7 @@ @@ -202,7 +202,7 @@ @@ -539,9 +539,9 @@ const onAddItem = () => { matType: '', matSpec: '', matUnit: '', - purchaseAmount: '', - estimatedPrice:'', - actualPrice:'', + purchaseAmount: undefined, + estimatedPrice:undefined, + actualPrice:undefined, arriveTime: '', description: '' } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue index 77e07833..3a81c5bd 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue @@ -55,8 +55,9 @@ - - + + +