From 6f4a366cad9109ddc338fd13c9d43ca2ce516f6b Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 16:53:07 +0800
Subject: [PATCH] 调整计划管理模块4
---
igds-core/src/main/java/com/ld/igds/models/InoutRecord.java | 234 ++++++++++++++++++++++++++++------------------------------
1 files changed, 113 insertions(+), 121 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java b/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java
index ee1179e..5c71a3d 100644
--- a/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java
+++ b/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java
@@ -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=鍏ュ簱锛孫UT=鍑哄簱")
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 = "鍏ュ簱鏃跺�欒〃绀虹涓�娆＄О閲嶏紝鍑哄簱鏃跺�欒〃绀虹浜屾绉伴噸锛屽崟浣岾G")
@@ -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 + "]";
- }
}
--
Gitblit v1.9.3