库存增加生产日期
This commit is contained in:
parent
d5e8d4499f
commit
6703561346
@ -50,11 +50,9 @@ public class WmMaterialStock extends BaseEntity
|
|||||||
private String batchCode;
|
private String batchCode;
|
||||||
|
|
||||||
/** 仓库ID */
|
/** 仓库ID */
|
||||||
@Excel(name = "仓库ID")
|
|
||||||
private Long warehouseId;
|
private Long warehouseId;
|
||||||
|
|
||||||
/** 仓库编码 */
|
/** 仓库编码 */
|
||||||
@Excel(name = "仓库编码")
|
|
||||||
private String warehouseCode;
|
private String warehouseCode;
|
||||||
|
|
||||||
/** 仓库名称 */
|
/** 仓库名称 */
|
||||||
@ -62,11 +60,9 @@ public class WmMaterialStock extends BaseEntity
|
|||||||
private String warehouseName;
|
private String warehouseName;
|
||||||
|
|
||||||
/** 库区ID */
|
/** 库区ID */
|
||||||
@Excel(name = "库区ID")
|
|
||||||
private Long locationId;
|
private Long locationId;
|
||||||
|
|
||||||
/** 库区编码 */
|
/** 库区编码 */
|
||||||
@Excel(name = "库区编码")
|
|
||||||
private String locationCode;
|
private String locationCode;
|
||||||
|
|
||||||
/** 库区名称 */
|
/** 库区名称 */
|
||||||
@ -74,11 +70,9 @@ public class WmMaterialStock extends BaseEntity
|
|||||||
private String locationName;
|
private String locationName;
|
||||||
|
|
||||||
/** 库位ID */
|
/** 库位ID */
|
||||||
@Excel(name = "库位ID")
|
|
||||||
private Long areaId;
|
private Long areaId;
|
||||||
|
|
||||||
/** 库位编码 */
|
/** 库位编码 */
|
||||||
@Excel(name = "库位编码")
|
|
||||||
private String areaCode;
|
private String areaCode;
|
||||||
|
|
||||||
/** 库位名称 */
|
/** 库位名称 */
|
||||||
@ -86,7 +80,6 @@ public class WmMaterialStock extends BaseEntity
|
|||||||
private String areaName;
|
private String areaName;
|
||||||
|
|
||||||
/** 供应商ID */
|
/** 供应商ID */
|
||||||
@Excel(name = "供应商ID")
|
|
||||||
private Long vendorId;
|
private Long vendorId;
|
||||||
|
|
||||||
/** 供应商编号 */
|
/** 供应商编号 */
|
||||||
@ -114,6 +107,12 @@ public class WmMaterialStock extends BaseEntity
|
|||||||
@Excel(name = "生产工单编号")
|
@Excel(name = "生产工单编号")
|
||||||
private String workorderCode;
|
private String workorderCode;
|
||||||
|
|
||||||
|
/** 生产日期 */
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
|
private Date productionDate;
|
||||||
|
|
||||||
|
|
||||||
/** 库存有效期 */
|
/** 库存有效期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
|
||||||
@Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
|
@Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
|
||||||
@ -375,6 +374,14 @@ public class WmMaterialStock extends BaseEntity
|
|||||||
return expireDate;
|
return expireDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Date getProductionDate() {
|
||||||
|
return productionDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProductionDate(Date productionDate) {
|
||||||
|
this.productionDate = productionDate;
|
||||||
|
}
|
||||||
|
|
||||||
public String getFrozenFlag() {
|
public String getFrozenFlag() {
|
||||||
return frozenFlag;
|
return frozenFlag;
|
||||||
}
|
}
|
||||||
|
@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="workorderId" column="workorder_id"></result>
|
<result property="workorderId" column="workorder_id"></result>
|
||||||
<result property="workorderCode" column="workorder_code"></result>
|
<result property="workorderCode" column="workorder_code"></result>
|
||||||
<result property="expireDate" column="expire_date" />
|
<result property="expireDate" column="expire_date" />
|
||||||
|
<result property="productionDate" column="production_date" />
|
||||||
<result property="frozenFlag" column="frozen_flag" />
|
<result property="frozenFlag" column="frozen_flag" />
|
||||||
<result property="attr1" column="attr1" />
|
<result property="attr1" column="attr1" />
|
||||||
<result property="attr2" column="attr2" />
|
<result property="attr2" column="attr2" />
|
||||||
@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectWmMaterialStockVo">
|
<sql id="selectWmMaterialStockVo">
|
||||||
select material_stock_id, item_type_id, item_id, item_code, item_name, specification, unit_of_measure, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, vendor_id, vendor_code, vendor_name, vendor_nick, quantity_onhand,recpt_date,workorder_id,workorder_code, expire_date, frozen_flag, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_material_stock
|
select material_stock_id, item_type_id, item_id, item_code, item_name, specification, unit_of_measure, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, vendor_id, vendor_code, vendor_name, vendor_nick, quantity_onhand,recpt_date,workorder_id,workorder_code, expire_date, production_date,frozen_flag, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_material_stock
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectWmMaterialStockList" parameterType="WmMaterialStock" resultMap="WmMaterialStockResult">
|
<select id="selectWmMaterialStockList" parameterType="WmMaterialStock" resultMap="WmMaterialStockResult">
|
||||||
@ -172,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="workorderId !=null">workorder_id,</if>
|
<if test="workorderId !=null">workorder_id,</if>
|
||||||
<if test="workorderCode !=null">workorder_code,</if>
|
<if test="workorderCode !=null">workorder_code,</if>
|
||||||
<if test="expireDate != null">expire_date,</if>
|
<if test="expireDate != null">expire_date,</if>
|
||||||
|
<if test="productionDate != null">production_date,</if>
|
||||||
<if test="frozenFlag !=null ">frozen_flag,</if>
|
<if test="frozenFlag !=null ">frozen_flag,</if>
|
||||||
<if test="attr1 != null">attr1,</if>
|
<if test="attr1 != null">attr1,</if>
|
||||||
<if test="attr2 != null">attr2,</if>
|
<if test="attr2 != null">attr2,</if>
|
||||||
@ -208,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="workorderId !=null">#{workorderId},</if>
|
<if test="workorderId !=null">#{workorderId},</if>
|
||||||
<if test="workorderCode !=null">#{workorderCode},</if>
|
<if test="workorderCode !=null">#{workorderCode},</if>
|
||||||
<if test="expireDate != null">#{expireDate},</if>
|
<if test="expireDate != null">#{expireDate},</if>
|
||||||
|
<if test="productionDate != null">#{productionDate},</if>
|
||||||
<if test="frozenFlag !=null ">#{frozenFlag}, </if>
|
<if test="frozenFlag !=null ">#{frozenFlag}, </if>
|
||||||
<if test="attr1 != null">#{attr1},</if>
|
<if test="attr1 != null">#{attr1},</if>
|
||||||
<if test="attr2 != null">#{attr2},</if>
|
<if test="attr2 != null">#{attr2},</if>
|
||||||
@ -248,6 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="workorderId !=null">workorder_id = #{workorderId},</if>
|
<if test="workorderId !=null">workorder_id = #{workorderId},</if>
|
||||||
<if test="workorderCode !=null">workorder_code = #{workorderCode},</if>
|
<if test="workorderCode !=null">workorder_code = #{workorderCode},</if>
|
||||||
<if test="expireDate != null">expire_date = #{expireDate},</if>
|
<if test="expireDate != null">expire_date = #{expireDate},</if>
|
||||||
|
<if test="productionDate != null">production_date = #{productionDate},</if>
|
||||||
<if test="frozenFlag !=null ">frozen_flag = #{frozenFlag}, </if>
|
<if test="frozenFlag !=null ">frozen_flag = #{frozenFlag}, </if>
|
||||||
<if test="attr1 != null">attr1 = #{attr1},</if>
|
<if test="attr1 != null">attr1 = #{attr1},</if>
|
||||||
<if test="attr2 != null">attr2 = #{attr2},</if>
|
<if test="attr2 != null">attr2 = #{attr2},</if>
|
||||||
|
Loading…
Reference in New Issue
Block a user