From ee96821fc7990857ad6477690a5758f8c0ebaa66 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 22 九月 2025 10:32:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java |  302 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 302 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java
new file mode 100644
index 0000000..ef8f617
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java
@@ -0,0 +1,302 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Desc: 鍑哄叆搴撴祦姘磋〃锛屾牴鎹柊鍥界伯瑙勮皟鏁翠紭鍖栧瓧娈碉紝2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_RECORD")
+public class Fz61InoutRecord {
+
+    public static String SORT_PROP = "id";
+
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "娴佹按鍙�", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+    private String id;
+
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
+
+    @Column(name = "DEPT_ID_", length = 50)
+    @PropertyDef(label = "搴撳尯缂栫爜")
+    private String deptId;
+
+    @Column(name = "NOTICE_ID_", length = 40)
+    @PropertyDef(label = "閫氱煡鍗曠紪鐮�")
+    private String noticeId;
+
+    @Column(name = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "瑁呭嵏浠撳簱")
+    private String depotId;
+
+    @Column(name = "TYPE_", length = 10)
+    @PropertyDef(label = "鍑哄叆搴撶被鍨�", description = "IN=鍏ュ簱锛孫UT=鍑哄簱")
+    private String type;
+
+    @Column(name = "PROGRESS_", length = 20)
+    @PropertyDef(label = "娴佺▼杩涘害")
+    private String progress;
+
+    @Column(name = "RECORD_STATUS_", length = 10)
+    @PropertyDef(label = "鏁版嵁鐘舵��", description = "鏁版嵁鐘舵�侊紝姝e父锛屽紓甯革紙2灏忔椂鍐呴噸澶嶅嚭鍏ュ簱绛夛級锛岃ˉ褰�")
+    private String recordStatus;
+
+    @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 = 50)
+    @PropertyDef(label = "鐧昏浜�")
+    private String registerUser;
+
+    @Column(name = "USER_NAME_", length = 40)
+    @PropertyDef(label = "鎵胯繍浜�")
+    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 = "鍑虹敓鏃ユ湡")
+    private Date userBirthday;
+
+    @Column(name = "USER_SEX_", length = 10)
+    @PropertyDef(label = "鎬у埆")
+    private String userSex;
+
+    @Column(name = "USER_NATION_", length = 10)
+    @PropertyDef(label = "姘戞棌")
+    private String userNation;
+
+    @Column(name = "PLATE_NUM_", length = 20)
+    @PropertyDef(label = "杞﹁埞鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
+    private String plateNum;
+
+    @Column(name = "TRANS_TYPE_", length = 6)
+    @PropertyDef(label = "杩愯緭宸ュ叿")
+    private String transType;
+
+
+    /*** ------------------------绮鍩虹淇℃伅-------------------------------------**/
+    @Column(name = "FOOD_VARIETY_", length = 20)
+    @PropertyDef(label = "绮鍝佺")
+    private String foodVariety;
+
+    @Column(name = "FOOD_TYPE_", length = 20)
+    @PropertyDef(label = "绮鎬ц川")
+    private String foodType;
+
+    @Column(name = "FOOD_LOCATION_ID_", length = 20)
+    @PropertyDef(label = "浜у湴鍚嶇О浠g爜")
+    private String foodLocationId;
+
+    @Column(name = "FOOD_LOCATION_", length = 40)
+    @PropertyDef(label = "浜у湴鍚嶇О")
+    private String foodLocation;
+
+    @Column(name = "FOOD_YEAR_", length = 10)
+    @PropertyDef(label = "鏀惰揣骞村害")
+    private String foodYear;
+
+    /*** ------------------------鎵︽牱璐ㄦ淇℃伅-------------------------------------**/
+    @Column(name = "FOOD_LEVEL_", length = 20)
+    @PropertyDef(label = "绮瀹氱瓑")
+    private String foodLevel;
+
+    @Column(name = "CHECK_STATUS_", length = 10)
+    @PropertyDef(label = "璐ㄦ缁撴灉")
+    private String checkStatus;
+
+    @Column(name = "CHECK_USER_", length = 50)
+    @PropertyDef(label = "璐ㄦ浜�")
+    private String checkUser;
+
+    @Column(name = "CHECK_TIME_")
+    @PropertyDef(label = "璐ㄦ鏃堕棿")
+    private Date checkTime;
+
+    @Column(name = "SAMPLE_USER_", length = 50)
+    @PropertyDef(label = "鎵︽牱浜�")
+    private String sampleUser;
+
+    @Column(name = "SAMPLE_TIME_")
+    @PropertyDef(label = "鎵︽牱鏃堕棿")
+    private Date sampleTime;
+
+    @Column(name = "SAMPLE_TYPE_", length = 1)
+    @PropertyDef(label = "鎵︽牱鏂瑰紡", description = "0-浜哄伐锛�1=鑷姩锛�2=鏅鸿兘闅忔満")
+    private String sampleType;
+
+    @Column(name = "CHECK_ID_", length = 12)
+    @PropertyDef(label = "璐ㄦ鍗曞彿")
+    private String checkId;
+
+    @Column(name = "DE_CHECK_")
+    @PropertyDef(label = "璐ㄦ鎵i噸", description = "鍗曚綅KG")
+    private double deCheck = 0.0;
+
+    @Column(name = "ADD_CHECK_")
+    @PropertyDef(label = "璐ㄦ澧為噸", description = "鍗曚綅KG")
+    private double addCheck = 0.0;
+
+    /*** ------------------------绉伴噸鐜妭-------------------------------------**/
+
+    @Column(name = "jjlx", length = 2)
+    @PropertyDef(label = "妫�鏂ょ被鍨�", description = "0锛氱О閲嶅叆搴� 1锛氭爣鍑嗗寘鍏ュ簱 榛樿涓虹О閲嶅叆搴擄紝鏍囧噯鍖呭叆搴撶浉鍏冲瓧娈靛彲涓虹┖")
+    private String jjlx = "0";
+
+    @Column(name = "FULL_WEIGHT_")
+    @PropertyDef(label = "婊¤溅绉伴噸", description = "鍏ュ簱鏃跺�欒〃绀虹涓�娆$О閲嶏紝鍑哄簱鏃跺�欒〃绀虹浜屾绉伴噸锛屽崟浣岾G")
+    private Double fullWeight = 0.0;
+
+    @Column(name = "FULL_WEIGHT_TIME_")
+    @PropertyDef(label = "婊¤溅绉伴噸鏃堕棿")
+    private Date fullWeightTime;
+
+    @Column(name = "FULL_WEIGHT_USER_", length = 40)
+    @PropertyDef(label = "婊¤溅绉伴噸浜�")
+    private String fullWeightUser;
+
+    @Column(name = "EMPTY_WEIGHT_")
+    @PropertyDef(label = "绌鸿溅绉伴噸", description = "鍏ュ簱鏃惰〃绀虹浜屾绉伴噸锛屽嚭搴撴椂鍊欒〃绀虹涓�娆$О閲嶏紝鍗曚綅KG")
+    private Double emptyWeight = 0.0;
+
+    @Column(name = "EMPTY_WEIGHT_TIME_")
+    @PropertyDef(label = "绌鸿溅绉伴噸鏃堕棿")
+    private Date emptyWeightTime;
+
+    @Column(name = "EMPTY_WEIGHT_USER_", length = 50)
+    @PropertyDef(label = "绌鸿溅绉伴噸浜�")
+    private String emptyWeightUser;
+
+    @Column(name = "NET_WEIGHT_")
+    @PropertyDef(label = "鍑�姣涢噸", description = "鍗曚綅KG锛岀瓑浜庢弧杞� - 绌鸿溅")
+    private double netWeight = 0.0;
+
+    @Column(name = "DE_HANDLE_")
+    @PropertyDef(label = "鐜板満鎵i噸", description = "鍗曚綅KG")
+    private double deHandle = 0.0;
+
+    @Column(name = "DE_PACKAGE_")
+    @PropertyDef(label = "鍖呰鎵i噸", description = "鍗曚綅KG")
+    private double dePackage = 0.0;
+
+    @Column(name = "DE_OTHER_")
+    @PropertyDef(label = "鍏朵粬鎵i噸", description = "鍗曚綅KG")
+    private double deOther = 0.0;
+
+    @Column(name = "DE_OTHER_INTO_", length = 200)
+    @PropertyDef(label = "鍏朵粬鎵i噸鍘熷洜")
+    private String deOtherInfo;
+
+    @Column(name = "SETTLE_WEIGHT_")
+    @PropertyDef(label = "缁撶畻閲嶉噺", description = "鎵i噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝鍗曚綅KG")
+    private Double settleWeight = 0.0;
+
+    @Column(name = "RECORD_WEIGHT_")
+    @PropertyDef(label = "鍏ュ簱閲嶉噺", description = "鎵i噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝琛ュ寘鎷閲嶏紝鍗曚綅KG")
+    private Double recordWeight = 0.0;
+
+
+    /**
+     * -----------缁撶畻淇℃伅-----------------------
+     **/
+    @Column(name = "PRICE_")
+    @PropertyDef(label = "鍗曚环", description = "鍗曚綅锛氬厓/鍏枻锛屽疄闄呯粨绠椾环鏍间互缁撶畻鍗曚腑鍗曚环涓哄噯")
+    private Double price = 0.0;
+
+    @Column(name = "SETTLE_MONEY_")
+    @PropertyDef(label = "缁撶畻閲戦", description = "鍗曚綅锛氬厓锛屽疄闄呯粨绠椾互璁$畻鍗曚负鍑�")
+    private Double settleMoney = 0.00;
+
+    @Column(name = "SETTLE_ID_", length = 50)
+    @PropertyDef(label = "缁撶畻鍗曞彿", description = "濡傛灉鏄崟杞︾粨绠楀繀濉�")
+    private String settleId;
+
+    @Column(name = "SETTLE_TAG_", length = 2)
+    @PropertyDef(label = "缁撶畻鏍囩")
+    private String settleTag;
+
+    /**
+     * ----------- 鍊间粨淇℃伅-----------------------
+     **/
+    @Column(name = "HANDLE_USER_", length = 40)
+    @PropertyDef(label = "鍊间粨鎿嶄綔浜�")
+    private String handleUser;
+
+    // 鍑哄簱
+    @Column(name = "COMPLETE_TIME_")
+    @PropertyDef(label = "瀹屾垚鏃堕棿")
+    private Date completeTime;
+
+    @Column(name = "COMPLETE_USER_", length = 40)
+    @PropertyDef(label = "瀹屾垚纭浜�")
+    private String completeUser;
+
+    // 澶囨敞
+    @Column(name = "REMARKS_", length = 200)
+    @PropertyDef(label = "澶囨敞淇℃伅")
+    private String remarks;
+
+    /**
+     * ----------- 鍊间粨鏃堕棿锛屾墜鏈虹浣跨敤-----------------------
+     **/
+    @Column(name = "HANDLE_START_")
+    @PropertyDef(label = "鍊间粨寮�濮嬫椂闂�")
+    private Date handleStart;
+
+    @Column(name = "HANDLE_END_")
+    @PropertyDef(label = "鍊间粨缁撴潫鏃堕棿")
+    private Date handleEnd;
+
+    /**
+     * ----------- 鍏朵粬淇℃伅锛岄拡瀵规鏂ょ被鍨嬫爣鍑嗗寘鍏ュ簱濉啓-----------------------
+     **/
+    @Column(name = "bzw", length = 2)
+    @PropertyDef(label = "鍖呰鐗�", description = "1锛氶夯琚�2锛氱紪缁囪3锛氭暎瑁�9锛氬叾浠�")
+    private String bzw;
+
+    @Column(name = "dbz")
+    @PropertyDef(label = "鍗曞寘閲�", description = "鍗曚綅锛氬叕鏂�")
+    private Double dbz;
+
+    @Column(name = "bzbjs")
+    @PropertyDef(label = "鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
+    private int bzbjs;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
+
+}

--
Gitblit v1.9.3