产品入库单添加物料字段。

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecpt.java

@@ -40,6 +40,26 @@ public class WmProductRecpt extends BaseEntity
     @Excel(name = "生产工单名称")
     private String workorderName;
 
+    /** 产品物料ID */
+    @Excel(name = "产品物料ID")
+    private Long itemId;
+
+    /** 产品物料编码 */
+    @Excel(name = "产品物料编码")
+    private String itemCode;
+
+    /** 产品物料名称 */
+    @Excel(name = "产品物料名称")
+    private String itemName;
+
+    /** 规格型号 */
+    @Excel(name = "规格型号")
+    private String specification;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unitOfMeasure;
+
     /** 仓库ID */
     @Excel(name = "仓库ID")
     private Long warehouseId;
@@ -151,6 +171,47 @@ public class WmProductRecpt extends BaseEntity
     {
         return workorderName;
     }
+
+    public Long getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public String getSpecification() {
+        return specification;
+    }
+
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    public String getUnitOfMeasure() {
+        return unitOfMeasure;
+    }
+
+    public void setUnitOfMeasure(String unitOfMeasure) {
+        this.unitOfMeasure = unitOfMeasure;
+    }
+
     public void setWarehouseId(Long warehouseId)
     {
         this.warehouseId = warehouseId;
@@ -289,33 +350,33 @@ public class WmProductRecpt extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return "WmProductRecpt{" +
-            .append("recptId", getRecptId())
+                "recptId=" + recptId +
-            .append("recptCode", getRecptCode())
+                ", recptCode='" + recptCode + '\'' +
-            .append("recptName", getRecptName())
+                ", recptName='" + recptName + '\'' +
-            .append("workorderId", getWorkorderId())
+                ", workorderId=" + workorderId +
-            .append("workorderCode", getWorkorderCode())
+                ", workorderCode='" + workorderCode + '\'' +
-            .append("workorderName", getWorkorderName())
+                ", workorderName='" + workorderName + '\'' +
-            .append("warehouseId", getWarehouseId())
+                ", itemId=" + itemId +
-            .append("warehouseCode", getWarehouseCode())
+                ", itemCode='" + itemCode + '\'' +
-            .append("warehouseName", getWarehouseName())
+                ", itemName='" + itemName + '\'' +
-            .append("locationId", getLocationId())
+                ", specification='" + specification + '\'' +
-            .append("locationCode", getLocationCode())
+                ", unitOfMeasure='" + unitOfMeasure + '\'' +
-            .append("locationName", getLocationName())
+                ", warehouseId=" + warehouseId +
-            .append("areaId", getAreaId())
+                ", warehouseCode='" + warehouseCode + '\'' +
-            .append("areaCode", getAreaCode())
+                ", warehouseName='" + warehouseName + '\'' +
-            .append("areaName", getAreaName())
+                ", locationId=" + locationId +
-            .append("recptDate", getRecptDate())
+                ", locationCode='" + locationCode + '\'' +
-            .append("status", getStatus())
+                ", locationName='" + locationName + '\'' +
-            .append("remark", getRemark())
+                ", areaId=" + areaId +
-            .append("attr1", getAttr1())
+                ", areaCode='" + areaCode + '\'' +
-            .append("attr2", getAttr2())
+                ", areaName='" + areaName + '\'' +
-            .append("attr3", getAttr3())
+                ", recptDate=" + recptDate +
-            .append("attr4", getAttr4())
+                ", status='" + status + '\'' +
-            .append("createBy", getCreateBy())
+                ", attr1='" + attr1 + '\'' +
-            .append("createTime", getCreateTime())
+                ", attr2='" + attr2 + '\'' +
-            .append("updateBy", getUpdateBy())
+                ", attr3=" + attr3 +
-            .append("updateTime", getUpdateTime())
+                ", attr4=" + attr4 +
-            .toString();
+                '}';
     }
 }

ktg-mes/src/main/resources/mapper/wm/WmProductRecptMapper.xml

@@ -11,6 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="workorderId"    column="workorder_id"    />
         <result property="workorderCode"    column="workorder_code"    />
         <result property="workorderName"    column="workorder_name"    />
+        <result property="itemId"    column="item_id"    />
+        <result property="itemCode"    column="item_code"    />
+        <result property="itemName"    column="item_name"    />
+        <result property="specification"    column="specification"    />
+        <result property="unitOfMeasure"    column="unit_of_measure"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="warehouseCode"    column="warehouse_code"    />
         <result property="warehouseName"    column="warehouse_name"    />
@@ -34,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmProductRecptVo">
-        select recpt_id, recpt_code, recpt_name, workorder_id, workorder_code, workorder_name, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, recpt_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt
+        select recpt_id, recpt_code, recpt_name, workorder_id, workorder_code, workorder_name,item_id, item_code, item_name, specification, unit_of_measure, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, recpt_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt
     </sql>
 
     <select id="selectWmProductRecptList" parameterType="WmProductRecpt" resultMap="WmProductRecptResult">
@@ -45,6 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workorderId != null "> and workorder_id = #{workorderId}</if>
             <if test="workorderCode != null  and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
             <if test="workorderName != null  and workorderName != ''"> and workorder_name like concat('%', #{workorderName}, '%')</if>
+            <if test="itemId != null "> and item_id = #{itemId}</if>
+            <if test="itemCode != null  and itemCode != ''"> and item_code = #{itemCode}</if>
+            <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
+            <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
+            <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
             <if test="warehouseCode != null  and warehouseCode != ''"> and warehouse_code = #{warehouseCode}</if>
             <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
@@ -77,6 +87,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workorderId != null">workorder_id,</if>
             <if test="workorderCode != null">workorder_code,</if>
             <if test="workorderName != null">workorder_name,</if>
+            <if test="itemId != null">item_id,</if>
+            <if test="itemCode != null">item_code,</if>
+            <if test="itemName != null">item_name,</if>
+            <if test="specification != null">specification,</if>
+            <if test="unitOfMeasure != null">unit_of_measure,</if>
             <if test="warehouseId != null">warehouse_id,</if>
             <if test="warehouseCode != null">warehouse_code,</if>
             <if test="warehouseName != null">warehouse_name,</if>
@@ -104,6 +119,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workorderId != null">#{workorderId},</if>
             <if test="workorderCode != null">#{workorderCode},</if>
             <if test="workorderName != null">#{workorderName},</if>
+            <if test="itemId != null">#{itemId},</if>
+            <if test="itemCode != null">#{itemCode},</if>
+            <if test="itemName != null">#{itemName},</if>
+            <if test="specification != null">#{specification},</if>
+            <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
             <if test="warehouseCode != null">#{warehouseCode},</if>
             <if test="warehouseName != null">#{warehouseName},</if>
@@ -135,6 +155,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workorderId != null">workorder_id = #{workorderId},</if>
             <if test="workorderCode != null">workorder_code = #{workorderCode},</if>
             <if test="workorderName != null">workorder_name = #{workorderName},</if>
+            <if test="itemId != null">item_id = #{itemId},</if>
+            <if test="itemCode != null">item_code = #{itemCode},</if>
+            <if test="itemName != null">item_name = #{itemName},</if>
+            <if test="specification != null">specification = #{specification},</if>
+            <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
             <if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if>
             <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>