Merge remote-tracking branch 'origin/master'

ktg-mes/src/main/java/com/ktg/mes/md/domain/BaseKnife.java

@@ -3,6 +3,7 @@ package com.ktg.mes.md.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.BaseEntity;
+import com.ktg.mes.wm.domain.WmsInPlanDetailEntity;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -122,6 +123,14 @@ public class BaseKnife extends BaseEntity {
     @Excel(name = "物料或整刀")
     private String itemOrProduct;
 
+    /**
+     * 入库信息
+     */
+    private List<WmsInPlanDetailEntity> inInfoList;
+
+    /**
+     * 出库信息
+     */
     private List<HashMap<String, Object>> outInfoList;
 
     /**
@@ -366,6 +375,14 @@ public class BaseKnife extends BaseEntity {
         this.outInfoList = outInfoList;
     }
 
+    public List<WmsInPlanDetailEntity> getInInfoList() {
+        return inInfoList;
+    }
+
+    public void setInInfoList(List<WmsInPlanDetailEntity> inInfoList) {
+        this.inInfoList = inInfoList;
+    }
+
     @Override
     public String toString() {
         return "BaseKnife{" +
@@ -376,10 +393,10 @@ public class BaseKnife extends BaseEntity {
                 ", knifeName='" + knifeName + '\'' +
                 ", knifeUnit='" + knifeUnit + '\'' +
                 ", knifeType='" + knifeType + '\'' +
-                ", safeStock='" + safeStock + '\'' +
+                ", safeStock=" + safeStock +
                 ", standardQuantity='" + standardQuantity + '\'' +
                 ", areaCode='" + areaCode + '\'' +
-                ", knifeLife='" + knifeLife + '\'' +
+                ", knifeLife=" + knifeLife +
                 ", knifeFineState=" + knifeFineState +
                 ", scrapTime=" + scrapTime +
                 ", isLocked=" + isLocked +
@@ -388,6 +405,7 @@ public class BaseKnife extends BaseEntity {
                 ", planSheet='" + planSheet + '\'' +
                 ", resetCount=" + resetCount +
                 ", itemOrProduct='" + itemOrProduct + '\'' +
+                ", inInfoList=" + inInfoList +
                 ", outInfoList=" + outInfoList +
                 ", attr1=" + attr1 +
                 ", attr2='" + attr2 + '\'' +