From 75e83ba772ef70396b2595ccab646edf8ec4df51 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 12:20:13 +0800
Subject: [PATCH] 调整计划管理模块3

---
 igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java       |    4 
 igds-manager/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml                 |    2 
 igds-inout/src/main/java/com/ld/igds/models/InoutContract.java                       |    6 
 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java         |    5 
 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java |    4 
 igds-inout/src/main/java/com/ld/igds/models/InoutFullCheck.java                      |   80 ++++
 igds-inout/src/main/java/com/ld/igds/models/InoutPrice.java                          |   68 +++
 igds-core/src/main/java/com/ld/igds/models/CheckStandard.java                        |  124 ++---
 igds-manager/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java          |    9 
 /dev/null                                                                            |   92 ----
 igds-core/src/main/java/com/ld/igds/models/CheckItem.java                            |  133 +++---
 igds-inout/src/main/java/com/ld/igds/models/InoutEmptyCheck.java                     |  140 +++++++
 igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java                  |  138 ++++++
 igds-manager/src/main/java/com/ld/igds/m/view/VarietyChangePR.java                   |    7 
 igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java                       |   75 ++-
 igds-core/src/main/java/com/ld/igds/models/InoutRecord.java                          |    8 
 igds-doc/sql/update-v35-to-v40.sql                                                   |   13 
 igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java                      |   94 ++--
 igds-core/src/main/java/com/ld/igds/models/MQuality.java                             |  183 +++++---
 igds-inout/src/main/java/com/ld/igds/models/InoutPlanDetail.java                     |    4 
 20 files changed, 791 insertions(+), 398 deletions(-)

diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
index c42447f..4f06f63 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
@@ -4,7 +4,6 @@
 import com.ld.igds.constant.RedisConst;
 import com.ld.igds.log.service.InteStatusLogService;
 import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MVarietyChange;
 import com.ld.igds.sh.dto.ApiResponse;
 import com.ld.igds.sh.dto.Dto1312;
 import com.ld.igds.sh.param.ApiRequest;
@@ -60,7 +59,7 @@
         redisUtil.set(key, param.getEndTime());
 
         //鏌ヨ娓╂箍搴︿俊鎭紝鍗崇伯鎯呬俊鎭�
-        List<MVarietyChange> dataList = hApiShServiceImpl.listFoodVarietyChange(companyId,
+        List<InoutVarietyChange> dataList = hApiShServiceImpl.listFoodVarietyChange(companyId,
                 param.getDepotId(), startTime, param.getEndTime());
 
         //鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
@@ -73,7 +72,7 @@
         InteStatusLog log;
         InteStatusLog addLog;
         //灏佽鏁版嵁淇℃伅
-        for (MVarietyChange variety : dataList) {
+        for (InoutVarietyChange variety : dataList) {
             dto1312 = new Dto1312();
             dto1312.setXzzbdbh(variety.getId());
             dto1312.setHwbm(variety.getDepotId());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
index 7cd9170..036d218 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
@@ -500,8 +500,8 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<MVarietyChange> listFoodVarietyChange(String companyId, String depotId, Date startTime, Date endTime) {
-		String hql = " from " + MVarietyChange.class.getName() + " where companyId =:companyId";
+	public List<InoutVarietyChange> listFoodVarietyChange(String companyId, String depotId, Date startTime, Date endTime) {
+		String hql = " from " + InoutVarietyChange.class.getName() + " where companyId =:companyId";
 
 		Map<String, Object> args = new HashMap<String, Object>();
 		args.put("companyId", companyId);
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
index 88ff69d..0c7baa4 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
@@ -364,8 +364,8 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<MVarietyChange> listFoodVarietyChange(String companyId, String depotId, Date startTime, Date endTime) {
-		String hql = " from " + MVarietyChange.class.getName() + " where companyId =:companyId";
+	public List<InoutVarietyChange> listFoodVarietyChange(String companyId, String depotId, Date startTime, Date endTime) {
+		String hql = " from " + InoutVarietyChange.class.getName() + " where companyId =:companyId";
 
 		Map<String, Object> args = new HashMap<String, Object>();
 		args.put("companyId", companyId);
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckItem.java b/igds-core/src/main/java/com/ld/igds/models/CheckItem.java
index 897d986..ebd14b6 100644
--- a/igds-core/src/main/java/com/ld/igds/models/CheckItem.java
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckItem.java
@@ -18,91 +18,98 @@
  * @description:
  * @version:
  * @data:2020骞�4鏈�7鏃�
- *
  */
 @Data
 @Entity
 @Table(name = "D_CHECK_ITEM")
 public class CheckItem implements Serializable {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
 
-	@Id
-	@Column(name = "CHECK_ID_", length = 40)
-	@PropertyDef(label = "妫�娴嬬紪鐮�")
-	private String checkId;
+    @Id
+    @Column(name = "CHECK_ID_", length = 40)
+    @PropertyDef(label = "妫�娴嬬紪鐮�")
+    private String checkId;
 
-	@Id
-	@Column(name = "COMPANY_ID_", length = 10)
-	@PropertyDef(label = "缁勭粐缂栫爜")
-	private String companyId;
+    @Id
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
 
-	@Id
-	@Column(name = "STANDARD_ID_", length = 40)
-	@PropertyDef(label = "妫�娴嬮」缂栫爜")
-	private String standardId;
+    @Id
+    @Column(name = "STANDARD_ID_", length = 10)
+    @PropertyDef(label = "妫�娴嬮」缂栫爜")
+    private String standardId;
 
-	@Column(name = "STANDARD_NAME_", length = 50)
-	@PropertyDef(label = "鍖栭獙椤�")
-	private String standardName;
+    @Column(name = "STANDARD_NAME_", length = 50)
+    @PropertyDef(label = "鍖栭獙椤�")
+    private String standardName;
 
-	@Column(name = "UNIT_", length = 20)
-	@PropertyDef(label = "鍗曚綅")
-	private String unit;
+    @Column(name = "UNIT_", length = 20)
+    @PropertyDef(label = "鍗曚綅")
+    private String unit;
 
-	@Column(name = "UPPER_LIMIT_")
-	@PropertyDef(label = "鏍囧噯浼愬��")
-	private Double upperLimit;
+    @Column(name = "UPPER_LIMIT_")
+    @PropertyDef(label = "鏍囧噯浼愬��")
+    private Double upperLimit;
 
-	@Column(name = "OPERA_SYMBOL_",length = 4)
-	@PropertyDef(label = "杩愮畻绗﹀彿")
-	private String operaSymbol;
+    @Column(name = "OPERA_SYMBOL_", length = 4)
+    @PropertyDef(label = "杩愮畻绗﹀彿")
+    private String operaSymbol;
 
-//	@Column(name = "LOWER_LIMIT_")
-//	@PropertyDef(label = "鏍囧噯涓嬮檺")
-//	private Double lowerLimit;
+    @Column(name = "RULE_NUM_")
+    @PropertyDef(label = "鎵ｉ噸绯绘暟")
+    private Double ruleNum;
 
-	@Column(name = "RULE_NUM_")
-	@PropertyDef(label = "鎵ｉ噸绯绘暟")
-	private Double ruleNum;
+    @Column(name = "RULE_ADD_")
+    @PropertyDef(label = "澧為噸%")
+    private Double ruleAdd;
 
-	@Column(name = "RULE_ADD_")
-	@PropertyDef(label = "澧為噸%")
-	private Double ruleAdd;
+    @Column(name = "RULE_ADD_END_")
+    @PropertyDef(label = "澧為噸涓婇檺%")
+    private Double ruleAddEnd;
 
-	@Column(name = "RULE_ADD_END_")
-	@PropertyDef(label = "澧為噸涓婇檺%")
-	private Double ruleAddEnd;
+    @Column(name = "RULE_REDUCE_")
+    @PropertyDef(label = "鎵ｉ噸鍊�%")
+    private Double ruleReduce;
 
-	@Column(name = "RULE_REDUCE_")
-	@PropertyDef(label = "鎵ｉ噸鍊�%")
-	private Double ruleReduce;
+    @Column(name = "VALUE_", length = 40)
+    @PropertyDef(label = "妫�娴嬪��")
+    private String value;
 
-	@Column(name = "STANDARD_VALUE_", length = 15)
-	@PropertyDef(label = "鏍囧噯鍊�,鍙互鏄寖鍥�")
-	private String standardValue;
+    @Column(name = "RULE_PRICE_")
+    @PropertyDef(label = "鎵ｈ垂绯绘暟")
+    private Double rulePrice;
 
-	@Column(name = "VALUE_", length = 40)
-	@PropertyDef(label = "妫�娴嬪��")
-	private String value;
+    @Column(name = "RULE_REDUCE_PRICE_")
+    @PropertyDef(label = "鎵ｈ垂")
+    private Double ruleReducePrice;
 
-	@Column(name = "STANDARD_PRICE_")
-	@PropertyDef(label = "鏍囧噯鍗曚环锛堝厓/鏂わ級")
-	private Double standardPrice;
+    @Column(name = "ADD_NUM_")
+    @PropertyDef(label = "澧為噸", description = "鍗曚綅锛歬G")
+    private Double addNum;
 
-	@Column(name = "RULE_PRICE_")
-	@PropertyDef(label = "鎵ｈ垂绯绘暟")
-	private Double rulePrice;
+    @Column(name = "DE_NUM_")
+    @PropertyDef(label = "鎵ｉ噸", description = "鍗曚綅锛歬G")
+    private Double deNum;
 
-	@Column(name = "RULE_REDUCE_PRICE_")
-	@PropertyDef(label = "鎵ｈ垂")
-	private Double ruleReducePrice;
+    @Column(name = "ADD_PRICE_")
+    @PropertyDef(label = "澧炰环", description = "鍗曚綅锛氬厓")
+    private Double addPrice;
 
-	@Column(name = "REMARKS_", length = 50)
-	@PropertyDef(label = "鍖栭獙缁撴灉")
-	private String remarks;
-	
+    @Column(name = "DE_PRICE_")
+    @PropertyDef(label = "鎵ｉ噸", description = "鍗曚綅锛氬厓")
+    private Double dePrice;
+
+    @Column(name = "RESULT_", length = 2)
+    @PropertyDef(label = "妫�楠岀粨鏋�", description = "0=涓嶅悎鏍� 1=鍚堟牸")
+    private String result;
+
+    @Column(name = "REMARKS_", length = 50)
+    @PropertyDef(label = "澶囨敞")
+    private String remarks;
+
 }
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java b/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java
index ee2703a..5469a0c 100644
--- a/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java
@@ -1,105 +1,93 @@
 package com.ld.igds.models;
 
 import com.bstek.dorado.annotation.PropertyDef;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
- * 鍖栭獙鏍囧噯閰嶇疆淇℃伅
+ * 鍖栭獙鏍囧噯閰嶇疆
  *
  * @author: chen
- *
  */
 @Data
 @Entity
 @Table(name = "D_CHECK_STANDARD")
 public class CheckStandard 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 = "FOOD_VARIETY_", length = 20)
+    @PropertyDef(label = "绮鍝佺")
+    private String foodVariety;
 
-	@Column(name = "FOOD_VARIETY_", length = 20)
-	@PropertyDef(label = "绮鍝佺")
-	private String foodVariety;
+    @Column(name = "STANDARD_ID_", length = 10)
+    @PropertyDef(label = "鍖栭獙椤�")
+    private String standardId;
 
-	@Column(name = "STANDARD_ID_", length = 10)
-	@PropertyDef(label = "鍖栭獙椤�")
-	private String standardId;
+    @Column(name = "STANDARD_NAME_", length = 50)
+    @PropertyDef(label = "鍖栭獙椤�")
+    private String standardName;
 
-	@Column(name = "STANDARD_NAME_", length = 50)
-	@PropertyDef(label = "鍖栭獙椤�")
-	private String standardName;
+    @Column(name = "UNIT_", length = 20)
+    @PropertyDef(label = "鍗曚綅")
+    private String unit;
 
-	@Column(name = "UNIT_", length = 20)
-	@PropertyDef(label = "鍗曚綅")
-	private String unit;
+    @Column(name = "OPERA_SYMBOL_", length = 4)
+    @PropertyDef(label = "杩愮畻绗﹀彿")
+    private String operaSymbol;
 
-	@Column(name = "OPERA_SYMBOL_",length = 4)
-	@PropertyDef(label = "杩愮畻绗﹀彿")
-	private String operaSymbol;
+    @Column(name = "UPPER_LIMIT_")
+    @PropertyDef(label = "鏍囧噯涓婇檺")
+    private Double upperLimit;
 
-	@Column(name = "UPPER_LIMIT_")
-	@PropertyDef(label = "鏍囧噯涓婇檺")
-	private Double upperLimit;
+    @Column(name = "RULE_NUM_")
+    @PropertyDef(label = "鎵ｉ噸绯绘暟")
+    private Double ruleNum;
 
-//	@Column(name = "LOWER_LIMIT_")
-//    @PropertyDef(label = "鏍囧噯涓嬮檺")
-//    private Double lowerLimit;
+    @Column(name = "RULE_ADD_")
+    @PropertyDef(label = "澧為噸%")
+    private Double ruleAdd;
 
-	@Column(name = "RULE_NUM_")
-	@PropertyDef(label = "鎵ｉ噸绯绘暟")
-	private Double ruleNum;
+    @Column(name = "RULE_ADD_END_")
+    @PropertyDef(label = "澧為噸涓婇檺%")
+    private Double ruleAddEnd;
 
-	@Column(name = "RULE_ADD_")
-	@PropertyDef(label = "澧為噸%")
-	private Double ruleAdd;
+    @Column(name = "RULE_REDUCE_")
+    @PropertyDef(label = "鎵ｉ噸%")
+    private Double ruleReduce;
 
-	@Column(name = "RULE_ADD_END_")
-	@PropertyDef(label = "澧為噸涓婇檺%")
-	private Double ruleAddEnd;
+    @Column(name = "RULE_PRICE_")
+    @PropertyDef(label = "鎵ｈ垂绯绘暟")
+    private Double rulePrice;
 
-	@Column(name = "RULE_REDUCE_")
-	@PropertyDef(label = "鎵ｉ噸%")
-	private Double ruleReduce;
+    @Column(name = "RULE_REDUCE_PRICE_")
+    @PropertyDef(label = "鎵ｈ垂")
+    private Double ruleReducePrice;
 
-	@Column(name = "STANDARD_PRICE_")
-	@PropertyDef(label = "鏍囧噯鍗曚环锛堝厓/鏂わ級")
-	private Double standardPrice;
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏇存柊鏃堕棿")
+    private Date updateTime;
 
-	@Column(name = "RULE_PRICE_")
-	@PropertyDef(label = "鎵ｈ垂绯绘暟")
-	private Double rulePrice;
-
-	@Column(name = "RULE_REDUCE_PRICE_")
-	@PropertyDef(label = "鎵ｈ垂")
-	private Double ruleReducePrice;
-
-	@Column(name = "UPDATE_TIME_")
-	@PropertyDef(label = "鏇存柊鏃堕棿")
-	private Date updateTime;
-
-	@Column(name = "REMARKS_",length= 200)
-	@PropertyDef(label = "璇存槑")
-	private String remarks;
-
+    @Column(name = "REMARKS_", length = 200)
+    @PropertyDef(label = "璇存槑")
+    private String remarks;
 }
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 f309ff7..ee1179e 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
@@ -10,7 +10,11 @@
 import lombok.Data;
 
 /**
- * 鍑哄叆搴撴暟鎹褰曪紝褰撳墠璁板綍鍖呮嫭 鍏ュ簱淇℃伅鍜屽嚭鍏ュ簱淇℃伅锛�
+ * @Desc: 鍑哄叆搴撴祦姘磋〃锛屾牴鎹柊鍥界伯瑙勮皟鏁翠紭鍖栧瓧娈�
+ *
+ * @author: Andy
+ * @update-time: 2023/5/26
+ *
  */
 @Data
 @Entity
@@ -27,7 +31,7 @@
     private String companyId;
 
     @Column(name = "DEPT_ID_", length = 50)
-    @PropertyDef(label = "閮ㄩ棬ID", description = "鐢ㄤ簬鍖哄垎閮ㄩ棬")
+    @PropertyDef(label = "搴撳尯缂栫爜")
     private String deptId;
 
     @Column(name = "NOTICE_ID_", length = 40)
diff --git a/igds-core/src/main/java/com/ld/igds/models/MQuality.java b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
index 4bca1df..47a3f4f 100644
--- a/igds-core/src/main/java/com/ld/igds/models/MQuality.java
+++ b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
@@ -1,115 +1,152 @@
 package com.ld.igds.models;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.bstek.dorado.annotation.PropertyDef;
 import com.ld.igds.check.dto.CheckItemData;
 import lombok.Data;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 /**
- * 璐ㄩ噺宸℃--绮鍦ㄤ粨妫�娴�
- * 
- * @author chen
+ * 璐ㄩ噺绠＄悊锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲璋冩暣
  *
+ * @author chen
  */
 @Data
 @Entity
 @Table(name = "D_M_QUALITY")
 public class MQuality implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "涓婚敭ID", description = "ZJ+妫�楠岀被鍒�+骞存湀鏃ユ椂鍒嗙")
-	private String id;
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "涓婚敭ID", description = "ZJ+妫�楠岀被鍒�+骞存湀鏃ユ椂鍒嗙")
+    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 = "DEPOT_ID_", length = 50)
-	@PropertyDef(label = "浠撳簱缂栫爜")
-	private String depotId;
+    @Column(name = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "浠撳簱缂栫爜")
+    private String depotId;
 
-	@Column(name = "FOOD_VARIETY_", length = 10)
-	@PropertyDef(label = "绮鍝佺")
-	private String foodVariety;
+    @Column(name = "FOOD_VARIETY_", length = 10)
+    @PropertyDef(label = "绮鍝佺")
+    private String foodVariety;
 
-	@Column(name = "FOOD_LEVEL_", length = 10)
-	@PropertyDef(label = "绮绛夌骇")
-	private String foodLevel;
+    @Column(name = "FOOD_LEVEL_", length = 10)
+    @PropertyDef(label = "绮绛夌骇")
+    private String foodLevel;
 
-	@Column(name = "FOOD_TYPE_", length = 10)
-	@PropertyDef(label = "绮鎬ц川")
-	private String foodType;
+    @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+    @Column(name = "STORE_DATE_")
+    private Date storeDate;
 
-	@Column(name = "FOOD_LOCATION_", length = 30)
-	@PropertyDef(label = "绮浜у湴")
-	private String foodLocation;
+    @Column(name = "TYPE_", length = 10)
+    @PropertyDef(label = "妫�楠岀被鍒�", description = "01锛氬叆浠撻獙鏀� 02锛氬嚭浠撴楠� 03锛�3 鏈堟湯鏅04锛�9 鏈堟湯鏅 05锛氬叆浠撳垵妫� 06锛氭湀搴︽鏌� 07锛�3 鏈堟湯搴撳唴鏅煡 08锛�9 鏈堟湯搴撳唴鏅煡")
+    private String type;
 
-	@Column(name = "TYPE_", length = 10)
-	@PropertyDef(label = "妫�楠岀被鍒�", description = "濡傚叆搴撻獙鏀躲�佸偍钘忔楠屻�佹棩甯稿贰妫�绛�")
-	private String type;
+    @Column(name = "TIME_")
+    @PropertyDef(label = "妫�楠屾椂闂�")
+    private Date time;
 
-	@Column(name = "STANDARD_", length = 10)
-	@PropertyDef(label = "妫�楠屼緷鎹�", description = "01-鍥芥爣锛�02-鍏朵粬")
-	private String standard;
+    @Column(name = "USER_", length = 50)
+    @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
+    private String user;
 
-	@Column(name = "USER_", length = 50)
-	@PropertyDef(label = "妫�楠屽崟浣嶆垨妫�楠屼汉")
-	private String user;
+    @Column(name = "UNIT_", length = 50)
+    @PropertyDef(label = "妫�楠屽崟浣�")
+    private String unit;
 
-	@Column(name = "TIME_")
-	@PropertyDef(label = "妫�楠屾椂闂�")
-	private Date time;
+    @Column(name = "STANDARD_", length = 4)
+    @PropertyDef(label = "妫�楠屼緷鎹�", description = "1-鍥芥爣锛�0-鍏朵粬")
+    private String standard;
 
-	@Column(name = "RESULT_", length = 50)
-	@PropertyDef(label = "妫�楠岀粨璁�")
-	private String result;
 
-	@Column(name = "CHECK_AREA__", length = 50)
-	@PropertyDef(label = "鎵︽牱鍖哄煙")
-	private String checkArea;
+    @PropertyDef(label = "鎸囨爣绫诲埆", description = "1: 璐ㄩ噺鎸囨爣妫�楠�2锛氬偍瀛樺搧璐ㄦ楠�3锛氶鍝佸畨鍏ㄦ楠� 濡傛灉鍚屾椂妫�楠屼簡澶氫釜锛岀敤#闅斿紑锛屼緥濡傦細1#2#3")
+    @Column(name = "zblb", length = 8)
+    private String zblb;
 
-	@Column(name = "CHECK_USER_", length = 50)
-	@PropertyDef(label = "鎵︽牱浜�")
-	private String checkUser;
+    @Column(name = "RESULT_", length = 40)
+    @PropertyDef(label = "妫�楠岀粨璁�", description = "1銆佽川閲忔寚鏍囧～鍐�/杈炬爣/涓嶈揪鏍� 2銆佸偍瀛樺搧璐ㄦ寚鏍囧～鍐欌�滃疁瀛樷�濄�佽交搴︿笉瀹滃瓨鈥濄�佲�滈噸搴︿笉瀹滃瓨鈥�3銆侀鍝佸畨鍏ㄦ寚鏍囧～鍐欌�滃悎鏍尖�濄�佷笉鍚堟牸鈥� 澶氶」鎸囨爣鏃朵互#鍒嗛殧锛屼緥濡傦細杈炬爣|缁煎悎鍒ゅ畾#瀹滃瓨#鍚堟牸 ")
+    private String result;
 
-	@Column(name = "CHECK_TIME_")
-	@PropertyDef(label = "鎵︽牱鏃堕棿")
-	private Date checkTime;
+    @JSONField(format = "yyyy-MM-dd")
+    @PropertyDef(label = "绛惧彂鏃ユ湡")
+    @Column(name = "qfrq")
+    private Date qfrq;
 
-	@Column(name = "CHECK_NUM_")
-	@PropertyDef(label = "鏍峰搧鏁伴噺")
-	private Double checkNum;
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @PropertyDef(label = "鎶ュ憡鍑哄叿鏃堕棿")
+    @Column(name = "bgcjsj")
+    private Date bgcjsj;
 
-	@Column(name = "CHECK_REPRESENT_", length = 50)
-	@PropertyDef(label = "鏍峰搧浠ｈ〃")
-	private String checkRepresent;
+    @PropertyDef(label = "瀹℃牳浜哄鍚�")
+    @Column(name = "shrxm", length = 64, nullable = false)
+    private String shrxm;
 
-	@Column(name = "CHECK_LEVEL_", length = 20)
-	@PropertyDef(label = "鏍峰搧绛夌骇")
-	private String checkLevel;
+    @PropertyDef(label = "鎵︽牱鍗曠紪鍙�")
+    @Column(name = "qydbh", length = 64)
+    private String qydbh;
 
-	@Column(name = "NORMAL_YEAR_", length = 10)
-	@PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺")
-	private String normalYear;
+    @Column(name = "CHECK_TIME_")
+    @PropertyDef(label = "鎵︽牱鏃堕棿", required = true)
+    private Date checkTime;
 
-	@Column(name = "REMARK_", length = 500)
-	@PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
-	private String remark;
+    @Column(name = "CHECK_AREA_", length = 50)
+    @PropertyDef(label = "鎵︽牱鍖哄煙")
+    private String checkArea;
 
-	/**
-	 * 鍖栭獙椤逛俊鎭�
-	 */
-	@Transient
-	private List<CheckItemData> checkItems;
+    @Column(name = "CHECK_USER_", length = 50)
+    @PropertyDef(label = "鎵︽牱浜�", required = true)
+    private String checkUser;
+
+    @PropertyDef(label = "鐩戠潱浜哄鍚�")
+    @Column(name = "jdrxm", length = 64)
+    private String jdrxm;
+
+    @PropertyDef(label = "鏍峰搧缂栧彿")
+    @Column(name = "ypbh", length = 64)
+    private String ypbh;
+
+    @PropertyDef(label = "鏍峰搧鏁伴噺", required = true)
+    @Column(name = "ypsl", precision = 20, scale = 6)
+    private double ypsl;
+
+    @PropertyDef(label = "浠ｈ〃鏁伴噺")
+    @Column(name = "dbsl", precision = 20, scale = 6)
+    private double dbsl;
+
+    @PropertyDef(label = "鏍峰搧绛夌骇")
+    @Column(name = "ypdj", length = 2)
+    private String ypdj;
+
+    @Column(name = "NORMAL_YEAR_", length = 10)
+    @PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺")
+    private String normalYear;
+
+    @Column(name = "REMARK_", length = 200)
+    @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+    private String remark;
+
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
+
+    /**
+     * 鍖栭獙椤圭洰
+     */
+    @Transient
+    private List<CheckItemData> checkItems;
 
 }
diff --git a/igds-doc/sql/update-v35-to-v40.sql b/igds-doc/sql/update-v35-to-v40.sql
index d1ed658..5d15af6 100644
--- a/igds-doc/sql/update-v35-to-v40.sql
+++ b/igds-doc/sql/update-v35-to-v40.sql
@@ -1,8 +1,17 @@
--- 鐗堟湰V35鍗囩骇V40鑴氭湰 ---2023骞�5鏈�17鏃�
+-- 鐗堟湰V35鍗囩骇V40鑴氭湰 ---2023骞�5鏈�
 
 -- 淇敼璁″垝琛ㄥ悕绉�
 RENAME TABLE D_M_PLAN TO D_INOUT_PLAN
 RENAME TABLE D_M_PLAN_DETAIL TO D_INOUT_PLAN_DETAIL;
 
 --淇敼鍚堝悓淇℃伅
-RENAME TABLE D_M_CONTRACT TO D_INOUT_CONTRACT;
\ No newline at end of file
+RENAME TABLE D_M_CONTRACT TO D_INOUT_CONTRACT;
+
+--鎬ц川鍙樻洿
+RENAME TABLE D_M_VARIETY_CHANGE TO D_INOUT_VARIETY_CHANGE;
+
+--璐ㄩ噺绠＄悊-妫�楠岀被鍨嬪崌绾�--寰呴厤缃�
+UPDATE D_M_QUALITY SET TYPE_ = '', WHERE TYPE_ ='';
+
+UPDATE D_M_QUALITY SET STANDARD_ = '1', WHERE STANDARD_ ='01';
+UPDATE D_M_QUALITY SET STANDARD_ = '0', WHERE STANDARD_ ='02';
\ No newline at end of file
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 5b5c625..86a3067 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
@@ -35,7 +35,6 @@
     @PropertyDef(label = "搴撳尯缂栫爜")
     private String deptId;
 
-
     @Column(name = "NAME_", length = 50)
     @PropertyDef(label = "鍚堝悓鍚嶇О")
     private String name;
@@ -67,7 +66,6 @@
     @Column(name = "CUSTOMER_NAME_", length = 50)
     @PropertyDef(label = "瀹㈡埛鍚嶇О")
     private String customerName;
-
 
     @Column(name = "fddbr", length = 50)
     @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
@@ -205,6 +203,10 @@
     @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
     private String auditDate;
 
+    @Column(name = "AUDIT_STATUS_", length = 10)
+    @PropertyDef(label = "瀹℃壒鐘舵��")
+    private String auditStatus;
+
     @Column(name = "CREATE_TIME_")
     @PropertyDef(label = "鍒涘缓鏃堕棿")
     private Date createTime;
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutEmptyCheck.java b/igds-inout/src/main/java/com/ld/igds/models/InoutEmptyCheck.java
new file mode 100644
index 0000000..82b8299
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutEmptyCheck.java
@@ -0,0 +1,140 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @Desc: 绌轰粨楠屾敹鍗�
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_EMPTY_CHECK")
+public class InoutEmptyCheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "鍗曟嵁鍙�")
+    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 = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "浠撳簱缂栫爜")
+    private String depotId;
+
+    @Column(name = "NAME_", length = 50)
+    @PropertyDef(label = "鍗曟嵁鍚嶇О")
+    private String name;
+
+    @Column(name = "FOOD_VARIETY_", length = 20)
+    @PropertyDef(label = "鎷熷瓨鍝佺")
+    private String foodVariety;
+
+    @Column(name = "dpqk", length = 10)
+    @PropertyDef(label = "鍦板潽", description = "浠撴埧瀹屽ソ鎯呭喌")
+    private String dpqk;
+
+    @Column(name = "qtqk", length = 10)
+    @PropertyDef(label = "澧欎綋", description = "浠撴埧瀹屽ソ鎯呭喌")
+    private String qtqk;
+
+    @Column(name = "wmqk", length = 10)
+    @PropertyDef(label = "灞嬮潰", description = "浠撴埧瀹屽ソ鎯呭喌")
+    private String wmqk;
+
+    @Column(name = "mcqk", length = 10)
+    @PropertyDef(label = "闂ㄧ獥", description = "浠撴埧瀹屽ソ鎯呭喌")
+    private String mcqk;
+
+    @Column(name = "pdqk", length = 10)
+    @PropertyDef(label = "閾哄灚", description = "浠撴埧瀹屽ソ鎯呭喌")
+    private String pdqk;
+
+    @Column(name = "fqw", length = 10)
+    @PropertyDef(label = "闃查泙缃�", description = "涓夐槻璁炬柦鏄惁瀹屽ソ")
+    private String fqw;
+
+    @Column(name = "fcx", length = 10)
+    @PropertyDef(label = "闃茶櫕绾�", description = "涓夐槻璁炬柦鏄惁瀹屽ソ")
+    private String fcx;
+
+    @Column(name = "fsb", length = 10)
+    @PropertyDef(label = "闃查紶鏉�", description = "涓夐槻璁炬柦鏄惁瀹屽ソ")
+    private String fsb;
+
+    @Column(name = "tfxt", length = 10)
+    @PropertyDef(label = "閫氶绯荤粺鏄惁瀹屽ソ")
+    private String tfxt;
+
+    @Column(name = "xzxt", length = 10)
+    @PropertyDef(label = "鐔忚捀绯荤粺鏄惁瀹屽ソ")
+    private String xzxt;
+
+    @Column(name = "lqxt", length = 10)
+    @PropertyDef(label = "绮儏绯荤粺鏄惁瀹屽ソ")
+    private String lqxt;
+
+    @Column(name = "wkxt", length = 10)
+    @PropertyDef(label = "娓╂帶绯荤粺鏄惁瀹屽ソ")
+    private String wkxt;
+
+    @Column(name = "qtxt", length = 10)
+    @PropertyDef(label = "姘旇皟绯荤粺鏄惁瀹屽ソ")
+    private String qtxt;
+
+    @Column(name = "sfqx", length = 10)
+    @PropertyDef(label = "鏄惁娓呮秷")
+    private String sfqx;
+
+    @Column(name = "zlfa", length = 10)
+    @PropertyDef(label = "鏄惁鍒跺畾瑁呯伯鏂规")
+    private String zlfa;
+
+    @Column(name = "CREATE_TIME_")
+    @PropertyDef(label = "鎶ユ鏃堕棿")
+    private Date createTime;
+
+    @Column(name = "AUTID_TIME_")
+    @PropertyDef(label = "楠屾敹鏃堕棿")
+    private Date auditTime;
+
+    @Column(name = "AUTID_RESULT_", length = 200)
+    @PropertyDef(label = "楠屾敹缁撹")
+    private String auditResult;
+
+    @Column(name = "AUTID_INFO_", length = 200)
+    @PropertyDef(label = "楠屾敹寤鸿")
+    private String auditInfo;
+
+    @Column(name = "AUTID_UNIT_", length = 50)
+    @PropertyDef(label = "楠屾敹鍗曚綅")
+    private String auditUnit;
+
+    @Column(name = "AUTID_USER_", length = 50)
+    @PropertyDef(label = "楠屾敹浜�")
+    private String auditUser;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
+
+    @Transient
+    @PropertyDef(label = "鐩稿叧闄勪欢")
+    private List<FileInfo> files;
+}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutFullCheck.java b/igds-inout/src/main/java/com/ld/igds/models/InoutFullCheck.java
new file mode 100644
index 0000000..a8a3a9a
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutFullCheck.java
@@ -0,0 +1,80 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @Desc: 婊′粨楠屾敹鍗�
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_FULL_CHECK")
+public class InoutFullCheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "鍗曟嵁鍙�")
+    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 = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "浠撳簱缂栫爜")
+    private String depotId;
+
+    @Column(name = "NAME_", length = 50)
+    @PropertyDef(label = "鍗曟嵁鍚嶇О")
+    private String name;
+
+    @Column(name = "NOTICE_IDS_", length = 200)
+    @PropertyDef(label = "閫氱煡鍗曠紪鍙�", description = "鏀寔澶氫釜閫夋嫨锛岄�楀彿闅斿紑")
+    private String noticeIds;
+
+    @Column(name = "NOTICE_NAMES_", length = 200)
+    @PropertyDef(label = "閫氱煡鍗曞悕绉�", description = "鏀寔澶氫釜閫夋嫨锛岄�楀彿闅斿紑")
+    private String noticeNames;
+
+    @Column(name = "PLAN_NUM_", precision = 16, scale = 2)
+    @PropertyDef(label = "璁″垝鏁伴噺", description = "鍗曚綅锛氬惃")
+    private Double planNum;
+
+    @Column(name = "COMPLETE_NUM_", precision = 16, scale = 2)
+    @PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛氬惃锛岀郴缁熻嚜鍔ㄥ悎璁�")
+    private double completeNumber = 0.0;
+
+    @Column(name = "AUDIT_USER_", length = 50)
+    @PropertyDef(label = "瀹℃牳浜�")
+    private String auditUser;
+
+    @Column(name = "AUDIT_DATE_")
+    @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+    private String auditDate;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
+
+    @Transient
+    @PropertyDef(label = "鐩稿叧闄勪欢")
+    private List<FileInfo> files;
+
+    @Transient
+    @PropertyDef(label = "鍑哄叆搴撴祦姘�")
+    private List<InoutRecord> recordList;
+}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
index e541f5e..84a122c 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
@@ -10,7 +10,7 @@
 import java.util.Date;
 
 /**
- * 鍑哄叆搴�-鍏ュ簱閫氱煡鍗�
+ * 鍑哄叆搴�-鍏ュ簱閫氱煡鍗曪紝2023骞�5鏈�26鏃� 浼樺寲璋冩暣
  *
  * @author chen
  */
@@ -30,32 +30,36 @@
     @PropertyDef(label = "缁勭粐缂栫爜")
     private String companyId;
 
-    @Column(name = "DEPT_ID_", length = 40)
-    @PropertyDef(label = "搴撳尯缂栫爜", description = "鎵�灞炲垎搴�")
+    @Column(name = "DEPT_ID_", length = 50)
+    @PropertyDef(label = "搴撳尯缂栫爜")
     private String deptId;
-
-    @Column(name = "PLAN_ID_", length = 40)
-    @PropertyDef(label = "璁″垝id", description = "璁″垝id涓庡悎鍚宨d浜岄�変竴")
-    private String planId;
-
-    @Column(name = "PLAN_NAME_", length = 50)
-    @PropertyDef(label = "璁″垝鍚嶇О")
-    private String planName;
-
-    @Column(name = "CONTRACT_ID_", length = 40)
-    @PropertyDef(label = "鍚堝悓缂栫爜", description = "璁″垝id涓庡悎鍚宨d浜岄�変竴")
-    private String contractId;
-
-    @Column(name = "CONTRACT_NAME_", length = 50)
-    @PropertyDef(label = "鍚堝悓鍚嶇О")
-    private String contractName;
 
     @Column(name = "NAME_", length = 50)
     @PropertyDef(label = "閫氱煡鍗曞悕绉�")
     private String name;
 
+    @Column(name = "PLAN_ID_", length = 40)
+    @PropertyDef(label = "璁″垝鏄庣粏鍙�", description = "閽堝杞崲绮蹇呭～")
+    private String planId;
+
+    @Column(name = "CONTRACT_ID_", length = 40)
+    @PropertyDef(label = "鍚堝悓缂栫爜", description = "閽堝杞崲绮蹇呭～")
+    private String contractId;
+
+    @Column(name = "CONTRACT_NAME_", length = 50)
+    @PropertyDef(label = "鍚堝悓鍚嶇О", description = "閽堝杞崲绮蹇呭～")
+    private String contractName;
+
+//    @Column(name = "PLAN_NAME_", length = 50)
+//    @PropertyDef(label = "璁″垝鍚嶇О")
+//    private String planName;
+
+    @Column(name = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "鐩爣浠撳簱")
+    private String depotId;
+
     @Column(name = "CUSTOMER_ID_", length = 40)
-    @PropertyDef(label = "鍙戣揣瀹㈡埛ID")
+    @PropertyDef(label = "鍙戣揣瀹㈡埛")
     private String customerId;
 
     @Column(name = "CUSTOMER_NAME_", length = 50)
@@ -75,11 +79,11 @@
     private String year;
 
     @Column(name = "TARGET_NUMBER_")
-    @PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛欿G")
+    @PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛氬惃锛屾墜鍔ㄥ～鎶�")
     private double targetNumber = 0.0;
 
     @Column(name = "COMPLETE_NUMBER_")
-    @PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛欿G")
+    @PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛氬惃锛岀郴缁熻嚜鍔ㄥ悎璁�")
     private double completeNumber = 0.0;
 
     @Column(name = "AUDIT_STATUS_", length = 10)
@@ -90,9 +94,17 @@
     @PropertyDef(label = "瀹℃牳浜�")
     private String auditUser;
 
+    @Column(name = "AUDIT_DATE_")
+    @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+    private String auditDate;
+
     @Column(name = "COMPLETE_STATUS_", length = 10)
     @PropertyDef(label = "瀹屾垚鐘舵��", description = "鏈畬鎴愶紝宸插畬鎴�")
     private String completeStatus = InoutConstant.COMPLETE_STATUS_NONE;
+
+    @Column(name = "COMPLETE_TIME_")
+    @PropertyDef(label = "瀹屾垚鏃堕棿")
+    private Date completeTime;
 
     @Column(name = "CREATE_TIME_")
     @PropertyDef(label = "鍒涘缓鏃堕棿")
@@ -102,21 +114,18 @@
     @PropertyDef(label = "鍒涘缓浜�")
     private String createUser;
 
-    @Column(name = "COMPLETE_TIME_")
-    @PropertyDef(label = "瀹屾垚鏃堕棿")
-    private Date completeTime;
-
     @Column(name = "REMARK_", length = 200)
     @PropertyDef(label = "澶囨敞淇℃伅")
     private String remark;
+
+    @Column(name = "TYPE_", length = 2)
+    @PropertyDef(label = "涓氬姟璇存槑", description = "杞崲绮锛岄潪杞崲绮紝濡傛灉涓鸿疆鎹㈢伯椋燂紝璁″垝鏄庣粏鍜屽悎鍚屽繀濉�")
+    private String type;
 
     @Transient
     @PropertyDef(label = "鏍囪", description = "鐢ㄤ簬鍒ゆ柇閫氱煡鍗曟槸鍚︿负鏂板")
     private String tag;
 
-    @Transient
-    @PropertyDef(label = "绮鍝佺")
-    private String foodVarietyName;
 
     public String getFoodVarietyName() {
         if (null != this.foodVariety) {
@@ -124,4 +133,12 @@
         }
         return null;
     }
+
+    @Transient
+    @PropertyDef(label = "浠撳簱鍚嶇О")
+    private String depotName = "";
+
+    @Transient
+    @PropertyDef(label = "绮鍝佺")
+    private String foodVarietyName;
 }
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java
index 75fda61..3c66321 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java
@@ -10,7 +10,7 @@
 import java.util.Date;
 
 /**
- * 鍑哄叆搴�-鍑哄簱閫氱煡鍗�
+ * 鍑哄叆搴�-鍑哄簱閫氱煡鍗曪紝鏍规嵁鏂板浗鏍囧凡鏍稿 2023骞�5鏈�26鏃� 09:35:23
  *
  * @author chen
  */
@@ -33,72 +33,60 @@
     @PropertyDef(label = "缁勭粐缂栫爜")
     private String companyId;
 
-    @Column(name = "DEPT_ID_", length = 40)
-    @PropertyDef(label = "搴撳尯缂栫爜", description = "鎵�灞炲垎搴�")
+    @Column(name = "DEPT_ID_", length = 50)
+    @PropertyDef(label = "搴撳尯缂栫爜")
     private String deptId;
-
-    @Column(name = "PLAN_ID_", length = 40)
-    @PropertyDef(label = "璁″垝id", description = "璁″垝id涓庡悎鍚宨d浜岄�変竴")
-    private String planId;
-
-    @Column(name = "PLAN_NAME_", length = 50)
-    @PropertyDef(label = "璁″垝鍚嶇О")
-    private String planName;
-
-    @Column(name = "CONTRACT_ID_", length = 40)
-    @PropertyDef(label = "鍚堝悓id", description = "璁″垝id涓庡悎鍚宨d浜岄�変竴")
-    private String contractId;
-
-    @Column(name = "CONTRACT_NAME_", length = 50)
-    @PropertyDef(label = "鍚堝悓鍚嶇О")
-    private String contractName;
 
     @Column(name = "NAME_", length = 50)
     @PropertyDef(label = "閫氱煡鍗曞悕绉�")
     private String name;
 
+    @Column(name = "PLAN_ID_", length = 40)
+    @PropertyDef(label = "璁″垝鏄庣粏鍙�", description = "閽堝杞崲绮蹇呭～")
+    private String planId;
+
+    @Column(name = "CONTRACT_ID_", length = 40)
+    @PropertyDef(label = "鍚堝悓缂栫爜", description = "閽堝杞崲绮蹇呭～")
+    private String contractId;
+
+    @Column(name = "CONTRACT_NAME_", length = 50)
+    @PropertyDef(label = "鍚堝悓鍚嶇О", description = "閽堝杞崲绮蹇呭～")
+    private String contractName;
+
+//    @Column(name = "PLAN_NAME_", length = 50)
+//    @PropertyDef(label = "璁″垝鍚嶇О")
+//    private String planName;
+
     @Column(name = "DEPOT_ID_", length = 50)
-    @PropertyDef(label = "浠撳簱")
+    @PropertyDef(label = "鐩爣浠撳簱")
     private String depotId;
 
     @Column(name = "CUSTOMER_ID_", length = 40)
-    @PropertyDef(label = "鏀惰揣鍗曚綅ID")
+    @PropertyDef(label = "鍙戣揣瀹㈡埛")
     private String customerId;
 
     @Column(name = "CUSTOMER_NAME_", length = 50)
-    @PropertyDef(label = "鏀惰揣鍗曚綅")
+    @PropertyDef(label = "鍙戣揣瀹㈡埛")
     private String customerName;
 
     @Column(name = "UNIT_NAME_", length = 50)
-    @PropertyDef(label = "鍙戣揣鍗曚綅", description = "搴撳尯鍚嶇О锛屾墜鍔ㄥ～鍐�")
+    @PropertyDef(label = "鏀惰揣鍗曚綅", description = "搴撳尯鎵�灞炲叕鍙革紝鎵嬪姩褰曞叆")
     private String unitName;
 
     @Column(name = "FOOD_VARIETY_", length = 10)
     @PropertyDef(label = "绮鍝佺")
     private String foodVariety;
 
-    @Column(name = "FOOD_TYPE_", length = 10)
-    @PropertyDef(label = "绮鎬ц川")
-    private String foodType;
-
-    @Column(name = "FOOD_LEVEL_", length = 10)
-    @PropertyDef(label = "绮绛夌骇")
-    private String foodLevel;
-
     @Column(name = "YEAR_", length = 10)
-    @PropertyDef(label = "閫氱煡鍗曞勾浠�")
+    @PropertyDef(label = "骞翠唤")
     private String year;
 
-    @Column(name = "STORAGE_REAL_")
-    @PropertyDef(label = "浠撳簱瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G")
-    private double storageReal = 0.0;
-
     @Column(name = "TARGET_NUMBER_")
-    @PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛欿G")
+    @PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛欿G锛屾墜鍔ㄥ～鎶�")
     private double targetNumber = 0.0;
 
     @Column(name = "COMPLETE_NUMBER_")
-    @PropertyDef(label = "瀹屾垚閲�", description = "鍗曚綅锛欿G")
+    @PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛欿G锛岀郴缁熻嚜鍔ㄥ悎璁�")
     private double completeNumber = 0.0;
 
     @Column(name = "AUDIT_STATUS_", length = 10)
@@ -109,9 +97,17 @@
     @PropertyDef(label = "瀹℃牳浜�")
     private String auditUser;
 
+    @Column(name = "AUDIT_DATE_")
+    @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+    private String auditDate;
+
     @Column(name = "COMPLETE_STATUS_", length = 10)
     @PropertyDef(label = "瀹屾垚鐘舵��", description = "鏈畬鎴愶紝宸插畬鎴�")
     private String completeStatus = InoutConstant.COMPLETE_STATUS_NONE;
+
+    @Column(name = "COMPLETE_TIME_")
+    @PropertyDef(label = "瀹屾垚鏃堕棿")
+    private Date completeTime;
 
     @Column(name = "CREATE_TIME_")
     @PropertyDef(label = "鍒涘缓鏃堕棿")
@@ -121,17 +117,25 @@
     @PropertyDef(label = "鍒涘缓浜�")
     private String createUser;
 
-    @Column(name = "COMPLETE_TIME_")
-    @PropertyDef(label = "瀹屾垚鏃堕棿")
-    private Date completeTime;
-
     @Column(name = "REMARK_", length = 200)
     @PropertyDef(label = "澶囨敞淇℃伅")
     private String remark;
 
+    @Column(name = "TYPE_", length = 2)
+    @PropertyDef(label = "涓氬姟璇存槑", description = "杞崲绮锛岄潪杞崲绮紝濡傛灉涓鸿疆鎹㈢伯椋燂紝璁″垝鏄庣粏鍜屽悎鍚屽繀濉�")
+    private String type;
+
     @Transient
     @PropertyDef(label = "鏍囪", description = "鐢ㄤ簬鍒ゆ柇閫氱煡鍗曟槸鍚︿负鏂板")
     private String tag;
+
+
+    public String getFoodVarietyName() {
+        if (null != this.foodVariety) {
+            return FoodVariety.getMsg(this.foodVariety);
+        }
+        return null;
+    }
 
     @Transient
     @PropertyDef(label = "浠撳簱鍚嶇О")
@@ -141,10 +145,4 @@
     @PropertyDef(label = "绮鍝佺")
     private String foodVarietyName;
 
-    public String getFoodVarietyName() {
-        if (null != this.foodVariety) {
-            return FoodVariety.getMsg(this.foodVariety);
-        }
-        return null;
-    }
 }
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutPlanDetail.java b/igds-inout/src/main/java/com/ld/igds/models/InoutPlanDetail.java
index 18e7769..17b3267 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutPlanDetail.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutPlanDetail.java
@@ -22,7 +22,7 @@
 
     @Id
     @Column(name = "ID_", length = 40)
-    @PropertyDef(label = "璁″垝鏄庣粏鍗曞彿")
+    @PropertyDef(label = "璁″垝鏄庣粏鍙�")
     private String id;
 
     @Column(name = "PLAN_ID_", length = 40)
@@ -50,7 +50,7 @@
     private String depotId;
 
     @Column(name = "PLAN_NUM_", precision = 16, scale = 2)
-    @PropertyDef(label = "璁″垝鏁伴噺")
+    @PropertyDef(label = "璁″垝鏁伴噺", description = "鍗曚綅锛氬惃")
     private Double planNum;
 
     @Column(name = "TYPE_", length = 4)
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutPrice.java b/igds-inout/src/main/java/com/ld/igds/models/InoutPrice.java
new file mode 100644
index 0000000..6a9b1c0
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutPrice.java
@@ -0,0 +1,68 @@
+package com.ld.igds.models;
+
+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.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Desc: 鍑哄叆搴撶伯椋熶环鏍奸厤缃〃
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_PRICE")
+public class InoutPrice implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    @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 = "FOOD_VARIETY_", length = 20)
+    @PropertyDef(label = "绮鍝佺")
+    private String foodVariety;
+
+    @Column(name = "FOOD_LEVEL_", length = 20)
+    @PropertyDef(label = "绮绛夌骇")
+    private String foodLevel;
+
+    @Column(name = "PRICE_")
+    @PropertyDef(label = "绮浠锋牸", description = "鍗曚綅锛氬厓/KG")
+    private double price;
+
+    @Column(name = "START_TIME_")
+    @PropertyDef(label = "鏈夋晥寮�濮嬫椂闂�")
+    private Date startTime;
+
+    @Column(name = "END_TIME_")
+    @PropertyDef(label = "鏈夋晥鎴嚦鏃堕棿")
+    private Date endTime;
+
+    @Column(name = "UPDATE_USER_", length = 30)
+    @PropertyDef(label = "鏈�鍚庢洿鏂颁汉")
+    private String updateUser;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏇存柊鏃堕棿")
+    private Date updateTime;
+
+    @Column(name = "REMARKS_", length = 200)
+    @PropertyDef(label = "璇存槑")
+    private String remarks;
+}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java b/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
new file mode 100644
index 0000000..2a744c0
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
@@ -0,0 +1,138 @@
+package com.ld.igds.models;
+
+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.io.Serializable;
+import java.util.Date;
+
+/**
+ * 缁煎悎绠＄悊-绮鎬ц川鍙樻洿锛屼富瑕佹槸鍑哄叆搴撲箣鍓嶅仛 鍌ㄥ杞晢鍝侊紝瀹屾垚涔嬪悗 鍟嗗搧杞偍澶囥��
+ * <p>
+ * 鍙樻洿璁板綍锛氳〃鍚嶅彉鏇翠负 D_INOUT_VARIETY_CHANGE
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_VARIETY_CHANGE")
+public class InoutVarietyChange implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "涓婚敭")
+    private String id;
+
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
+
+    @Column(name = "DEPT_ID_", length = 40)
+    @PropertyDef(label = "鍒嗗簱缂栫爜")
+    private String deptId;
+
+    @Column(name = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "鎵�灞炰粨搴�")
+    private String depotId;
+
+    @Column(name = "NUMBER_")
+    @PropertyDef(label = "绮鏁伴噺")
+    private Double number = 0.0;
+
+    @Column(name = "CHANGE_NUMBER_")
+    @PropertyDef(label = "鍒掕浆鏁伴噺")
+    private Double changeNumber = 0.0;
+
+    @Column(name = "APPROVAL_ID_", length = 40)
+    @PropertyDef(label = "鎵瑰噯鏂囧彿")
+    private String approvalId;
+
+    @Column(name = "FOOD_VARIETY_", length = 10)
+    @PropertyDef(label = "绮鍝佺")
+    private String foodVariety;
+
+    @Column(name = "FOOD_TYPE_", length = 10)
+    @PropertyDef(label = "鍘熺伯椋熸�ц川")
+    private String foodType;
+
+    @Column(name = "NEW_FOOD_TYPE_", length = 10)
+    @PropertyDef(label = "鍙樻洿鍚庢�ц川")
+    private String newFoodType;
+
+    @Column(name = "CHANGE_TIME_")
+    @PropertyDef(label = "鍙樻洿鏃堕棿")
+    private Date changeTime;
+
+    @PropertyDef(label = "浠撳偍瀹℃牳浜�")
+    @Column(name = "ccshr", length = 64)
+    private String ccshr;
+
+    @Column(name = "AUDIT_CCSH_", length = 10)
+    @PropertyDef(label = "瀹℃壒鐘舵��")
+    private String auditCcsh;
+
+    @Column(name = "INFO_CCSH_", length = 200)
+    @PropertyDef(label = "瀹℃牳璇存槑")
+    private String InfoCcsh;
+
+    @PropertyDef(label = "璐ㄦ瀹℃牳浜�")
+    @Column(name = "zjshr", length = 64)
+    private String zjshr;
+
+    @Column(name = "AUDIT_ZJSH_", length = 10)
+    @PropertyDef(label = "瀹℃壒鐘舵��")
+    private String auditZjsh;
+
+    @Column(name = "INFO_ZJSH_", length = 200)
+    @PropertyDef(label = "瀹℃牳璇存槑")
+    private String InfoZjsh;
+
+    @PropertyDef(label = "缁熻瀹℃牳浜�")
+    @Column(name = "tjshr", length = 64)
+    private String tjshr;
+
+    @Column(name = "AUDIT_TJSH_", length = 10)
+    @PropertyDef(label = "瀹℃壒鐘舵��")
+    private String auditTjsh;
+
+    @Column(name = "INFO_TJSH_", length = 200)
+    @PropertyDef(label = "瀹℃牳璇存槑")
+    private String InfoTjsh;
+
+    @PropertyDef(label = "浼氳瀹℃牳浜�")
+    @Column(name = "kjshr", length = 64)
+    private String kjshr;
+
+    @Column(name = "AUDIT_KJSH_", length = 10)
+    @PropertyDef(label = "瀹℃壒鐘舵��")
+    private String auditKjsh;
+
+    @Column(name = "INFO_KJSH_", length = 200)
+    @PropertyDef(label = "瀹℃牳璇存槑")
+    private String InfoKjsh;
+
+    @PropertyDef(label = "棰嗗瀹℃牳浜�")
+    @Column(name = "ldshr", length = 64)
+    private String ldshr;
+
+    @Column(name = "AUDIT_LDSH_", length = 10)
+    @PropertyDef(label = "瀹℃壒鐘舵��", description = "鏈�缁堝鏍哥姸鎬佷互棰嗗瀹℃牳涓哄噯")
+    private String auditLdsh;
+
+    @Column(name = "INFO_LDSH_", length = 200)
+    @PropertyDef(label = "瀹℃牳璇存槑")
+    private String InfoLdsh;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏇存柊鏃堕棿")
+    private Date updateTime;
+
+    @Column(name = "REMARK_", length = 200)
+    @PropertyDef(label = "澶囨敞")
+    private String remark;
+
+}
diff --git a/igds-manager/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java b/igds-manager/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
index 2dddc1d..75cf8e3 100644
--- a/igds-manager/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
+++ b/igds-manager/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
@@ -10,15 +10,14 @@
 
 import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
 import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.models.MVarietyChange;
 import com.ld.igds.util.ContextUtil;
 
 @Component
 public class HVarietyChangeService extends HibernateDao {
 
-	public void pageData(Page<MVarietyChange> page, Map<String, Object> param)
+	public void pageData(Page<InoutVarietyChange> page, Map<String, Object> param)
 			throws Exception {
-		String hql = " from " + MVarietyChange.class.getName()
+		String hql = " from " + InoutVarietyChange.class.getName()
 				+ " where companyId=:companyId";
 
 		Map<String, Object> args = new HashMap<String, Object>();
@@ -53,7 +52,7 @@
 
 	}
 
-	public void saveData(MVarietyChange data) {
+	public void saveData(InoutVarietyChange data) {
 		if (null == data.getCompanyId()) {
 			data.setCompanyId(ContextUtil.getCompanyId());
 		}
@@ -78,7 +77,7 @@
 		}
 	}
 
-	public String delData(MVarietyChange data) {
+	public String delData(InoutVarietyChange data) {
 		Session session = this.getSessionFactory().openSession();
 		try {
 			if (null != data.getId()) {
diff --git a/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml b/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
index 7edf747..38d7c30 100644
--- a/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
@@ -4,7 +4,7 @@
   <Context/>
   <Model>
     <DataType name="dtMain">
-      <Property name="creationType">com.ld.igds.models.MVarietyChange</Property>
+      <Property name="creationType">com.ld.igds.models.InoutVarietyChange</Property>
       <PropertyDef name="id">
         <Property></Property>
         <Property name="label">ID</Property>
diff --git a/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChangePR.java b/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChangePR.java
index c2ca02c..a63d90b 100644
--- a/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChangePR.java
+++ b/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChangePR.java
@@ -10,7 +10,6 @@
 import com.bstek.dorado.annotation.Expose;
 import com.bstek.dorado.data.provider.Page;
 import com.ld.igds.m.service.HVarietyChangeService;
-import com.ld.igds.models.MVarietyChange;
 
 /**
  * 缁煎悎涓氬姟-绮鍝佺鍙樻洿璁板綍
@@ -35,7 +34,7 @@
 	 * @throws Exception
 	 */
 	@DataProvider
-	public void pageData(Page<MVarietyChange> page, Map<String, Object> param)
+	public void pageData(Page<InoutVarietyChange> page, Map<String, Object> param)
 			throws Exception {
 		service.pageData(page, param);
 	}
@@ -46,7 +45,7 @@
 	 * @param data
 	 */
 	@DataResolver
-	public void saveData(MVarietyChange data) {
+	public void saveData(InoutVarietyChange data) {
 		service.saveData(data);
 	}
 
@@ -57,7 +56,7 @@
 	 * @return
 	 */
 	@Expose
-	public String delData(MVarietyChange data) {
+	public String delData(InoutVarietyChange data) {
 		return service.delData(data);
 	}
 
diff --git a/igds-manager/src/main/java/com/ld/igds/models/MVarietyChange.java b/igds-manager/src/main/java/com/ld/igds/models/MVarietyChange.java
deleted file mode 100644
index a793ffc..0000000
--- a/igds-manager/src/main/java/com/ld/igds/models/MVarietyChange.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.ld.igds.models;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import com.bstek.dorado.annotation.PropertyDef;
-
-import lombok.Data;
-
-/**
- * 缁煎悎绠＄悊-绮鎬ц川鍙樻洿璁板綍
- * 
- * @author: andy.jia
- * @description:
- * @version:
- * @data:2020骞�5鏈�27鏃�
- *
- */
-@Data
-@Entity
-@Table(name = "D_M_VARIETY_CHANGE")
-public class MVarietyChange implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "涓婚敭")
-	private String id;
-
-	@Column(name = "COMPANY_ID_", length = 10)
-	@PropertyDef(label = "缁勭粐缂栫爜")
-	private String companyId;
-
-	@Column(name = "APPROVAL_ID_", length = 40)
-	@PropertyDef(label = "鎵瑰噯鏂囧彿")
-	private String approvalId;
-
-	@Column(name = "DEPT_ID_", length = 40)
-	@PropertyDef(label = "鎵�灞炲垎搴�")
-	private String deptId;
-
-	@Column(name = "DEPOT_ID_", length = 50)
-	@PropertyDef(label = "鎵�灞炰粨搴�")
-	private String depotId;
-
-	@Column(name = "FOOD_VARIETY_", length = 10)
-	@PropertyDef(label = "鍘熺伯椋熷搧绉�")
-	private String foodVariety;
-
-	@Column(name = "NEW_FOOD_VARIETY_", length = 10)
-	@PropertyDef(label = "鍙樻洿鍚庡搧绉�")
-	private String newFoodVariety;
-
-	@Column(name = "FOOD_TYPE_", length = 10)
-	@PropertyDef(label = "鍘熺伯椋熸�ц川")
-	private String foodType;
-
-	@Column(name = "NEW_FOOD_TYPE_", length = 10)
-	@PropertyDef(label = "鍙樻洿鍚庢�ц川")
-	private String newFoodType;
-
-	@Column(name = "NUMBER_")
-	@PropertyDef(label = "绮鏁伴噺")
-	private Double number = 0.0;
-
-	@Column(name = "CHANGE_NUMBER_")
-	@PropertyDef(label = "鍒掕浆鏁伴噺")
-	private Double changeNumber = 0.0;
-
-	@Column(name = "CHANGE_TIME_")
-	@PropertyDef(label = "鍙樻洿鏃堕棿")
-	private Date changeTime;
-
-	@Column(name = "UPDATE_TIME_")
-	@PropertyDef(label = "鏇存柊鏃堕棿")
-	private Date updateTime;
-
-	@Column(name = "UPDATE_USER_", length = 50)
-	@PropertyDef(label = "鏇存柊浜�")
-	private String updateUser;
-
-	@Column(name = "REMARK_", length = 300)
-	@PropertyDef(label = "澶囨敞")
-	private String remark;
-
-}

--
Gitblit v1.9.3