From f05cf1ed417c09a5075d85df42298cc339f704b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Wed, 28 Aug 2024 14:05:24 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E4=BB=B7=E6=A0=BC=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=B9=E4=B8=BABigDecimal=E7=B1=BB=E5=9E=8B=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E8=A1=A5=E5=85=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A1=E5=88=92service=E6=A0=B9=E6=8D=AE=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E5=8D=95=E7=94=9F=E6=88=90=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85?= =?UTF-8?q?mapper=EF=BC=8C=E4=BF=AE=E6=AD=A3=E6=8F=92=E5=85=A5=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=E9=94=99=E8=AF=AF=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/purchase/domain/PurchasePlan.java | 15 ++++++++------- .../ruoyi/purchase/domain/PurchasePlanChild.java | 10 ++++++++++ .../service/impl/PurchasePlanServiceImpl.java | 7 ++++--- .../mapper/purchase/PurchasePlanChildMapper.xml | 2 +- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlan.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlan.java index 1ea764b3..45b3a69e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlan.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlan.java @@ -5,6 +5,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; import java.util.List; /** @@ -46,11 +47,11 @@ public class PurchasePlan extends BaseEntity /** 不含税总价(RMB) */ @Excel(name = "不含税总价(RMB)") - private Long noRmbSum; + private BigDecimal noRmbSum; /** 含税总价(RMB) */ @Excel(name = "含税总价(RMB)") - private Long rmbSum; + private BigDecimal rmbSum; /** 申请人 */ @Excel(name = "申请人") @@ -140,25 +141,25 @@ public class PurchasePlan extends BaseEntity this.materialSum = materialSum; } - public Long getMaterialSum() + public Long getMaterialSum() { return materialSum; } - public void setNoRmbSum(Long noRmbSum) + public void setNoRmbSum(BigDecimal noRmbSum) { this.noRmbSum = noRmbSum; } - public Long getNoRmbSum() + public BigDecimal getNoRmbSum() { return noRmbSum; } - public void setRmbSum(Long rmbSum) + public void setRmbSum(BigDecimal rmbSum) { this.rmbSum = rmbSum; } - public Long getRmbSum() + public BigDecimal getRmbSum() { return rmbSum; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlanChild.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlanChild.java index 9c25e83f..8f6de61c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlanChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlanChild.java @@ -222,6 +222,16 @@ public class PurchasePlanChild extends BaseEntity this.materialNum = materialNum; } + + + public List getParseSupplierMaterialCombinations() { + return parseSupplierMaterialCombinations; + } + + public void setParseSupplierMaterialCombinations(List parseSupplierMaterialCombinations) { + this.parseSupplierMaterialCombinations = parseSupplierMaterialCombinations; + } + public void setMaterialSole(Long materialSole) { this.materialSole = materialSole; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchasePlanServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchasePlanServiceImpl.java index 4bd214c9..a617dbb5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchasePlanServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchasePlanServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.purchase.service.impl; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -422,11 +423,11 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService //添加数量合计 purchasePlan.setMaterialSum((long) purchasePlanMaterialSum); - purchasePlan.setNoRmbSum(sysMakeOrder.getNoRate()); - purchasePlan.setRmbSum(sysMakeOrder.getRate()); + purchasePlan.setNoRmbSum(new BigDecimal(sysMakeOrder.getNoRate())); + purchasePlan.setRmbSum(new BigDecimal(sysMakeOrder.getRate())); purchasePlan.setApplyUser(sysMakeOrder.getSalesman()); purchasePlan.setCreateBy(ShiroUtils.getLoginName()); - purchasePlan.setCreateTime(new Date()); + purchasePlan.setCreateTime(DateUtils.getNowDate()); purchasePlan.setAuditStatus("0"); purchasePlan.setUseStatus("0"); purchasePlan.setPurchasePlanStatus("0"); diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml index b5566728..2d4a8f84 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml @@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{materialNum}, #{materialSole}, #{materialRmb}, - #{materialNormb}, + #{materialNoRmb}, #{createBy}, #{createTime}, #{updateBy},