From 55316fe6c610c10086d9625e6d5ce38afac4cde8 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 16:45:40 +0800
Subject: [PATCH] 出入库流程优化-入库详单优化

---
 igds-inout/src/main/java/com/ld/igds/models/InoutContract.java |  306 +++++++++++++++++++++++++-------------------------
 1 files changed, 155 insertions(+), 151 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java b/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java
index 86a3067..5de7f0b 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java
@@ -13,210 +13,214 @@
 /**
  * @Desc:
  * @author: Andy
- * @update-time: 2023/5/22  鏍规嵁鏂板浗鏍囪皟鏁村悕绉帮紝浼樺寲瀛楁
+ * @update-time: 2023/5/22 鏍规嵁鏂板浗鏍囪皟鏁村悕绉帮紝浼樺寲瀛楁
  */
 @Data
 @Entity
 @Table(name = "D_INOUT_CONTRACT")
 public class InoutContract implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    @Id
-    @Column(name = "ID_", length = 40)
-    @PropertyDef(label = "ID_")
-    private String id;
+	@Id
+	@Column(name = "ID_", length = 40)
+	@PropertyDef(label = "ID_")
+	private String id;
 
-    @Column(name = "COMPANY_ID_", length = 10)
-    @PropertyDef(label = "缁勭粐缂栫爜")
-    private String companyId;
+	@Column(name = "COMPANY_ID_", length = 10)
+	@PropertyDef(label = "缁勭粐缂栫爜")
+	private String companyId;
 
-    @Column(name = "DEPT_ID_", length = 40)
-    @PropertyDef(label = "搴撳尯缂栫爜")
-    private String deptId;
+	@Column(name = "DEPT_ID_", length = 40)
+	@PropertyDef(label = "搴撳尯缂栫爜")
+	private String deptId;
 
-    @Column(name = "NAME_", length = 50)
-    @PropertyDef(label = "鍚堝悓鍚嶇О")
-    private String name;
+	@Column(name = "NAME_", length = 50)
+	@PropertyDef(label = "鍚堝悓鍚嶇О")
+	private String name;
 
-//	@Column(name = "PLAN_ID_", length = 40)
-//	@PropertyDef(label = "璁″垝缂栫爜")
-//	private String planId;
-//
-//	@Column(name = "PLAN_NAME_", length = 50)
-//	@PropertyDef(label = "璁″垝鍚嶇О")
-//	private String planName;
+	@Column(name = "PLAN_ID_", length = 40)
+	@PropertyDef(label = "璁″垝缂栫爜")
+	private String planId;
 
-    @Column(name = "TYPE_", length = 10)
-    @PropertyDef(label = "涓氬姟绫诲埆", description = "1:閿�鍞悎鍚� 2:閲囪喘鍚堝悓 3:浠ｅ偍鍚堝悓")
-    private String type;
+	@Column(name = "PLAN_NAME_", length = 50)
+	@PropertyDef(label = "璁″垝鍚嶇О")
+	private String planName;
 
-    @Column(name = "CUSTOMER_TYPE_", length = 10)
-    @PropertyDef(label = "瀹㈡埛绫诲瀷", description = "1:浼佷笟 2:涓汉")
-    private String customerType;
+	@Column(name = "TYPE_", length = 10)
+	@PropertyDef(label = "涓氬姟绫诲埆", description = "1:閿�鍞悎鍚� 2:閲囪喘鍚堝悓 3:浠ｅ偍鍚堝悓")
+	private String type;
 
-    @Column(name = "YEAR_", length = 10)
-    @PropertyDef(label = "骞翠唤")
-    private String year;
+	@Column(name = "CUSTOMER_TYPE_", length = 10)
+	@PropertyDef(label = "瀹㈡埛绫诲瀷", description = "1:浼佷笟 2:涓汉")
+	private String customerType;
 
-    @Column(name = "CUSTOMER_ID_", length = 20)
-    @PropertyDef(label = "绀句細淇＄敤鐮�", description = "濡傛灉鏄紒涓�=瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜")
-    private String customerId;
+	@Column(name = "YEAR_", length = 10)
+	@PropertyDef(label = "骞翠唤")
+	private String year;
 
-    @Column(name = "CUSTOMER_NAME_", length = 50)
-    @PropertyDef(label = "瀹㈡埛鍚嶇О")
-    private String customerName;
+	@Column(name = "CUSTOMER_ID_", length = 20)
+	@PropertyDef(label = "绀句細淇＄敤鐮�", description = "濡傛灉鏄紒涓�=瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜")
+	private String customerId;
 
-    @Column(name = "fddbr", length = 50)
-    @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
-    private String fddbr;
+	@Column(name = "CUSTOMER_NAME_", length = 50)
+	@PropertyDef(label = "瀹㈡埛鍚嶇О")
+	private String customerName;
 
-    @Column(name = "txdz", length = 200)
-    @PropertyDef(label = "閫氳鍦板潃")
-    private String txdz;
+	@Column(name = "fddbr", length = 50)
+	@PropertyDef(label = "娉曞畾浠ｈ〃浜�")
+	private String fddbr;
 
-    @Column(name = "yzbm", length = 6)
-    @PropertyDef(label = "閭斂缂栫爜")
-    private String yzbm;
+	@Column(name = "txdz", length = 200)
+	@PropertyDef(label = "閫氳鍦板潃")
+	private String txdz;
 
-    @PropertyDef(label = "鑱旂郴浜哄鍚�")
-    @Column(name = "lxrxm", length = 50)
-    private String lxrxm;
+	@Column(name = "yzbm", length = 6)
+	@PropertyDef(label = "閭斂缂栫爜")
+	private String yzbm;
 
-    @PropertyDef(label = "鑱旂郴鐢佃瘽")
-    @Column(name = "lxrdh", length = 20)
-    private String lxrdh;
+	@PropertyDef(label = "鑱旂郴浜哄鍚�")
+	@Column(name = "lxrxm", length = 50)
+	private String lxrxm;
 
-    @PropertyDef(label = "韬唤璇佸彿")
-    @Column(name = "sfzh", length = 20)
-    private String sfzh;
+	@PropertyDef(label = "鑱旂郴鐢佃瘽")
+	@Column(name = "lxrdh", length = 20)
+	private String lxrdh;
 
-    @PropertyDef(label = "鐢靛瓙淇＄")
-    @Column(name = "dzyx", length = 50)
-    private String dzyx;
+	@PropertyDef(label = "韬唤璇佸彿")
+	@Column(name = "sfzh", length = 20)
+	private String sfzh;
 
-    @Column(name = "SIGNING_TIME_")
-    @PropertyDef(label = "绛捐鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd")
-    private Date signingTime;
+	@PropertyDef(label = "鐢靛瓙淇＄")
+	@Column(name = "dzyx", length = 50)
+	private String dzyx;
 
-    @Column(name = "SIGN_ADDRESS_", length = 100)
-    @PropertyDef(label = "绛剧害鍦扮偣")
-    private String signAddress;
+	@Column(name = "SIGNING_TIME_")
+	@PropertyDef(label = "绛捐鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd")
+	private Date signingTime;
 
-    @Column(name = "BEGIN_TIME_")
-    @PropertyDef(label = "绾﹀畾寮�濮嬫椂闂�")
-    private Date beginTime;
+	@Column(name = "SIGN_ADDRESS_", length = 100)
+	@PropertyDef(label = "绛剧害鍦扮偣")
+	private String signAddress;
 
-    @Column(name = "END_TIME_")
-    @PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
-    private Date endTime;
+	@Column(name = "BEGIN_TIME_")
+	@PropertyDef(label = "绾﹀畾寮�濮嬫椂闂�")
+	private Date beginTime;
 
-    @Column(name = "REL_END_TIME_")
-    @PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
-    private Date relEndTime;
+	@Column(name = "END_TIME_")
+	@PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
+	private Date endTime;
 
-    @Column(name = "FOOD_VARIETY_", length = 20)
-    @PropertyDef(label = "绮鍝佺")
-    private String foodVariety;
+	@Column(name = "REL_END_TIME_")
+	@PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
+	private Date relEndTime;
 
-    @Column(name = "FOOD_TYPE_", length = 20)
-    @PropertyDef(label = "绮鎬ц川")
-    private String foodType;
+	@Column(name = "FOOD_VARIETY_", length = 20)
+	@PropertyDef(label = "绮鍝佺")
+	private String foodVariety;
 
-    @Column(name = "PRICE_")
-    @PropertyDef(label = "鍚堝悓鍗曚环锛屽厓/鍚�")
-    private Double price;
+	@Column(name = "FOOD_TYPE_", length = 20)
+	@PropertyDef(label = "绮鎬ц川")
+	private String foodType;
 
-    @Column(name = "MONEY_")
-    @PropertyDef(label = "鍚堝悓鎬婚噾棰�", description = "鍗曚綅锛氬厓")
-    private Double money;
+	@Column(name = "PRICE_")
+	@PropertyDef(label = "鍚堝悓鍗曚环锛屽厓/鍚�")
+	private Double price;
 
-    @Column(name = "CONTRACT_AMOUNT_")
-    @PropertyDef(label = "鍚堝悓鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
-    private Double contactAmount;
+	@Column(name = "MONEY_")
+	@PropertyDef(label = "鍚堝悓鎬婚噾棰�", description = "鍗曚綅锛氬厓")
+	private Double money;
 
-    @Column(name = "COMPLETE_NUM_")
-    @PropertyDef(label = "灞ョ害鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
-    private Double completeNum;
+	@Column(name = "CONTRACT_AMOUNT_")
+	@PropertyDef(label = "鍚堝悓鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+	private Double contactAmount;
 
-    @Column(name = "lybzj")
-    @PropertyDef(label = "灞ョ害淇濊瘉閲�", description = "鍗曚綅锛氬厓")
-    private Double lybzj;
+	@Column(name = "COMPLETE_NUM_")
+	@PropertyDef(label = "灞ョ害鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+	private Double completeNum;
 
-    @PropertyDef(label = "灞ョ害鐜�", description = "鍗曚綅锛�%")
-    @Column(name = "lyl")
-    private Double lyl;
+	@Column(name = "lybzj")
+	@PropertyDef(label = "灞ョ害淇濊瘉閲�", description = "鍗曚綅锛氬厓")
+	private Double lybzj;
 
-    @Column(name = "jsjg")
-    @PropertyDef(label = "缁撶畻浠锋牸锛屽厓/鍚�")
-    private Double jsjg;
+	@PropertyDef(label = "灞ョ害鐜�", description = "鍗曚綅锛�%")
+	@Column(name = "lyl")
+	private Double lyl;
 
-    @PropertyDef(label = "缁撶畻鎬婚噾棰�", description = "鍗曚綅锛氬厓")
-    @Column(name = "jszje")
-    private Double jszje;
+	@Column(name = "jsjg")
+	@PropertyDef(label = "缁撶畻浠锋牸锛屽厓/鍚�")
+	private Double jsjg;
 
-    @PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��", description = "1锛氱鍚� 2锛氫笉绗﹀悎")
-    @Column(name = "jsyhtyzx", length = 1)
-    private String jsyhtyzx;
+	@PropertyDef(label = "缁撶畻鎬婚噾棰�", description = "鍗曚綅锛氬厓")
+	@Column(name = "jszje")
+	private Double jszje;
 
-    @PropertyDef(label = "涓嶄竴鑷村師鍥�")
-    @Column(name = "jsyhtbyzyy", length = 250)
-    private String jsyhtbyzyy;
+	@PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��", description = "1锛氱鍚� 2锛氫笉绗﹀悎")
+	@Column(name = "jsyhtyzx", length = 1)
+	private String jsyhtyzx;
 
-    @Column(name = "CUSTOMER_BANK_", length = 10)
-    @PropertyDef(label = "瀹㈡埛寮�鎴疯")
-    private String customerBank;
+	@PropertyDef(label = "涓嶄竴鑷村師鍥�")
+	@Column(name = "jsyhtbyzyy", length = 250)
+	private String jsyhtbyzyy;
 
-    @Column(name = "CUSTOMER_BANK_ACCOUNT_", length = 40)
-    @PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
-    private String customerBankAccount;
+	@Column(name = "CUSTOMER_BANK_", length = 10)
+	@PropertyDef(label = "瀹㈡埛寮�鎴疯")
+	private String customerBank;
 
-    @Column(name = "CUSTOMER_SIGN_USER_", length = 50)
-    @PropertyDef(label = "瀹㈡埛绛剧害浜�")
-    private String customerSignUser;
+	@Column(name = "CUSTOMER_BANK_ACCOUNT_", length = 40)
+	@PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
+	private String customerBankAccount;
 
-    @Column(name = "BANK_", length = 50)
-    @PropertyDef(label = "鏈柟寮�鎴疯")
-    private String bank;
+	@Column(name = "CUSTOMER_SIGN_USER_", length = 50)
+	@PropertyDef(label = "瀹㈡埛绛剧害浜�")
+	private String customerSignUser;
 
-    @Column(name = "BANK_ACCOUNT_", length = 40)
-    @PropertyDef(label = "鏈柟璐﹀彿")
-    private String bankAccount;
+	@Column(name = "BANK_", length = 50)
+	@PropertyDef(label = "鏈柟寮�鎴疯")
+	private String bank;
 
-    @Column(name = "SIGN_USER_", length = 50)
-    @PropertyDef(label = "鏈柟绛剧害浜�")
-    private String signUser;
+	@Column(name = "BANK_ACCOUNT_", length = 40)
+	@PropertyDef(label = "鏈柟璐﹀彿")
+	private String bankAccount;
 
-    /**
-     * --------瀹℃壒淇℃伅--------
-     **/
+	@Column(name = "SIGN_USER_", length = 50)
+	@PropertyDef(label = "鏈柟绛剧害浜�")
+	private String signUser;
 
-    @Column(name = "CREATE_USER_", length = 50)
-    @PropertyDef(label = "鍒涘缓浜�")
-    private String createUser;
+	/**
+	 * --------瀹℃壒淇℃伅--------
+	 **/
 
-    @Column(name = "AUDIT_USER_", length = 50)
-    @PropertyDef(label = "瀹℃壒浜�")
-    private String auditUser;
+	@Column(name = "CREATE_USER_", length = 50)
+	@PropertyDef(label = "鍒涘缓浜�")
+	private String createUser;
 
-    @Column(name = "AUDIT_DATE_")
-    @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
-    private String auditDate;
+	@Column(name = "AUDIT_USER_", length = 50)
+	@PropertyDef(label = "瀹℃壒浜�")
+	private String auditUser;
 
-    @Column(name = "AUDIT_STATUS_", length = 10)
-    @PropertyDef(label = "瀹℃壒鐘舵��")
-    private String auditStatus;
+	@Column(name = "AUDIT_DATE_")
+	@PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+	private String auditDate;
 
-    @Column(name = "CREATE_TIME_")
-    @PropertyDef(label = "鍒涘缓鏃堕棿")
-    private Date createTime;
+	@Column(name = "AUDIT_STATUS_", length = 10)
+	@PropertyDef(label = "瀹℃壒鐘舵��")
+	private String auditStatus;
 
-    @Column(name = "wcrq")
-    @PropertyDef(label = "瀹屾垚鏃堕棿")
-    private Date wcrq;
+	@Column(name = "CREATE_TIME_")
+	@PropertyDef(label = "鍒涘缓鏃堕棿")
+	private Date createTime;
 
-    @Column(name = "UPDATE_TIME_")
-    @PropertyDef(label = "鏇存柊鏃堕棿")
-    private Date updateTime;
+	@Column(name = "wcrq")
+	@PropertyDef(label = "瀹屾垚鏃堕棿")
+	private Date wcrq;
+
+	@Column(name = "hqzz", length = 30)
+	@PropertyDef(label = "璐ф潈缁勭粐")
+	private String hqzz;
+
+	@Column(name = "UPDATE_TIME_")
+	@PropertyDef(label = "鏇存柊鏃堕棿")
+	private Date updateTime;
 
 }

--
Gitblit v1.9.3