~admin/igds-v4.git

			@@ -4,17 +4,14 @@
			import javax.persistence.*;

			import com.bstek.dorado.annotation.PropertyDef;
			import com.ld.igds.constant.Constant;
			import com.ld.igds.constant.TransType;
			import com.ld.igds.inout.InoutConstant;
			import lombok.Data;

			/**
			* @Desc: 出入库流水表，根据新国粮规调整优化字段
			*
			* @Desc: 出入库流水表，根据新国粮规调整优化字段，2023年5月26日根据新国粮规优化
			* @author: Andy
			* @update-time: 2023/5/26
			*
			*/
			@Data
			@Entity
			@@ -27,7 +24,7 @@
			private String id;

			@Column(name = "COMPANY_ID_", length = 10)
			@PropertyDef(label = "组织编码", description = "")
			@PropertyDef(label = "组织编码")
			private String companyId;

			@Column(name = "DEPT_ID_", length = 50)
			@@ -43,7 +40,7 @@
			private String depotId;

			@Column(name = "TYPE_", length = 10)
			@PropertyDef(label = "出入库类型", description = "出库，入库")
			@PropertyDef(label = "出入库类型", description = "IN=入库，OUT=出库")
			private String type;

			@Column(name = "PROGRESS_", length = 20)
			@@ -54,17 +51,38 @@
			@PropertyDef(label = "数据状态", description = "数据状态，正常，异常（2小时内重复出入库等），补录")
			private String recordStatus = InoutConstant.RECORD_STATUS_NORMAL;

			@Column(name = "CUSTOMER_NAME_", length = 50)
			@PropertyDef(label = "往来单位", description = "关联通知单获取")
			private String customerName;

			@Column(name = "INTEL_CARD_", length = 20)
			@PropertyDef(label = "智慧卡号")
			private String intelCard;

			/* ------------------------登记-------------------------------------/
			@Column(name = "REGISTER_TIME_")
			@PropertyDef(label = "登记时间")
			private Date registerTime;

			@Column(name = "REGISTER_USER_", length = 40)
			@PropertyDef(label = "登记人员")
			@Column(name = "REGISTER_USER_", length = 50)
			@PropertyDef(label = "登记人")
			private String registerUser;

			@Column(name = "USER_NAME_", length = 40)
			@PropertyDef(label = "承运人")
			private String userName = "";
			private String userName;

			@Column(name = "USER_CONTACT_", length = 20)
			@PropertyDef(label = "联系方式")
			private String userContact;

			@Column(name = "USER_ID_", length = 20)
			@PropertyDef(label = "身份证号")
			private String userId;

			@Column(name = "USER_ADDRESS_", length = 100)
			@PropertyDef(label = "承运人地址")
			private String userAddress;

			@Column(name = "USER_BIRTHDAY_")
			@PropertyDef(label = "出生日期")
			@@ -78,23 +96,6 @@
			@PropertyDef(label = "民族")
			private String userNation;

			@Column(name = "USER_ID_", length = 20)
			@PropertyDef(label = "身份证号")
			private String userId;

			@Column(name = "USER_CONTACT_", length = 20)
			@PropertyDef(label = "联系方式")
			private String userContact;

			@Column(name = "USER_ADDRESS_", length = 100)
			@PropertyDef(label = "承运人地址")
			private String userAddress;

			// 基本信息
			@Column(name = "INTEL_CARD_", length = 20)
			@PropertyDef(label = "智慧卡号")
			private String intelCard;

			@Column(name = "PLATE_NUM_", length = 20)
			@PropertyDef(label = "车船号", description = "车牌号+标识符")
			private String plateNum;
			@@ -103,76 +104,74 @@
			@PropertyDef(label = "运输工具")
			private String transType = TransType.TYPE_1.getCode();

			@Column(name = "CUSTOMER_ID_", length = 40)
			@PropertyDef(label = "往来单位", description = "入库时，表示发货单位，出库时候表示收货单位")
			private String customerId;

			@Column(name = "CUSTOMER_NAME_", length = 50)
			@PropertyDef(label = "往来单位", description = "入库时，表示发货单位，出库时候表示收货单位")
			private String customerName;

			// 粮食信息
			/* ------------------------粮食基础信息-------------------------------------/
			@Column(name = "FOOD_VARIETY_", length = 20)
			@PropertyDef(label = "粮食品种")
			private String foodVariety;

			@Column(name = "FOOD_TYPE_", length = 20)
			@PropertyDef(label = "仓储类型")
			@PropertyDef(label = "粮食性质")
			private String foodType;

			@Column(name = "FOOD_LEVEL_", length = 40)
			@PropertyDef(label = "粮食等级")
			private String foodLevel;
			@Column(name = "FOOD_LOCATION_ID_", length = 20)
			@PropertyDef(label = "产地名称代码")
			private String foodLocationId;

			@Column(name = "FOOD_LOCATION_", length = 40)
			@PropertyDef(label = "产地名称")
			private String foodLocation;

			@Column(name = "FOOD_YEAR_", length = 20)
			@PropertyDef(label = "年份")
			@Column(name = "FOOD_YEAR_", length = 10)
			@PropertyDef(label = "收货年度")
			private String foodYear;

			// 化验信息
			@Column(name = "CHECK_STATUS_")
			@PropertyDef(label = "化验结果")
			/* ------------------------扦样质检信息-------------------------------------/
			@Column(name = "FOOD_LEVEL_", length = 20)
			@PropertyDef(label = "粮食定等")
			private String foodLevel;

			@Column(name = "CHECK_STATUS_", length = 10)
			@PropertyDef(label = "质检结果")
			private String checkStatus = InoutConstant.STATUS_NONE;

			@Column(name = "CHECK_USER_")
			@PropertyDef(label = "化验人")
			@Column(name = "CHECK_USER_", length = 50)
			@PropertyDef(label = "质检人")
			private String checkUser;

			@Column(name = "CHECK_TIME_")
			@PropertyDef(label = "质检时间")
			private Date checkTime;

			@Column(name = "SAMPLE_USER_")
			@PropertyDef(label = "扦样人")
			private String sampleUser;

			@Column(name = "SAMPLE_TIME_")
			@PropertyDef(label = "扦样时间")
			private Date sampleTime;

			@Column(name = "SAMPLE_TYPE_")
			@PropertyDef(label = "扦样方式", description = "0-人工，1=自动，2=智能随机")
			private Date sampleType;

			@Column(name = "CHECK_ID_")
			@PropertyDef(label = "化验单号")
			@PropertyDef(label = "质检单号")
			private String checkId;

			// 称重和扣重信息
			// @Column(name = "IMPURITY_")
			// @PropertyDef(label = "杂质", description = "百分比")
			// private Double impurity = 0.0;
			//
			// @Column(name = "WET_")
			// @PropertyDef(label = "水分", description = "百分比")
			// private Double wet = 0.0;
			@Column(name = "DE_CHECK_")
			@PropertyDef(label = "质检扣重", description = "单位KG")
			private double deCheck = 0.0;

			@Column(name = "DE_IMPURITY_")
			@PropertyDef(label = "杂质扣重", description = "单位KG")
			private Double deImpurity = 0.0;
			@Column(name = "ADD_CHECK_")
			@PropertyDef(label = "质检增重", description = "单位KG")
			private double addCheck = 0.0;

			@Column(name = "DE_WET_")
			@PropertyDef(label = "水分扣重", description = "单位KG")
			private Double deWet = 0.0;
			/* ------------------------称重环节-------------------------------------/

			@Column(name = "DE_HANDLE_")
			@PropertyDef(label = "值仓扣重", description = "单位KG")
			private Double deHandle = 0.0;

			@Column(name = "DE_OTHER_")
			@PropertyDef(label = "其他扣重", description = "单位KG")
			private Double deOther = 0.0;

			@Column(name = "DE_SUM_")
			@PropertyDef(label = "总扣重", description = "单位KG")
			private Double deSum = 0.0;
			@Column(name = "jjlx", length = 2)
			@PropertyDef(label = "检斤类型", description = "0：称重入库 1：标准包入库默认为称重入库，标准包入库相关字段可为空")
			private String jjlx = "0";

			@Column(name = "FULL_WEIGHT_")
			@PropertyDef(label = "满车称重", description = "入库时候表示第一次称重，出库时候表示第二次称重，单位KG")
			@@ -199,8 +198,24 @@
			private String emptyWeightUser;

			@Column(name = "NET_WEIGHT_")
			@PropertyDef(label = "净重", description = "单位KG")
			private Double netWeight = 0.0;
			@PropertyDef(label = "净毛重", description = "单位KG，等于满车 - 空车")
			private double netWeight = 0.0;

			@Column(name = "DE_HANDLE_")
			@PropertyDef(label = "现场扣重", description = "单位KG")
			private double deHandle = 0.0;

			@Column(name = "DE_PACKAGE_")
			@PropertyDef(label = "包装扣重", description = "单位KG")
			private double dePackage = 0.0;

			@Column(name = "DE_OTHER_")
			@PropertyDef(label = "其他扣重", description = "单位KG")
			private double deOther = 0.0;

			@Column(name = "DE_OTHER_INTO_", length = 200)
			@PropertyDef(label = "其他扣重原因")
			private String deOtherInfo;

			@Column(name = "SETTLE_WEIGHT_")
			@PropertyDef(label = "结算重量", description = "扣重后净重，结算净重，单位KG")
			@@ -210,6 +225,10 @@
			@PropertyDef(label = "入库重量", description = "扣重后净重，结算净重，补包括增重，单位KG")
			private Double recordWeight = 0.0;


			/**
			* -----------结算信息-----------------------
			**/
			@Column(name = "PRICE_")
			@PropertyDef(label = "单价", description = "单位：元/公斤")
			private Double price = 0.0;
			@@ -218,19 +237,13 @@
			@PropertyDef(label = "结算金额", description = "单位：元")
			private Double settleMoney = 0.00;

			@Column(name = "CUR_STORAGE_")
			@PropertyDef(label = "当前库存")
			private double curStorage = 0.0;
			@Column(name = "SETTLE_ID_")
			@PropertyDef(label = "结算单号", description = "如果是单车结算必填")
			private String settleId;

			// 值仓信息
			@Column(name = "HANDLE_START_")
			@PropertyDef(label = "值仓开始时间")
			private Date handleStart;

			@Column(name = "HANDLE_END_")
			@PropertyDef(label = "值仓结束时间")
			private Date handleEnd;

			/**
			* ----------- 值仓信息-----------------------
			**/
			@Column(name = "HANDLE_USER_", length = 40)
			@PropertyDef(label = "值仓操作人")
			private String handleUser;
			@@ -249,45 +262,24 @@
			@PropertyDef(label = "备注信息")
			private String remarks;

			@Column(name = "SETTLE_TAG_", length = 2)
			@PropertyDef(label = "是否结算", description = "Y:表示已结算；N:表示未结算")
			private String settleTag = Constant.YN_N;

			/**
			* ----------- 其他信息，针对检斤类型标准包入库填写-----------------------
			**/
			@Column(name = "bzw", length = 2)
			@PropertyDef(label = "包装物", description = "1：麻袋2：编织袋3：散装9：其他")
			private String bzw;

			@Column(name = "SPEC_TYPE_", length = 10)
			@PropertyDef(label = "规格", description = "散粮，25kg, 50kg")
			private String specType = "散粮";
			@Column(name = "dbz", length = 2)
			@PropertyDef(label = "单包重", description = "单位：公斤")
			private Double dbz;

			//--------版本4.0调整字段 --------------//
			// @Column(name = "jsdh", length = 42)
			// @PropertyDef(label = "结算单号")
			// private String jsdh;
			//
			// @Column(name = "FOOD_LOCATION_CODE_", length = 10)
			// @PropertyDef(label = "产地代码")
			// private String foodLocationCode;
			//
			// @Column(name = "jjlx", length = 2)
			// @PropertyDef(label = "检斤类型", description = "0：称重入库 1：标准包入库默认为称重入库，标准包入库相关字段可为空")
			// private String jjlx = "0";
			//
			// @Column(name = "bzw", length = 2)
			// @PropertyDef(label = "包装物", description = "1：麻袋2：编织袋3：散装9：其他")
			// private String bzw;
			//
			// @Column(name = "bzbdbz", length = 2)
			// @PropertyDef(label = "单包重", description = "单位：公斤")
			// private Double bzw;
			//
			// @Column(name = "bzbjs", length = 2)
			// @PropertyDef(label = "包件数", description = "单位：件")
			// private int bzbjs;
			@Column(name = "bzbjs", length = 2)
			@PropertyDef(label = "包件数", description = "单位：件")
			private int bzbjs;

			@Column(name = "UPDATE_TIME_")
			@PropertyDef(label = "数据更新时间")
			private Date updateTime;

			@Override
			public String toString() {
			return "InoutRecord [id=" + id + ", depotId=" + depotId + ", type="
			+ type + ", settleWeight=" + settleWeight + ", completeTime="
			+ completeTime + "]";
			}
			}