入库部分和接口

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java

@@ -82,6 +82,15 @@ public class OutStockout extends BaseEntity
 
     @Excel(name = "确认时间")
     private String finishDate;
+    private String spare1;
+
+    private String spare2;
+
+    private String spare3;
+
+    private String spare4;
+
+    private String spare5;
 
     private String customerName;
 
@@ -299,24 +308,76 @@ public class OutStockout extends BaseEntity
         return erpStockoutId;
     }
 
+    public String getSpare1() {
+        return spare1;
+    }
+
+    public void setSpare1(String spare1) {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare2() {
+        return spare2;
+    }
+
+    public void setSpare2(String spare2) {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare3() {
+        return spare3;
+    }
+
+    public void setSpare3(String spare3) {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare4() {
+        return spare4;
+    }
+
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare5() {
+        return spare5;
+    }
+
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("stockoutGuid", getStockoutGuid())
-            .append("stockoutId", getStockoutId())
-            .append("outType", getOutType())
-            .append("createDate", getCreateDate())
-            .append("departmentNo", getDepartmentNo())
-            .append("customerNo", getCustomerNo())
-            .append("createManId", getCreateManId())
-            .append("status", getStatus())
-            .append("stockoutSource", getStockoutSource())
-            .append("warehouseId", getWarehouseId())
-            .append("classNowId", getClassNowId())
-            .append("exitId", getExitId())
-            .append("carNumber", getCarNumber())
-            .append("FID", getFID())
-            .append("erpStockoutId", getErpStockoutId())
-            .toString();
+        return "OutStockout{" +
+                "stockoutGuid='" + stockoutGuid + '\'' +
+                ", stockoutId='" + stockoutId + '\'' +
+                ", outType='" + outType + '\'' +
+                ", createDate='" + createDate + '\'' +
+                ", departmentNo='" + departmentNo + '\'' +
+                ", customerNo='" + customerNo + '\'' +
+                ", createManId='" + createManId + '\'' +
+                ", status='" + status + '\'' +
+                ", stockoutSource='" + stockoutSource + '\'' +
+                ", warehouseId='" + warehouseId + '\'' +
+                ", classNowId='" + classNowId + '\'' +
+                ", exitId='" + exitId + '\'' +
+                ", carNumber='" + carNumber + '\'' +
+                ", FID='" + FID + '\'' +
+                ", erpStockoutId='" + erpStockoutId + '\'' +
+                ", startDate='" + startDate + '\'' +
+                ", finishDate='" + finishDate + '\'' +
+                ", spare1='" + spare1 + '\'' +
+                ", spare2='" + spare2 + '\'' +
+                ", spare3='" + spare3 + '\'' +
+                ", spare4='" + spare4 + '\'' +
+                ", spare5='" + spare5 + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", warehouseName='" + warehouseName + '\'' +
+                ", productId='" + productId + '\'' +
+                ", productName='" + productName + '\'' +
+                ", typeData=" + typeData +
+                '}';
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java

@@ -171,6 +171,108 @@ public class OutStockoutDetail extends BaseEntity
     @Excel(name = "订单号")
     private String orderId;
 
+    @Excel(name = "型号")
+    private String spare1;
+
+    /** 备用字段2 */
+    @Excel(name = "净重")
+    private String spare2;
+
+    /** 备用字段3 */
+    @Excel(name = "颜色")
+    private String spare3;
+
+    /** 备用字段4 */
+    @Excel(name = "序列号")
+    private String spare4;
+
+    /** 备用字段5 */
+    @Excel(name = "电压")
+    private String spare5;
+
+    /** 备用字段6 */
+    @Excel(name = "功率")
+    private String spare6;
+    @Excel(name = "相位")
+    private String spare7;
+    @Excel(name = "毛重")
+    private String spare8;
+
+    private String spare9;
+
+
+    public String getSpare1() {
+        return spare1;
+    }
+
+    public void setSpare1(String spare1) {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare2() {
+        return spare2;
+    }
+
+    public void setSpare2(String spare2) {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare3() {
+        return spare3;
+    }
+
+    public void setSpare3(String spare3) {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare4() {
+        return spare4;
+    }
+
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare5() {
+        return spare5;
+    }
+
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare6() {
+        return spare6;
+    }
+
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare7() {
+        return spare7;
+    }
+
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare8() {
+        return spare8;
+    }
+
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare9() {
+        return spare9;
+    }
+
+    public void setSpare9(String spare9) {
+        this.spare9 = spare9;
+    }
+
     public String getVoltage() {
         return voltage;
     }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/service/impl/OutStockoutDetailServiceImpl.java

@@ -54,7 +54,7 @@ public class OutStockoutDetailServiceImpl implements IOutStockoutDetailService
     @Override
     public int insertOutStockoutDetail(OutStockoutDetail outStockoutDetail)
     {
-        outStockoutDetail.setCreateTime(DateUtils.getNowDate());
+//        outStockoutDetail.setCreateTime(DateUtils.getNowDate());
         return outStockoutDetailMapper.insertOutStockoutDetail(outStockoutDetail);
     }