[fix]

品质管理 品质单
修改品质单详情对象，添加物料型号字段，去除到货等字段；
新增品质单对象料号、物料名称、待审核数字段；
修改生产入库单详情对象数量有关字段类型为int；

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;
     }

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)

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())