Merge remote-tracking branch 'origin/tzglasrs' into tzglasrs

lty

2025-05-21 2d68b0241edf83823bedba2392b81c9f0957a7d3

 src/main/java/com/zy/third/lk/entity/OutHedTBBak.java

@@ -1,7 +1,8 @@
package com.zy.third.lk.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;

@@ -11,93 +12,91 @@
import org.springframework.format.annotation.DateTimeFormat;

import com.baomidou.mybatisplus.annotations.TableName;

import java.io.Serializable;

@TableName("lk_OutHedTb_bak")
@TableName("lk_OutHedTB_bak")
public class OutHedTBBak implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "AutoId",type = IdType.AUTO)
    @TableId(value = "auto_id", type = IdType.AUTO)
    @TableField("auto_id")
    private Integer AutoId;

    @ApiModelProperty(value= "")
    @TableField("BillNo")
    @ApiModelProperty(value = "")
    @TableField("bill_no")
    private String BillNo;

    @TableField("BillDate")
    @TableField("bill_date")
    private Date billDate;

    /**
     * SendMatOut:发料出库
OtherOut:其它出库单
ItemMoveOut:调拨出库
ItemSwitchOut:形态转换出库
CheckLossOut:盘盈出库单

     * OtherOut:其它出库单
     * ItemMoveOut:调拨出库
     * ItemSwitchOut:形态转换出库
     * CheckLossOut:盘盈出库单
     */
    @ApiModelProperty(value= "SendMatOut:发料出库 ")
    @TableField("IoKindID")
    @ApiModelProperty(value = "SendMatOut:发料出库 ")
    @TableField("io_kind_id")
    private String IoKindID;

    @TableField("IoKindName")
    @TableField("io_kind_name")
    private String ioKindName;

    @ApiModelProperty(value= "")
    @TableField("ObjectId")
    @ApiModelProperty(value = "")
    @TableField("object_id")
    private String ObjectId;

    @ApiModelProperty(value= "")
    @TableField("ObjectName")
    @ApiModelProperty(value = "")
    @TableField("object_name")
    private String ObjectName;

    @ApiModelProperty(value= "")
    @TableField("Remark")
    @ApiModelProperty(value = "")
    @TableField("remark")
    private String Remark;

    @TableField("WareId")
    @TableField("ware_id")
    private String WareId;

    @TableField("WareName")
    @TableField("ware_name")
    private String WareName;

    @ApiModelProperty(value= "")
    @TableField("Temp1")
    @ApiModelProperty(value = "")
    @TableField("temp1")
    private String Temp1;

    @ApiModelProperty(value= "")
    @TableField("Temp2")
    @ApiModelProperty(value = "")
    @TableField("temp2")
    private String Temp2;

    @ApiModelProperty(value= "")
    @TableField("Temp3")
    @ApiModelProperty(value = "")
    @TableField("temp3")
    private String Temp3;


    @ApiModelProperty(value= "")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @TableField("MakeDate")
    @ApiModelProperty(value = "")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField("make_date")
    private Date makedate;

    @TableField("DelDate")
    @TableField("del_date")
    private Date delDate;

    @TableField("bPass")
    @TableField("b_pass")
    private Boolean bPass;

    @TableField("bStartIn")
    @TableField("b_start_in")
    private Boolean bStartIn;



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




}