From 45f4b369a2c234b022970be9f4f2dc9e3cf73561 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 15 Nov 2024 11:13:49 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88?= =?UTF-8?q?=E7=9A=84=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E7=9A=84=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=9B=B8=E5=85=B3=E7=9A=84=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=92=8C=E5=85=B6=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88=E7=9A=84?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=AD=90=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9B=B8=E5=85=B3=E7=9A=84=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=92=8C=E5=85=B6=E6=95=B0=E6=8D=AE=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E6=96=B0=E7=89=88prd=E8=B0=83=E6=95=B4=20=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E6=96=B0=E7=89=88prd=20=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=A1=A8purchase=5Fplan=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=96=B0=E5=A2=9E5=E6=9D=A1=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=9E=E4=BD=93=E7=B1=BB=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92Controller=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92Mapper=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92Mapper.XM?= =?UTF-8?q?L=20=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92Servi?= =?UTF-8?q?ce=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A1=E5=88=92ServiceImpl=E5=AE=9E=E7=8E=B0=E7=B1=BB=20?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=96=B0=E7=89=88prd=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=AD=90=E8=A1=A8purchase?= =?UTF-8?q?=5Fplan=5Fchild=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=B0=E5=A2=9E?= =?UTF-8?q?10=E6=9D=A1=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=20=E6=96=B0=E5=A2=9E=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A1=E5=88=92=E5=AD=90=E8=A1=A8Mapper=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=AD=90=E8=A1=A8?= =?UTF-8?q?Mapper.XML=20=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=AD=90=E8=A1=A8Service=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=AD=90?= =?UTF-8?q?=E8=A1=A8ServiceImpl=E5=AE=9E=E7=8E=B0=E7=B1=BB=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=B7=E8=B4=AD=E5=8D=95=E7=9A=84=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=97=EF=BC=8C=E9=87=87=E7=94=A8=E6=9C=80=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchasePlanController.java | 6 +- .../ruoyi/purchase/domain/PurchasePlan.java | 216 ++++----- .../purchase/domain/PurchasePlanChild.java | 423 ++++++++---------- .../service/impl/PurchasePlanServiceImpl.java | 71 ++- .../BaseRequisitioningOrderServiceImpl.java | 25 +- .../purchase/PurchasePlanChildMapper.xml | 311 ++++--------- .../mapper/purchase/PurchasePlanMapper.xml | 109 +++-- .../purchase/purchasePlan/purchasePlan.html | 36 +- 8 files changed, 522 insertions(+), 675 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java index 4556a6ad..e980d079 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java @@ -126,9 +126,9 @@ public class PurchasePlanController extends BaseController List purchasePlanChildList = purchasePlanChildService.getPurchasePlanChildByPlanCodes(uniquePurchasePlanCodes); for(PurchasePlanChild purchasePlanChild : purchasePlanChildList){ - String materialCode = purchasePlanChild.getMaterialCode(); - List purchaseQuoteChildList = purchaseQuoteChildService.selectQuoteChildByMaterialCode(materialCode); - purchasePlanChild.setPurchaseSupplierList(purchaseQuoteChildList); + String materialCode = purchasePlanChild.getMaterialNo(); +// List purchaseQuoteChildList = purchaseQuoteChildService.selectQuoteChildByMaterialCode(materialCode); +// purchasePlanChild.setPurchaseSupplierList(purchaseQuoteChildList); } //再根据采购计划编号分组查询对应的采购报价数据分组 //用stream流处理相同供应商\物料\ 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 45b3a69e..1eab1fd2 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 @@ -1,158 +1,154 @@ package com.ruoyi.purchase.domain; +import java.math.BigDecimal; import org.apache.commons.lang3.builder.ToStringBuilder; 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; - /** * 采购计划单对象 purchase_plan - * + * * @author 刘晓旭 - * @date 2024-04-15 + * @date 2024-11-15 */ public class PurchasePlan extends BaseEntity { private static final long serialVersionUID = 1L; - /** 采购计划索引id */ + /** 采购计划id */ private Long purchasePlanId; /** 采购计划单号 */ @Excel(name = "采购计划单号") private String purchasePlanCode; - /** 采购计划状态 (0待申请、1申请中、2申请通过、3审核拒绝、4已作废)*/ - @Excel(name = "采购计划状态") + /** 采购计划状态(0待申请、1部分申请、2全部申请、3全部作废) */ + @Excel(name = "采购计划状态",dictType = "purchase_plan_status") private String purchasePlanStatus; /** 关联单号 */ @Excel(name = "关联单号") private String correlationCode; - /** 采购计划状态 (1生产单、2请购单、3开发修改单)*/ - @Excel(name = "采购来源") + /** 采购来源(1生产单、2请购单、3开发修改单) */ + @Excel(name = "采购来源",dictType = "purchase_plan_type") private String purchasePlanType; - /** 物料合计 */ - @Excel(name = "物料合计") - private Long materialAmount; + /** 物料数合计 */ + @Excel(name = "物料数合计") + private Integer materialSum; - /** 数量总计 */ - @Excel(name = "数量总计") - private Long materialSum; + /** 数量合计 */ + @Excel(name = "数量合计") + private Integer enterpriseSum; /** 不含税总价(RMB) */ @Excel(name = "不含税总价(RMB)") - private BigDecimal noRmbSum; + private BigDecimal normbSum; /** 含税总价(RMB) */ @Excel(name = "含税总价(RMB)") private BigDecimal rmbSum; - /** 申请人 */ - @Excel(name = "申请人") - private String applyUser; - - /** 录入时间 */ - @Excel(name = "录入时间") - private String firstAddTime; - - /** 修改时间 */ - @Excel(name = "修改时间") - private String updateInfoTime; + /** 计划采购总数 */ + @Excel(name = "计划采购总数") + private Integer planPurchaseSum; - /** 审核状态 */ - private String auditStatus; + /** 待采购总数 */ + @Excel(name = "待采购总数") + private Integer purchaseSum; - /** 使用状态 */ - private String useStatus; + /** 实际采购总数 */ + @Excel(name = "实际采购总数") + private Integer actualPurchaseSum; - private List purchasePlanDetailList; + /** 共享库存占用总数 */ + @Excel(name = "共享库存占用总数") + private Integer sharedInventoryOccupancySum; + /** 作废总数 */ + @Excel(name = "作废总数") + private Integer cancelSum; - public List getPurchasePlanDetailList() { - return purchasePlanDetailList; - } + /** 申请人 */ + @Excel(name = "申请人") + private String applyUser; - public void setPurchasePlanDetailList(List purchasePlanDetailList) { - this.purchasePlanDetailList = purchasePlanDetailList; - } + /** 删除标志 0 启用 1逻辑删除 */ + private String delFlag; public void setPurchasePlanId(Long purchasePlanId) { this.purchasePlanId = purchasePlanId; } - public Long getPurchasePlanId() + public Long getPurchasePlanId() { return purchasePlanId; } - public void setPurchasePlanCode(String purchasePlanCode) + public void setPurchasePlanCode(String purchasePlanCode) { this.purchasePlanCode = purchasePlanCode; } - public String getPurchasePlanCode() + public String getPurchasePlanCode() { return purchasePlanCode; } - public void setPurchasePlanStatus(String purchasePlanStatus) + public void setPurchasePlanStatus(String purchasePlanStatus) { this.purchasePlanStatus = purchasePlanStatus; } - public String getPurchasePlanStatus() + public String getPurchasePlanStatus() { return purchasePlanStatus; } - public void setCorrelationCode(String correlationCode) + public void setCorrelationCode(String correlationCode) { this.correlationCode = correlationCode; } - public String getCorrelationCode() + public String getCorrelationCode() { return correlationCode; } - public void setPurchasePlanType(String purchasePlanType) + public void setPurchasePlanType(String purchasePlanType) { this.purchasePlanType = purchasePlanType; } - public String getPurchasePlanType() + public String getPurchasePlanType() { return purchasePlanType; } - public void setMaterialAmount(Long materialAmount) + public void setMaterialSum(Integer materialSum) { - this.materialAmount = materialAmount; + this.materialSum = materialSum; } - public Long getMaterialAmount() + public Integer getMaterialSum() { - return materialAmount; + return materialSum; } - public void setMaterialSum(Long materialSum) + public void setEnterpriseSum(Integer enterpriseSum) { - this.materialSum = materialSum; + this.enterpriseSum = enterpriseSum; } - public Long getMaterialSum() + public Integer getEnterpriseSum() { - return materialSum; + return enterpriseSum; } - public void setNoRmbSum(BigDecimal noRmbSum) + public void setNormbSum(BigDecimal normbSum) { - this.noRmbSum = noRmbSum; + this.normbSum = normbSum; } - public BigDecimal getNoRmbSum() + public BigDecimal getNormbSum() { - return noRmbSum; + return normbSum; } public void setRmbSum(BigDecimal rmbSum) { @@ -163,74 +159,94 @@ public class PurchasePlan extends BaseEntity { return rmbSum; } - public void setApplyUser(String applyUser) + public void setPlanPurchaseSum(Integer planPurchaseSum) { - this.applyUser = applyUser; + this.planPurchaseSum = planPurchaseSum; } - public String getApplyUser() + public Integer getPlanPurchaseSum() { - return applyUser; + return planPurchaseSum; + } + public void setPurchaseSum(Integer purchaseSum) + { + this.purchaseSum = purchaseSum; + } + + public Integer getPurchaseSum() + { + return purchaseSum; } - public void setFirstAddTime(String firstAddTime) + public void setActualPurchaseSum(Integer actualPurchaseSum) { - this.firstAddTime = firstAddTime; + this.actualPurchaseSum = actualPurchaseSum; } - public String getFirstAddTime() + public Integer getActualPurchaseSum() { - return firstAddTime; + return actualPurchaseSum; } - public void setUpdateInfoTime(String updateInfoTime) + public void setSharedInventoryOccupancySum(Integer sharedInventoryOccupancySum) { - this.updateInfoTime = updateInfoTime; + this.sharedInventoryOccupancySum = sharedInventoryOccupancySum; } - public String getUpdateInfoTime() + public Integer getSharedInventoryOccupancySum() { - return updateInfoTime; + return sharedInventoryOccupancySum; } - public void setAuditStatus(String auditStatus) + public void setCancelSum(Integer cancelSum) { - this.auditStatus = auditStatus; + this.cancelSum = cancelSum; } - public String getAuditStatus() + public Integer getCancelSum() { - return auditStatus; + return cancelSum; + } + public void setApplyUser(String applyUser) + { + this.applyUser = applyUser; + } + + public String getApplyUser() + { + return applyUser; } - public void setUseStatus(String useStatus) + public void setDelFlag(String delFlag) { - this.useStatus = useStatus; + this.delFlag = delFlag; } - public String getUseStatus() + public String getDelFlag() { - return useStatus; + return delFlag; } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("purchasePlanId", getPurchasePlanId()) - .append("purchasePlanCode", getPurchasePlanCode()) - .append("purchasePlanStatus", getPurchasePlanStatus()) - .append("correlationCode", getCorrelationCode()) - .append("purchasePlanType", getPurchasePlanType()) - .append("materialAmount", getMaterialAmount()) - .append("materialSum", getMaterialSum()) - .append("noRmbSum", getNoRmbSum()) - .append("rmbSum", getRmbSum()) - .append("applyUser", getApplyUser()) - .append("firstAddTime", getFirstAddTime()) - .append("updateInfoTime", getUpdateInfoTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("auditStatus", getAuditStatus()) - .append("useStatus", getUseStatus()) - .append("remark", getRemark()) - .toString(); + .append("purchasePlanId", getPurchasePlanId()) + .append("purchasePlanCode", getPurchasePlanCode()) + .append("purchasePlanStatus", getPurchasePlanStatus()) + .append("correlationCode", getCorrelationCode()) + .append("purchasePlanType", getPurchasePlanType()) + .append("materialSum", getMaterialSum()) + .append("enterpriseSum", getEnterpriseSum()) + .append("normbSum", getNormbSum()) + .append("rmbSum", getRmbSum()) + .append("planPurchaseSum", getPlanPurchaseSum()) + .append("purchaseSum", getPurchaseSum()) + .append("actualPurchaseSum", getActualPurchaseSum()) + .append("sharedInventoryOccupancySum", getSharedInventoryOccupancySum()) + .append("cancelSum", getCancelSum()) + .append("applyUser", getApplyUser()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .toString(); } } 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 8f6de61c..1dac342b 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 @@ -1,383 +1,350 @@ package com.ruoyi.purchase.domain; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 采购计划单物料信息对象 purchase_plan_child - * - * @author zhang - * @date 2024-05-16 + * 采购计划单子对象 purchase_plan_child + * + * @author 刘晓旭 + * @date 2024-11-15 */ public class PurchasePlanChild extends BaseEntity { private static final long serialVersionUID = 1L; - public List parseSupplierMaterialCombinations; - /** 采购计划物料清单索引 */ + /** 采购计划子表id */ private Long purchasePlanChildId; - /** 关联采购计划编号字段 */ - @Excel(name = "关联采购计划编号字段") + /** 采购计划编号 */ + @Excel(name = "采购计划编号") private String purchasePlanCode; - /** 物料表中的id */ - @Excel(name = "物料表中的id") - private Long materialId; + /** 采购计划状态(0待申请、1部分申请、2全部申请、3全部作废) */ + @Excel(name = "采购计划状态(0待申请、1部分申请、2全部申请、3全部作废)") + private String purchasePlanStatus; - /** 物料表中的编号 */ - @Excel(name = "物料表中的编号") - private String materialCode; + /** 关联单号 */ + @Excel(name = "关联单号") + private String correlationCode; - /** 物料的名称 */ - @Excel(name = "物料的名称") - private String materialName; + /** 采购来源(1生产单、2请购单、3开发修改单) */ + @Excel(name = "采购来源(1生产单、2请购单、3开发修改单)") + private String purchasePlanType; - /** 物料的类型 */ - @Excel(name = "物料的类型") - private String materialType; + /** 料号 */ + @Excel(name = "料号") + private String materialNo; - /** 物料的加工方式 */ - @Excel(name = "物料的加工方式") - private String processMethod; + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; - /** 物料的品牌 */ - @Excel(name = "物料的品牌") - private String brand; + /** 物料类型 */ + @Excel(name = "物料类型") + private String materialType; - /** 物料的图片 */ - @Excel(name = "物料的图片") - private String photoUrl; + /** 物料图片地址 */ + @Excel(name = "物料图片地址") + private String materialPhotourl; - /** 物料的描述 */ - @Excel(name = "物料的描述") - private String describe; + /** 物料品牌 */ + @Excel(name = "物料品牌") + private String materialBrand; + /** 物料单位 */ @Excel(name = "物料单位") - private String unit; - @Excel(name = "物料入库部门") - private String warehouseDept; + private String materialUnit; - /** 采购计划数 */ - @Excel(name = "采购计划数") - private Double materialNum; + /** 物料描述 */ + @Excel(name = "物料描述") + private String materialDescribe; - /** 物料的对外报价 */ - private Long materialSole; + /** 物料加工方式 */ + @Excel(name = "物料加工方式") + private String materialProcessMethod; - /** 物料的不含税单价(RMB) */ - private BigDecimal materialRmb; + /** 物料型号 */ + @Excel(name = "物料型号") + private String materialModel; - /** 物料的含税单价(RMB) */ - private BigDecimal materialNoRmb; + /** 入库部门(0仓库、1采购) */ + @Excel(name = "入库部门(0仓库、1采购)") + private String warehouseDept; - /*供应商编号*/ - private String supplierCode; - /** 物料供应商 */ - private String supplierName; + /** 物料不含税总价(RMB) */ + @Excel(name = "物料不含税总价(RMB)") + private BigDecimal materialNormbSum; - /** 使用状态 */ - private String useStatus; + /** 物料含税总价(RMB) */ + @Excel(name = "物料含税总价(RMB)") + private BigDecimal materialRmbSum; - /** 审核状态 */ - private String auditStatus; + /** 计划采购数 */ + @Excel(name = "计划采购数") + private Integer planPurchaseNum; - /** 删除标志 */ - private String delFlag; - /** 关联供应商编号 */ - private String supplierCodes; - /** 关联采购报价单编号 */ - private String correlationCodes; + /** 待采购数 */ + @Excel(name = "待采购数") + private Integer purchaseNum; - private String planCodes; - private List purchaseSupplierList; + /** 实际采购数 */ + @Excel(name = "实际采购数") + private Integer actualPurchaseNum; - public String getSupplierCodes() { - return supplierCodes; - } - - public void setSupplierCodes(String supplierCodes) { - this.supplierCodes = supplierCodes; - } + /** 共享库存占用数 */ + @Excel(name = "共享库存占用数") + private Integer sharedInventoryOccupancyNum; - public String getCorrelationCodes() { - return correlationCodes; - } + /** 作废数 */ + @Excel(name = "作废数") + private Integer cancelNum; - public void setCorrelationCodes(String correlationCodes) { - this.correlationCodes = correlationCodes; - } + /** 删除标志 0 启用 1逻辑删除 */ + private String delFlag; public void setPurchasePlanChildId(Long purchasePlanChildId) { this.purchasePlanChildId = purchasePlanChildId; } - public Long getPurchasePlanChildId() + public Long getPurchasePlanChildId() { return purchasePlanChildId; } - public void setPurchasePlanCode(String purchasePlanCode) + public void setPurchasePlanCode(String purchasePlanCode) { this.purchasePlanCode = purchasePlanCode; } - public String getPurchasePlanCode() + public String getPurchasePlanCode() { return purchasePlanCode; } - public void setMaterialId(Long materialId) + public void setPurchasePlanStatus(String purchasePlanStatus) { - this.materialId = materialId; + this.purchasePlanStatus = purchasePlanStatus; } - public Long getMaterialId() + public String getPurchasePlanStatus() { - return materialId; + return purchasePlanStatus; } - public void setMaterialCode(String materialCode) + public void setCorrelationCode(String correlationCode) { - this.materialCode = materialCode; + this.correlationCode = correlationCode; } - public String getMaterialCode() + public String getCorrelationCode() { - return materialCode; + return correlationCode; } - public void setMaterialName(String materialName) + public void setPurchasePlanType(String purchasePlanType) { - this.materialName = materialName; + this.purchasePlanType = purchasePlanType; } - public String getMaterialName() + public String getPurchasePlanType() { - return materialName; + return purchasePlanType; } - public void setMaterialType(String materialType) + public void setMaterialNo(String materialNo) { - this.materialType = materialType; + this.materialNo = materialNo; } - public String getMaterialType() + public String getMaterialNo() { - return materialType; + return materialNo; } - public void setProcessMethod(String processMethod) + public void setMaterialName(String materialName) { - this.processMethod = processMethod; + this.materialName = materialName; } - public String getProcessMethod() + public String getMaterialName() { - return processMethod; + return materialName; } - public void setBrand(String brand) + public void setMaterialType(String materialType) { - this.brand = brand; + this.materialType = materialType; } - public String getBrand() + public String getMaterialType() { - return brand; + return materialType; } - public void setPhotoUrl(String photoUrl) + public void setMaterialPhotourl(String materialPhotourl) { - this.photoUrl = photoUrl; + this.materialPhotourl = materialPhotourl; } - public String getPhotoUrl() + public String getMaterialPhotourl() { - return photoUrl; + return materialPhotourl; } - public void setDescribe(String describe) + public void setMaterialBrand(String materialBrand) { - this.describe = describe; + this.materialBrand = materialBrand; } - public String getDescribe() + public String getMaterialBrand() { - return describe; + return materialBrand; } - - public String getUnit() { - return unit; - } - - public void setUnit(String unit) { - this.unit = unit; - } - - public Double getMaterialNum() { - return materialNum; + public void setMaterialUnit(String materialUnit) + { + this.materialUnit = materialUnit; } - public void setMaterialNum(Double materialNum) { - this.materialNum = materialNum; + public String getMaterialUnit() + { + return materialUnit; } - - - - public List getParseSupplierMaterialCombinations() { - return parseSupplierMaterialCombinations; + public void setMaterialDescribe(String materialDescribe) + { + this.materialDescribe = materialDescribe; } - public void setParseSupplierMaterialCombinations(List parseSupplierMaterialCombinations) { - this.parseSupplierMaterialCombinations = parseSupplierMaterialCombinations; + public String getMaterialDescribe() + { + return materialDescribe; } - - public void setMaterialSole(Long materialSole) + public void setMaterialProcessMethod(String materialProcessMethod) { - this.materialSole = materialSole; + this.materialProcessMethod = materialProcessMethod; } - public Long getMaterialSole() + public String getMaterialProcessMethod() { - return materialSole; + return materialProcessMethod; } - public void setMaterialRmb(BigDecimal materialRmb) + public void setMaterialModel(String materialModel) { - this.materialRmb = materialRmb; + this.materialModel = materialModel; } - public BigDecimal getMaterialRmb() + public String getMaterialModel() { - return materialRmb; + return materialModel; } - public void setMaterialNoRmb(BigDecimal materialNoRmb) + public void setWarehouseDept(String warehouseDept) { - this.materialNoRmb = materialNoRmb; + this.warehouseDept = warehouseDept; } - public BigDecimal getMaterialNoRmb() + public String getWarehouseDept() { - return materialNoRmb; + return warehouseDept; } - public void setUseStatus(String useStatus) + public void setMaterialNormbSum(BigDecimal materialNormbSum) { - this.useStatus = useStatus; + this.materialNormbSum = materialNormbSum; } - public String getSupplierCode() { - return supplierCode; + public BigDecimal getMaterialNormbSum() + { + return materialNormbSum; } - - public void setSupplierCode(String supplierCode) { - this.supplierCode = supplierCode; + public void setMaterialRmbSum(BigDecimal materialRmbSum) + { + this.materialRmbSum = materialRmbSum; } - public String getSupplierName() { - return supplierName; + public BigDecimal getMaterialRmbSum() + { + return materialRmbSum; } - - public void setSupplierName(String supplierName) { - this.supplierName = supplierName; + public void setPlanPurchaseNum(Integer planPurchaseNum) + { + this.planPurchaseNum = planPurchaseNum; } - public String getWarehouseDept() { - return warehouseDept; + public Integer getPlanPurchaseNum() + { + return planPurchaseNum; } - - public void setWarehouseDept(String warehouseDept) { - this.warehouseDept = warehouseDept; + public void setPurchaseNum(Integer purchaseNum) + { + this.purchaseNum = purchaseNum; } - public List getPurchaseSupplierList() { - return purchaseSupplierList; + public Integer getPurchaseNum() + { + return purchaseNum; } - - public void setPurchaseSupplierList(List purchaseSupplierList) { - this.purchaseSupplierList = purchaseSupplierList; + public void setActualPurchaseNum(Integer actualPurchaseNum) + { + this.actualPurchaseNum = actualPurchaseNum; } - public String getPlanCodes() { - return planCodes; + public Integer getActualPurchaseNum() + { + return actualPurchaseNum; } - - public void setPlanCodes(String planCodes) { - this.planCodes = planCodes; + public void setSharedInventoryOccupancyNum(Integer sharedInventoryOccupancyNum) + { + this.sharedInventoryOccupancyNum = sharedInventoryOccupancyNum; } - public String getUseStatus() + public Integer getSharedInventoryOccupancyNum() { - return useStatus; + return sharedInventoryOccupancyNum; } - public void setAuditStatus(String auditStatus) + public void setCancelNum(Integer cancelNum) { - this.auditStatus = auditStatus; + this.cancelNum = cancelNum; } - public String getAuditStatus() + public Integer getCancelNum() { - return auditStatus; + return cancelNum; } - public void setDelFlag(String delFlag) + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - - public String getDelFlag() { return delFlag; } - public List parseSupplierMaterialCombinations(String combinations) { - if (combinations == null || combinations.isEmpty()) { - return Collections.emptyList(); - } - //materialCode|purchaseQuoteCode|supplierCode|supplierName|materialName|materialNoRmb|materialRmb|purchasePlanCode|correlationCode - /* 1. 料号 | 2. 供应商报价编号 | 3. 供应商编号 | 4.供应商名称 | 5. 物料名称 | 6. 物料含税单价(RMB) | 7. 物料不含税单价(RMB) | 8关联采购计划单号 | 9关联相关订单号 */ - List purchaseSupplierList = new ArrayList<>(); - String[] split = combinations.split(","); - for (int i = 0; i < split.length; i++) { - String[] split1 = split[i].split("\\|"); - PurchaseQuoteChild purchaseQuoteChild = new PurchaseQuoteChild(); - purchaseQuoteChild.setMaterialCode(split1[0]); - purchaseQuoteChild.setPurchaseQuoteCode(split1[1]); - purchaseQuoteChild.setSupplierCode(split1[2]); - purchaseQuoteChild.setSupplierName(split1[3]); - purchaseQuoteChild.setMaterialName(split1[4]); - purchaseQuoteChild.setMaterialNoRmb(BigDecimal.valueOf(Float.parseFloat(split1[5]))); - purchaseQuoteChild.setMaterialRmb(BigDecimal.valueOf(Float.parseFloat(split1[6]))); - purchaseQuoteChild.setPurchasePlanCode(split1[7]); - purchaseQuoteChild.setCorrelationCode(split1[8]); - purchaseSupplierList.add(purchaseQuoteChild); - } - return purchaseSupplierList; - } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("purchasePlanChildId", getPurchasePlanChildId()) - .append("purchasePlanCode", getPurchasePlanCode()) - .append("materialId", getMaterialId()) - .append("materialCode", getMaterialCode()) - .append("materialName", getMaterialName()) - .append("materialType", getMaterialType()) - .append("processMethod", getProcessMethod()) - .append("brand", getBrand()) - .append("photoUrl", getPhotoUrl()) - .append("describe", getDescribe()) - .append("materialNum", getMaterialNum()) - .append("materialSole", getMaterialSole()) - .append("materialRmb", getMaterialRmb()) - .append("materialNoRmb", getMaterialNoRmb()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("useStatus", getUseStatus()) - .append("auditStatus", getAuditStatus()) - .append("delFlag", getDelFlag()) - .toString(); + .append("purchasePlanChildId", getPurchasePlanChildId()) + .append("purchasePlanCode", getPurchasePlanCode()) + .append("purchasePlanStatus", getPurchasePlanStatus()) + .append("correlationCode", getCorrelationCode()) + .append("purchasePlanType", getPurchasePlanType()) + .append("materialNo", getMaterialNo()) + .append("materialName", getMaterialName()) + .append("materialType", getMaterialType()) + .append("materialPhotourl", getMaterialPhotourl()) + .append("materialBrand", getMaterialBrand()) + .append("materialUnit", getMaterialUnit()) + .append("materialDescribe", getMaterialDescribe()) + .append("materialProcessMethod", getMaterialProcessMethod()) + .append("materialModel", getMaterialModel()) + .append("warehouseDept", getWarehouseDept()) + .append("materialNormbSum", getMaterialNormbSum()) + .append("materialRmbSum", getMaterialRmbSum()) + .append("planPurchaseNum", getPlanPurchaseNum()) + .append("purchaseNum", getPurchaseNum()) + .append("actualPurchaseNum", getActualPurchaseNum()) + .append("sharedInventoryOccupancyNum", getSharedInventoryOccupancyNum()) + .append("cancelNum", getCancelNum()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .toString(); } } 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 74c3d3bb..1b6b4777 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 @@ -97,8 +97,6 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService String loginName = ShiroUtils.getLoginName(); purchasePlan.setCreateBy(loginName); purchasePlan.setCreateTime(DateUtils.getNowDate()); - purchasePlan.setMaterialAmount(0L); - purchasePlan.setMaterialSum(0L); return purchasePlanMapper.insertPurchasePlan(purchasePlan); } @@ -221,48 +219,43 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService salesOrderChildByMaterialNo.put(salesOrderMaterialNo, salesOrderChild); } - double purchasePlanMaterialSum = 0L; + Integer purchasePlanMaterialSum = 0; // 第三步：计算purchasePlanNum for (SysMakeorderBom filterSysMakeorderBom : filterSysMakeorderBoms) { String salesOrderMaterialNo = filterSysMakeorderBom.getSalesOrderMaterialNo(); SysSalesOrderChild sysSalesOrderChild = salesOrderChildByMaterialNo.get(salesOrderMaterialNo); if (sysSalesOrderChild != null) { //物料数量 - long materialNum = sysSalesOrderChild.getMaterialNum(); + Integer materialNum = sysSalesOrderChild.getMaterialNum(); //用量 Integer useNum = filterSysMakeorderBom.getUseNum(); //采购计划数 - double purchasePlanNum = materialNum * useNum; + Integer purchasePlanNum = materialNum * useNum; // 立即创建PurchasePlanChild对象 PurchasePlanChild purchasePlanChild = new PurchasePlanChild(); purchasePlanChild.setPurchasePlanCode(purchasePlanCode); - purchasePlanChild.setMaterialCode(filterSysMakeorderBom.getMaterialNo()); + purchasePlanChild.setMaterialNo(filterSysMakeorderBom.getMaterialNo()); PurchasePlanChild tempPurchasePlanChild = purchasePlanChildMapper.selectPurchasePlanChildByCodeAndNo(purchasePlanChild); if (tempPurchasePlanChild != null){ purchasePlanChild.setPurchasePlanChildId(tempPurchasePlanChild.getPurchasePlanChildId()); - double addMaterialNum = tempPurchasePlanChild.getMaterialNum() + purchasePlanNum; //设置计划采购数 - purchasePlanChild.setMaterialNum(addMaterialNum); purchasePlanChildMapper.updatePurchasePlanChild(purchasePlanChild); }else { purchasePlanChild.setMaterialName(filterSysMakeorderBom.getMaterialName()); purchasePlanChild.setMaterialType(filterSysMakeorderBom.getMaterialType()); purchasePlanChild.setWarehouseDept(filterSysMakeorderBom.getWarehouseDept()); - purchasePlanChild.setProcessMethod("0"); - purchasePlanChild.setBrand(filterSysMakeorderBom.getBrand()); - purchasePlanChild.setDescribe(filterSysMakeorderBom.getDescribe()); - purchasePlanChild.setUnit(filterSysMakeorderBom.getUnit()); + purchasePlanChild.setMaterialProcessMethod("0"); + purchasePlanChild.setMaterialBrand(filterSysMakeorderBom.getBrand()); + purchasePlanChild.setMaterialDescribe(filterSysMakeorderBom.getDescribe()); + purchasePlanChild.setMaterialUnit(filterSysMakeorderBom.getUnit()); purchasePlanChild.setWarehouseDept(filterSysMakeorderBom.getWarehouseDept()); // 物料的计划采购数，使用计算出的purchasePlanNum - purchasePlanChild.setMaterialNum(purchasePlanNum); purchasePlanChild.setCreateBy(ShiroUtils.getLoginName()); purchasePlanChild.setCreateTime(new Date()); - purchasePlanChild.setUnit(filterSysMakeorderBom.getUnit()); - // 直接保存PurchasePlanChild对象 purchasePlanChildMapper.insertPurchasePlanChild(purchasePlanChild); } @@ -328,7 +321,6 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService .collect(Collectors.toList()); for (ErpBom subBom : filterSubBomList) { PurchasePlanChild purchasePlanChild = createPurchasePlanChild(purchasePlanCode, subBom, loginName); - purchasePlanChild.setMaterialNum((double) (erpDevelopModifyorderDetail.getMaterialNum() * subBom.getUseNum())); purchasePlanChildList.add(purchasePlanChild); } } @@ -337,18 +329,15 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService // 合并相同materialCode的数据 List mergedPurchasePlanChildList = mergePurchasePlanChildList(purchasePlanChildList); // 只需要加工方式为采购的 - List filterMergedPurchasePlanChildList = mergedPurchasePlanChildList.stream().filter(child -> "0".equals(child.getProcessMethod())).collect(Collectors.toList()); + List filterMergedPurchasePlanChildList = mergedPurchasePlanChildList.stream().filter(child -> "0".equals(child.getMaterialProcessMethod())).collect(Collectors.toList()); - purchasePlan.setMaterialAmount(Long.valueOf(filterMergedPurchasePlanChildList.size())); + purchasePlan.setEnterpriseSum(filterMergedPurchasePlanChildList.size()); // 计算所有 PurchasePlanChild 的 materialNum 总和 // Long totalMaterialNum = filterMergedPurchasePlanChildList.stream() // .mapToLong(PurchasePlanChild::getMaterialNum) // .sum(); - double totalMaterialNum = filterMergedPurchasePlanChildList.stream().mapToDouble(purchasePlanChild -> purchasePlanChild.getMaterialNum()).sum(); - - purchasePlan.setMaterialSum((long) totalMaterialNum); // 批量新增采购计划子表 // purchasePlanChildMapper.batchInsertPurchasePlanChild(filterMergedPurchasePlanChildList); @@ -366,13 +355,12 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService purchasePlanChild.setPurchasePlanCode(purchasePlanCode); purchasePlanChild.setCreateTime(new Date()); purchasePlanChild.setCreateBy(loginName); - purchasePlanChild.setMaterialCode(detail.getMaterialNo()); + purchasePlanChild.setMaterialNo(detail.getMaterialNo()); purchasePlanChild.setMaterialName(detail.getMaterialName()); purchasePlanChild.setMaterialType(detail.getMaterialType()); - purchasePlanChild.setBrand(detail.getMaterialBrand()); - purchasePlanChild.setUnit(detail.getMaterialUnit()); - purchasePlanChild.setDescribe(detail.getMaterialDescribe()); - purchasePlanChild.setMaterialNum(Double.valueOf(detail.getMaterialNum())); + purchasePlanChild.setMaterialBrand(detail.getMaterialBrand()); + purchasePlanChild.setMaterialUnit(detail.getMaterialUnit()); + purchasePlanChild.setMaterialDescribe(detail.getMaterialDescribe()); purchasePlanChild.setWarehouseDept(detail.getWarehouseDept()); return purchasePlanChild; } @@ -382,13 +370,14 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService purchasePlanChild.setPurchasePlanCode(purchasePlanCode); purchasePlanChild.setCreateTime(new Date()); purchasePlanChild.setCreateBy(loginName); - purchasePlanChild.setMaterialCode(bom.getMaterialNo()); + purchasePlanChild.setMaterialNo(bom.getMaterialNo()); purchasePlanChild.setMaterialName(bom.getMaterialName()); purchasePlanChild.setMaterialType(bom.getMaterialType()); - purchasePlanChild.setProcessMethod(bom.getProcessMethod()); - purchasePlanChild.setBrand(bom.getBrand()); - purchasePlanChild.setUnit(bom.getUnit()); - purchasePlanChild.setDescribe(bom.getDescribe()); + purchasePlanChild.setMaterialProcessMethod(bom.getProcessMethod()); + purchasePlanChild.setMaterialBrand(bom.getBrand()); + purchasePlanChild.setMaterialUnit(bom.getUnit()); + purchasePlanChild.setMaterialDescribe(bom.getDescribe()); + purchasePlanChild.setMaterialModel(bom.getMaterialModel()); purchasePlanChild.setWarehouseDept(bom.getWarehouseDept()); return purchasePlanChild; } @@ -397,12 +386,12 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService Map aggregatedMap = new HashMap<>(); for (PurchasePlanChild purchasePlanChild : purchasePlanChildList) { - String materialCode = purchasePlanChild.getMaterialCode(); - if (aggregatedMap.containsKey(materialCode)) { - PurchasePlanChild existing = aggregatedMap.get(materialCode); - existing.setMaterialNum(existing.getMaterialNum() + purchasePlanChild.getMaterialNum()); + String materialNo = purchasePlanChild.getMaterialNo(); + if (aggregatedMap.containsKey(materialNo)) { + PurchasePlanChild existing = aggregatedMap.get(materialNo); + existing.setPlanPurchaseNum(existing.getPlanPurchaseNum() + purchasePlanChild.getPlanPurchaseNum()); } else { - aggregatedMap.put(materialCode, purchasePlanChild); + aggregatedMap.put(materialNo, purchasePlanChild); } } @@ -416,23 +405,21 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService return redisCache.generateBillNo("CGJH"); } - private PurchasePlan buildPurchasePlan(SysMakeOrder sysMakeOrder, String purchasePlanCode,Integer materialAmount,double purchasePlanMaterialSum) { + private PurchasePlan buildPurchasePlan(SysMakeOrder sysMakeOrder, String purchasePlanCode,Integer materialAmount,Integer purchasePlanMaterialSum) { PurchasePlan purchasePlan = new PurchasePlan(); purchasePlan.setCorrelationCode(sysMakeOrder.getMakeNo()); purchasePlan.setPurchasePlanCode(purchasePlanCode); purchasePlan.setPurchasePlanType("1"); //添加物料合计 - purchasePlan.setMaterialAmount((long) materialAmount); + purchasePlan.setMaterialSum(materialAmount); //添加数量合计 - purchasePlan.setMaterialSum((long) purchasePlanMaterialSum); - purchasePlan.setNoRmbSum(sysMakeOrder.getNoRate()); + purchasePlan.setEnterpriseSum(purchasePlanMaterialSum); + purchasePlan.setNormbSum(sysMakeOrder.getNoRate()); purchasePlan.setRmbSum(sysMakeOrder.getRate()); purchasePlan.setApplyUser(sysMakeOrder.getSalesman()); purchasePlan.setCreateBy(ShiroUtils.getLoginName()); purchasePlan.setCreateTime(DateUtils.getNowDate()); - purchasePlan.setAuditStatus("0"); - purchasePlan.setUseStatus("0"); purchasePlan.setPurchasePlanStatus("0"); return purchasePlan; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java index 68c22cbf..bf322b2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java @@ -597,37 +597,36 @@ public class BaseRequisitioningOrderServiceImpl implements IBaseRequisitioningOr PurchasePlan purchasePlan = new PurchasePlan(); BigDecimal noRmbSum = BigDecimal.ZERO; BigDecimal rmbSum = BigDecimal.ZERO; - Long materialAmount = Long.valueOf(requisitioningOrderDetailList.size()); + Integer materialAmount = requisitioningOrderDetailList.size(); Long materialSum = 0L; //采购计划关联单号 purchasePlan.setPurchasePlanCode(redisCache.generateBillNo("CGJH")); purchasePlan.setPurchasePlanStatus("0"); purchasePlan.setCorrelationCode(requisitioningOrder.getRequisitioningCode()); purchasePlan.setPurchasePlanType("2"); - purchasePlan.setMaterialAmount(materialAmount); + purchasePlan.setMaterialSum(materialAmount); for (BaseRequisitioningOrderChild requisitioningOrderDetail : requisitioningOrderDetailList) { PurchasePlanChild purchasePlanChild = new PurchasePlanChild(); purchasePlanChild.setPurchasePlanCode(purchasePlan.getPurchasePlanCode()); - purchasePlanChild.setMaterialId(requisitioningOrderDetail.getMaterialId()); purchasePlanChild.setWarehouseDept(requisitioningOrderDetail.getWarehouseDept()); - purchasePlanChild.setMaterialCode(requisitioningOrderDetail.getMaterialCode()); + purchasePlanChild.setMaterialNo(requisitioningOrderDetail.getMaterialCode()); purchasePlanChild.setMaterialName(requisitioningOrderDetail.getMaterialName()); - purchasePlanChild.setDescribe(requisitioningOrderDetail.getDescribe()); - purchasePlanChild.setBrand(requisitioningOrderDetail.getBrand()); - purchasePlanChild.setUnit(requisitioningOrderDetail.getUnit()); - purchasePlanChild.setPhotoUrl(requisitioningOrderDetail.getPhotoUrl()); - purchasePlanChild.setProcessMethod(requisitioningOrderDetail.getProcessMethod()); - purchasePlanChild.setMaterialNum(Double.valueOf(requisitioningOrderDetail.getMaterialNum())); + purchasePlanChild.setMaterialDescribe(requisitioningOrderDetail.getDescribe()); + purchasePlanChild.setMaterialBrand(requisitioningOrderDetail.getBrand()); + purchasePlanChild.setMaterialUnit(requisitioningOrderDetail.getUnit()); + purchasePlanChild.setMaterialPhotourl(requisitioningOrderDetail.getPhotoUrl()); + purchasePlanChild.setMaterialProcessMethod(requisitioningOrderDetail.getProcessMethod()); + // purchasePlanChild.setMaterialNum(Double.valueOf(requisitioningOrderDetail.getMaterialNum())); purchasePlanChild.setMaterialType(requisitioningOrderDetail.getMaterialType()); - purchasePlanChild.setMaterialNoRmb(requisitioningOrderDetail.getMaterialNoRmb()); - purchasePlanChild.setMaterialRmb(requisitioningOrderDetail.getMaterialRmb()); + purchasePlanChild.setMaterialNormbSum(requisitioningOrderDetail.getMaterialNoRmb()); + purchasePlanChild.setMaterialRmbSum(requisitioningOrderDetail.getMaterialRmb()); // noRmbSum = noRmbSum.add(requisitioningOrderDetail.getMaterialNoRmb()); rmbSum = rmbSum.add(requisitioningOrderDetail.getMaterialRmbSum()); materialSum += requisitioningOrderDetail.getMaterialNum(); planChildMapper.insertPurchasePlanChild(purchasePlanChild); purchasePlanChildList.add(purchasePlanChild); } - purchasePlan.setMaterialSum(materialSum); + purchasePlan.setMaterialSum(Math.toIntExact(materialSum)); purchasePlan.setCreateBy(requisitioningOrder.getCreateBy()); purchasePlan.setApplyUser(requisitioningOrder.getApplyUser()); diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml index 2d4a8f84..e5fbf1e9 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml @@ -1,218 +1,147 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select purchase_plan_child_id, purchase_plan_code, material_id, - material_code, material_name, material_type, process_method, brand,unit, - photoUrl, `describe`, warehouseDept,material_num, material_sole, material_rmb,supplier_code,supplier_name, - material_noRmb, create_by, create_time, update_by, update_time, remark, - use_status, audit_status, del_flag from purchase_plan_child + select purchase_plan_child_id, purchase_plan_code, purchase_plan_status, correlation_code, purchase_plan_type, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, warehouse_dept, material_noRmb_sum, material_rmb_sum, plan_purchase_num, purchase_num, actual_purchase_num, shared_inventory_occupancy_num, cancel_num, create_by, create_time, update_by, update_time, remark, del_flag from purchase_plan_child - + - - - - - - - insert into purchase_plan_child purchase_plan_code, - material_id, - material_code, + purchase_plan_status, + correlation_code, + purchase_plan_type, + material_no, material_name, material_type, - process_method, - brand, - photoUrl, - `describe`, - unit, - warehouseDept, - material_num, - material_sole, - material_rmb, - material_noRmb, + material_photoUrl, + material_brand, + material_unit, + material_describe, + material_process_method, + material_model, + warehouse_dept, + material_noRmb_sum, + material_rmb_sum, + plan_purchase_num, + purchase_num, + actual_purchase_num, + shared_inventory_occupancy_num, + cancel_num, create_by, create_time, update_by, update_time, remark, - use_status, - audit_status, del_flag, - + #{purchasePlanCode}, - #{materialId}, - #{materialCode}, + #{purchasePlanStatus}, + #{correlationCode}, + #{purchasePlanType}, + #{materialNo}, #{materialName}, #{materialType}, - #{processMethod}, - #{brand}, - #{photoUrl}, - #{describe}, - #{unit}, + #{materialPhotourl}, + #{materialBrand}, + #{materialUnit}, + #{materialDescribe}, + #{materialProcessMethod}, + #{materialModel}, #{warehouseDept}, - #{materialNum}, - #{materialSole}, - #{materialRmb}, - #{materialNoRmb}, + #{materialNormbSum}, + #{materialRmbSum}, + #{planPurchaseNum}, + #{purchaseNum}, + #{actualPurchaseNum}, + #{sharedInventoryOccupancyNum}, + #{cancelNum}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}, - #{useStatus}, - #{auditStatus}, #{delFlag}, - - - - - - insert into purchase_plan_child - - purchase_plan_code, - material_code, - material_name, - material_type, - process_method, - brand, - `describe`, - unit, - warehouse_dept, - material_num, - create_by, - create_time, - update_by, - update_time, - remark, - use_status, - audit_status, - del_flag, - - - values - - #{item.purchasePlanCode}, - #{item.materialCode}, - #{item.materialName}, - #{item.materialType}, - #{item.processMethod}, - #{item.brand}, - #{item.describe}, - #{item.unit}, - #{item.warehouseDept}, - #{item.materialNum}, - #{item.createBy}, - #{item.createTime}, - #{item.updateBy}, - #{item.updateTime}, - #{item.remark}, - #{item.useStatus}, - #{item.auditStatus}, - #{item.delFlag} - - - - update purchase_plan_child purchase_plan_code = #{purchasePlanCode}, - material_id = #{materialId}, - material_code = #{materialCode}, + purchase_plan_status = #{purchasePlanStatus}, + correlation_code = #{correlationCode}, + purchase_plan_type = #{purchasePlanType}, + material_no = #{materialNo}, material_name = #{materialName}, material_type = #{materialType}, - process_method = #{processMethod}, - brand = #{brand}, - photoUrl = #{photoUrl}, - `describe` = #{describe}, - unit = #{unit}, - warehouseDept = #{warehouseDept}, - material_num = #{materialNum}, - material_sole = #{materialSole}, - material_rmb = #{materialRmb}, - material_noRmb = #{materialNoRmb}, + material_photoUrl = #{materialPhotourl}, + material_brand = #{materialBrand}, + material_unit = #{materialUnit}, + material_describe = #{materialDescribe}, + material_process_method = #{materialProcessMethod}, + material_model = #{materialModel}, + warehouse_dept = #{warehouseDept}, + material_noRmb_sum = #{materialNormbSum}, + material_rmb_sum = #{materialRmbSum}, + plan_purchase_num = #{planPurchaseNum}, + purchase_num = #{purchaseNum}, + actual_purchase_num = #{actualPurchaseNum}, + shared_inventory_occupancy_num = #{sharedInventoryOccupancyNum}, + cancel_num = #{cancelNum}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, - use_status = #{useStatus}, - audit_status = #{auditStatus}, del_flag = #{delFlag}, where purchase_plan_child_id = #{purchasePlanChildId} @@ -223,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from purchase_plan_child where purchase_plan_child_id in + delete from purchase_plan_child where purchase_plan_child_id in #{purchasePlanChildId} @@ -236,63 +165,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update purchase_plan_child set del_flag = '0' where purchase_plan_child_id = #{purchasePlanChildId} - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml index eb81d0e7..97acc62b 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml @@ -1,63 +1,53 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - + + + + + + + + + - - - - + - select purchase_plan_id, purchase_plan_code, purchase_plan_status, correlation_code, purchase_plan_type, material_amount, materialSum, noRmbSum, rmbSum, apply_user, first_add_time, update_info_time, create_by, create_time, update_by, update_time, audit_status, use_status, remark from purchase_plan + select purchase_plan_id, purchase_plan_code, purchase_plan_status, correlation_code, purchase_plan_type, material_sum, enterprise_sum, noRmb_sum, rmb_sum, plan_purchase_sum, purchase_sum, actual_purchase_sum, shared_inventory_occupancy_sum, cancel_sum, apply_user, create_by, create_time, update_by, update_time, remark, del_flag from purchase_plan - + - - + insert into purchase_plan @@ -65,41 +55,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" purchase_plan_status, correlation_code, purchase_plan_type, - material_amount, - materialSum, - noRmbSum, - rmbSum, + material_sum, + enterprise_sum, + noRmb_sum, + rmb_sum, + plan_purchase_sum, + purchase_sum, + actual_purchase_sum, + shared_inventory_occupancy_sum, + cancel_sum, apply_user, - first_add_time, - update_info_time, create_by, create_time, update_by, update_time, - audit_status, - use_status, remark, - + del_flag, + #{purchasePlanCode}, #{purchasePlanStatus}, #{correlationCode}, #{purchasePlanType}, - #{materialAmount}, #{materialSum}, - #{noRmbSum}, + #{enterpriseSum}, + #{normbSum}, #{rmbSum}, + #{planPurchaseSum}, + #{purchaseSum}, + #{actualPurchaseSum}, + #{sharedInventoryOccupancySum}, + #{cancelSum}, #{applyUser}, - #{firstAddTime}, - #{updateInfoTime}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, - #{auditStatus}, - #{useStatus}, #{remark}, - + #{delFlag}, + @@ -109,20 +103,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" purchase_plan_status = #{purchasePlanStatus}, correlation_code = #{correlationCode}, purchase_plan_type = #{purchasePlanType}, - material_amount = #{materialAmount}, - materialSum = #{materialSum}, - noRmbSum = #{noRmbSum}, - rmbSum = #{rmbSum}, + material_sum = #{materialSum}, + enterprise_sum = #{enterpriseSum}, + noRmb_sum = #{normbSum}, + rmb_sum = #{rmbSum}, + plan_purchase_sum = #{planPurchaseSum}, + purchase_sum = #{purchaseSum}, + actual_purchase_sum = #{actualPurchaseSum}, + shared_inventory_occupancy_sum = #{sharedInventoryOccupancySum}, + cancel_sum = #{cancelSum}, apply_user = #{applyUser}, - first_add_time = #{firstAddTime}, - update_info_time = #{updateInfoTime}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, - audit_status = #{auditStatus}, - use_status = #{useStatus}, remark = #{remark}, + del_flag = #{delFlag}, where purchase_plan_id = #{purchasePlanId} @@ -145,8 +141,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update purchase_plan set del_flag = '0' where purchase_plan_id = #{purchasePlanId} - - update purchase_plan set purchase_plan_status = #{purchasePlanStatus} - where purchase_plan_code = #{purchasePlanCode} - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html index e8b1be36..a8cd37d1 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html @@ -104,9 +104,13 @@ {title: '采购计划单号',field: 'purchasePlanCode'}, {title: '关联单号', field: 'correlationCode',}, {title: '采购来源',field: 'purchasePlanType',formatter: function(value, row, index) {return $.table.selectDictLabel(purchasePlanTypeDatas, value);}}, - {title: '物料合计',field: 'materialAmount',}, - {title: '数量总计', field: 'materialSum',}, - {title: '不含税总价(RMB)',field: 'noRmbSum',}, + {title: '物料合计',field: 'materialSum',}, + {title: '计划采购总数',field: 'planPurchaseSum',}, + {title: '待采购总数',field: 'purchaseSum',}, + {title: '实际采购总数',field: 'actualPurchaseSum',}, + {title: '共享库存占用总数',field: 'sharedInventoryOccupancySum',}, + {title: '作废总数',field: 'cancelSum',}, + {title: '不含税总价(RMB)',field: 'normbSum',}, {title: '含税总价(RMB)',field: 'rmbSum',}, {title: '申请人',field: 'applyUser',}, {title: '录入时间',field: 'createTime',}, @@ -133,23 +137,33 @@ contentType: "application/x-www-form-urlencoded", queryParams : {purchasePlanCode: row.purchasePlanCode}, columns: [ - {field: 'purchasePlanId',title: '主键id',visible: false}, - {field: 'materialCode',title: '料号',}, - {field: 'photoUrl',title: '图片', + {field: 'purchasePlanChildId',title: '主键id',visible: false}, + {title: '采购计划状态',field: 'purchasePlanStatus', + formatter: function(value, row, index) {return $.table.selectDictLabel(purchasePlanStatusDatas, value);} + }, + {field: 'materialNo',title: '料号',}, + {field: 'materialPhotourl',title: '图片', formatter: function(value, row, index) {return $.table.imageView(value);} }, {field: 'materialName',title: '物料名称',}, {field: 'materialType',title: '物料类型', formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);} }, - {field: 'describe',title: '描述',}, - {field: 'brand',title: '品牌',}, - {field: 'processMethod',title: '加工方式', + {field: 'materialDescribe',title: '描述',}, + {field: 'materialModel',title: '型号',}, + {field: 'materialBrand',title: '品牌',}, + {field: 'materialProcessMethod',title: '加工方式', formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);} }, - {field: 'unit',title: '单位', }, + {field: 'materialUnit',title: '单位', }, + {title: '计划采购数',field: 'planPurchaseNum',}, + {title: '待采购数',field: 'purchaseNum',}, + {title: '实际采购数',field: 'actualPurchaseNum',}, + {title: '共享库存占用数',field: 'sharedInventoryOccupancyNum',}, + {title: '作废数',field: 'cancelNum',}, + {title: '不含税总价(RMB)',field: 'materialNormbSum',}, + {title: '含税总价(RMB)',field: 'materialRmbSum',}, {field: 'warehouseDept',title: '入库部门',visible: false}, - {field: 'materialNum',title: '计划采购数',}, ] }); };