From b894d6c81e26c963876d51002cfdf2043045dba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 22 Nov 2024 08:46:15 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=93=81?= =?UTF-8?q?=E8=B4=A8=E5=8D=95=E8=AF=A6=E6=83=85=E5=AF=B9=E8=B1=A1=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=9E=8B=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=88=B0=E8=B4=A7=E7=AD=89?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E5=93=81?= =?UTF-8?q?=E8=B4=A8=E5=8D=95=E5=AF=B9=E8=B1=A1=E6=96=99=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0=E3=80=81=E5=BE=85=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=95=B0=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=AF=B9=E8=B1=A1=E6=95=B0=E9=87=8F=E6=9C=89=E5=85=B3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=B8=BAint=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/domain/ErpInboundOrderDetail.java | 12 ++-- .../ruoyi/quality/domain/QualityOrder.java | 33 +++++++++ .../quality/domain/QualityOrderDetail.java | 71 +++++++------------ 3 files changed, 66 insertions(+), 50 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrderDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrderDetail.java index 32cdf6ce..391d28c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrderDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrderDetail.java @@ -44,11 +44,11 @@ public class ErpInboundOrderDetail extends BaseEntity /** 已完成数 */ @Excel(name = "已完成数") - private Long completedNum; + private int completedNum; /** 本次完成数 */ @Excel(name = "本次完成数") - private Long currentNum; + private int currentNum; /** 加工费单价 */ @Excel(name = "加工费单价") @@ -117,21 +117,21 @@ public class ErpInboundOrderDetail extends BaseEntity this.availableStockNum = availableStockNum; } - public void setCompletedNum(Long completedNum) + public void setCompletedNum(int completedNum) { this.completedNum = completedNum; } - public Long getCompletedNum() + public int getCompletedNum() { return completedNum; } - public void setCurrentNum(Long currentNum) + public void setCurrentNum(int currentNum) { this.currentNum = currentNum; } - public Long getCurrentNum() + public int getCurrentNum() { return currentNum; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrder.java index 755250f3..06333ced 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrder.java @@ -47,6 +47,15 @@ public class QualityOrder extends BaseEntity @Excel(name = "品质单入库类型") private String qualityStorageStatus; + //料号 + private String materialNo; + + //物料名称 + private String materialName; + + //待审核数 + private int pendingReviewNum; + /** 本次到货数量 */ @Excel(name = "本次到货数量") private Integer thisArrivedNum; @@ -235,6 +244,30 @@ public class QualityOrder extends BaseEntity this.storageNum = storageNum; } + public String getMaterialNo() { + return materialNo; + } + + public void setMaterialNo(String materialNo) { + this.materialNo = materialNo; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public int getPendingReviewNum() { + return pendingReviewNum; + } + + public void setPendingReviewNum(int pendingReviewNum) { + this.pendingReviewNum = pendingReviewNum; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderDetail.java index a5cffbe7..fa886878 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderDetail.java @@ -106,6 +106,9 @@ public class QualityOrderDetail extends BaseEntity @Excel(name = "物料描述") private String materialDescribe; + //物料型号 + private String materialModel; + /** 物料加工方式 */ @Excel(name = "物料加工方式") private String materialProcessMethod; @@ -121,13 +124,6 @@ public class QualityOrderDetail extends BaseEntity /** 生产完成数 */ private Integer makeCompletionNum; - /** 实际到货数量 */ - @Excel(name = "实际到货数量") - private Integer actualArriveNum; - - /** 本次到货数量 */ - @Excel(name = "本次到货数量") - private Integer thisArrivedNum; /** 品质已合格数 */ @Excel(name = "品质已合格数") @@ -141,13 +137,12 @@ public class QualityOrderDetail extends BaseEntity @Excel(name = "品质不合格数") private Integer qualityUnqualifiedNum; - /** 委内已完成数 */ - @Excel(name = "委内已完成数") - private Integer makeInNum; + //检验数 + private int checkNum; + //待审核数 + private int pendingReviewNum; - /** 委内加工费单价 */ - private BigDecimal makeInUnitPrice; public void setQualityOrderDetailId(Long qualityOrderDetailId) @@ -374,22 +369,6 @@ public class QualityOrderDetail extends BaseEntity this.makeCompletionNum = makeCompletionNum; } - public Integer getActualArriveNum() { - return actualArriveNum; - } - - public void setActualArriveNum(Integer actualArriveNum) { - this.actualArriveNum = actualArriveNum; - } - - public Integer getThisArrivedNum() { - return thisArrivedNum; - } - - public void setThisArrivedNum(Integer thisArrivedNum) { - this.thisArrivedNum = thisArrivedNum; - } - public Integer getQualityHasqualifiedNum() { return qualityHasqualifiedNum; } @@ -414,28 +393,36 @@ public class QualityOrderDetail extends BaseEntity this.qualityUnqualifiedNum = qualityUnqualifiedNum; } - public Integer getMakeInNum() { - return makeInNum; + public String getMaterialDeptType() { + return materialDeptType; + } + + public void setMaterialDeptType(String materialDeptType) { + this.materialDeptType = materialDeptType; } - public void setMakeInNum(Integer makeInNum) { - this.makeInNum = makeInNum; + public int getCheckNum() { + return checkNum; } - public BigDecimal getMakeInUnitPrice() { - return makeInUnitPrice; + public void setCheckNum(int checkNum) { + this.checkNum = checkNum; } - public void setMakeInUnitPrice(BigDecimal makeInUnitPrice) { - this.makeInUnitPrice = makeInUnitPrice; + public int getPendingReviewNum() { + return pendingReviewNum; } - public String getMaterialDeptType() { - return materialDeptType; + public void setPendingReviewNum(int pendingReviewNum) { + this.pendingReviewNum = pendingReviewNum; } - public void setMaterialDeptType(String materialDeptType) { - this.materialDeptType = materialDeptType; + public String getMaterialModel() { + return materialModel; + } + + public void setMaterialModel(String materialModel) { + this.materialModel = materialModel; } @Override @@ -466,14 +453,10 @@ public class QualityOrderDetail extends BaseEntity .append("materialProcessMethod", getMaterialProcessMethod()) .append("materialDeptType",getMaterialDeptType()) .append("makeTotal", getMakeTotal()) - .append("actualArriveNum", getActualArriveNum()) - .append("thisArrivedNum", getThisArrivedNum()) .append("qualityHasqualifiedNum", getQualityHasqualifiedNum()) .append("qualityQualifiedNum", getQualityQualifiedNum()) .append("qualityUnqualifiedNum", getQualityUnqualifiedNum()) - .append("makeInNum",getMakeInNum()) .append("makeCompletionNum",getMakeCompletionNum()) - .append("makeInUnitPrice",getMakeInUnitPrice()) .append("remark", getRemark()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime())