#库存预留

zhou zhou

2025-12-18 9f27d2842d7279ec0805389d571b7c88a64d190d

#库存预留

 src/main/java/com/zy/asrs/entity/InventoryReserve.java

@@ -68,7 +68,7 @@
    @ApiModelProperty(value= "过期时间")
    @TableField("expice_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date expiceTime;
    private Date expireTime;

    /**
     * 部门ID
@@ -115,7 +115,7 @@
        this.orderNo = orderNo;
        this.batch = batch;
        this.quantity = quantity;
        this.expiceTime = expiceTime;
        this.expireTime = expiceTime;
        this.deptId = deptId;
        this.createTime = createTime;
        this.createBy = createBy;
@@ -138,10 +138,10 @@
//    );

    public String getExpiceTime$(){
        if (Cools.isEmpty(this.expiceTime)){
        if (Cools.isEmpty(this.expireTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.expiceTime);
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.expireTime);
    }

    public String getCreateTime$(){

 src/main/java/com/zy/asrs/entity/InventoryReserveLog.java

@@ -66,9 +66,9 @@
     * 过期时间
     */
    @ApiModelProperty(value= "过期时间")
    @TableField("expice_time")
    @TableField("expire_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date expiceTime;
    private Date expireTime;

    /**
     * 部门ID
@@ -115,7 +115,7 @@
        this.orderNo = orderNo;
        this.batch = batch;
        this.quantity = quantity;
        this.expiceTime = expiceTime;
        this.expireTime = expiceTime;
        this.deptId = deptId;
        this.createTime = createTime;
        this.createBy = createBy;
@@ -138,10 +138,10 @@
//    );

    public String getExpiceTime$(){
        if (Cools.isEmpty(this.expiceTime)){
        if (Cools.isEmpty(this.expireTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.expiceTime);
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.expireTime);
    }

    public String getCreateTime$(){

 src/main/resources/mapper/InventoryReserveLogMapper.xml

@@ -10,7 +10,7 @@
        <result column="order_no" property="orderNo" />
        <result column="batch" property="batch" />
        <result column="quantity" property="quantity" />
        <result column="expice_time" property="expiceTime" />
        <result column="expire_time" property="expireTime" />
        <result column="dept_id" property="deptId" />
        <result column="create_time" property="createTime" />
        <result column="create_by" property="createBy" />

 src/main/resources/mapper/InventoryReserveMapper.xml

@@ -10,7 +10,7 @@
        <result column="order_no" property="orderNo" />
        <result column="batch" property="batch" />
        <result column="quantity" property="quantity" />
        <result column="expice_time" property="expiceTime" />
        <result column="expire_time" property="expireTime" />
        <result column="dept_id" property="deptId" />
        <result column="create_time" property="createTime" />
        <result column="create_by" property="createBy" />