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-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java       |    8 
 igds-core/src/main/java/com/ld/igds/models/DepotStore.java                           |   42 +
 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java |    8 
 igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java                       |  118 +++--
 igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml                          |    2 
 igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java                       |    8 
 igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java                   |   10 
 igds-inout/src/main/java/com/ld/igds/models/InoutCredit.java                         |   23 
 igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java                  |    8 
 igds-core/src/main/java/com/ld/igds/models/Depot.java                                |   89 +--
 igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java             |   10 
 igds-core/src/main/java/com/ld/igds/models/Granary.java                              |   80 ++++
 igds-core/src/main/java/com/ld/igds/models/InoutRecord.java                          |  234 +++++------
 igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java                 |   14 
 igds-core/src/main/java/com/ld/igds/models/Building.java                             |   31 
 igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarnPR.java                |    2 
 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java         |    6 
 igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java                          |    8 
 igds-inout/src/main/java/com/ld/igds/m/view/CreditPR.java                            |    8 
 /dev/null                                                                            |   77 ---
 igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml                        |    2 
 igds-security/src/main/java/com/ld/igds/sec/service/BlackListWarnService.java        |    1 
 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java         |    6 
 igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java                    |   25 
 igds-doc/sql/update-v35-to-v40.sql                                                   |   11 
 igds-inout/src/main/java/com/ld/igds/models/InoutLossOver.java                       |  187 +++++++++
 igds-core/src/main/java/com/ld/igds/models/MQuality.java                             |    3 
 igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml                     |    2 
 igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java                         |  144 +++---
 29 files changed, 669 insertions(+), 498 deletions(-)

diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java
index f3ec944..879eb26 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java
@@ -5,7 +5,7 @@
 import com.ld.igds.constant.RedisConst;
 import com.ld.igds.log.service.InteStatusLogService;
 import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MStockChange;
+import com.ld.igds.models.InoutStockChange;
 import com.ld.igds.sh.dto.ApiResponse;
 import com.ld.igds.sh.dto.Dto1309;
 import com.ld.igds.sh.param.ApiRequest;
@@ -69,7 +69,7 @@
         redisUtil.set(key, param.getEndTime());
 
         //鏌ヨ鏁版嵁
-        List<MStockChange> dataList = hApiShServiceImpl.listStockChange(companyId, param.getDepotId(), startTime, param.getEndTime());
+        List<InoutStockChange> dataList = hApiShServiceImpl.listStockChange(companyId, param.getDepotId(), startTime, param.getEndTime());
 
         //鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
         if (dataList == null || dataList.isEmpty()) {
@@ -87,7 +87,7 @@
         InteStatusLog log;
         InteStatusLog addLog;
         //灏佽鏁版嵁淇℃伅
-        for (MStockChange data : dataList) {
+        for (InoutStockChange data : dataList) {
             dto = new Dto1309();
             dto.setDcdbm(data.getId());
             dto.setDclx(StringUtils.isEmpty(data.getType())?"0":data.getType());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
index 248247c..2831ee1 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
@@ -4,7 +4,7 @@
 import com.ld.igds.constant.RedisConst;
 import com.ld.igds.log.service.InteStatusLogService;
 import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MLossOver;
+import com.ld.igds.models.InoutLossOver;
 import com.ld.igds.sh.dto.ApiResponse;
 import com.ld.igds.sh.dto.Dto1311;
 import com.ld.igds.sh.param.ApiRequest;
@@ -61,7 +61,7 @@
         redisUtil.set(key, param.getEndTime());
 
         //鏌ヨ鏁版嵁
-        List<MLossOver> dataList = hApiShServiceImpl.listLossOver(companyId,
+        List<InoutLossOver> dataList = hApiShServiceImpl.listLossOver(companyId,
                 param.getDepotId(), startTime, param.getEndTime());
 
         //鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
@@ -74,7 +74,7 @@
         InteStatusLog log;
         InteStatusLog addLog;
         //灏佽鏁版嵁淇℃伅
-        for (MLossOver data : dataList) {
+        for (InoutLossOver data : dataList) {
             dto1311 = new Dto1311();
             dto1311.setSydbh(data.getId());
             dto1311.setHwbm(data.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 036d218..6522c87 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
@@ -434,8 +434,8 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<MStockChange> listStockChange(String companyId, String depotId, Date startTime, Date endTime) {
-		String hql = " from " + MStockChange.class.getName() + " where companyId =:companyId";
+	public List<InoutStockChange> listStockChange(String companyId, String depotId, Date startTime, Date endTime) {
+		String hql = " from " + InoutStockChange.class.getName() + " where companyId =:companyId";
 
 		Map<String, Object> args = new HashMap<String, Object>();
 		args.put("companyId", companyId);
@@ -467,8 +467,8 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<MLossOver> listLossOver(String companyId, String depotId, Date startTime, Date endTime) {
-		String hql = " from " + MLossOver.class.getName() + " where companyId =:companyId";
+	public List<InoutLossOver> listLossOver(String companyId, String depotId, Date startTime, Date endTime) {
+		String hql = " from " + InoutLossOver.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 0c7baa4..d24927e 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
@@ -298,8 +298,8 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<MStockChange> listStockChange(String companyId, String depotId, Date startTime, Date endTime) {
-		String hql = " from " + MStockChange.class.getName() + " where companyId =:companyId";
+	public List<InoutStockChange> listStockChange(String companyId, String depotId, Date startTime, Date endTime) {
+		String hql = " from " + InoutStockChange.class.getName() + " where companyId =:companyId";
 
 		Map<String, Object> args = new HashMap<String, Object>();
 		args.put("companyId", companyId);
@@ -331,8 +331,8 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<MLossOver> listLossOver(String companyId, String depotId, Date startTime, Date endTime) {
-		String hql = " from " + MLossOver.class.getName() + " where companyId =:companyId";
+	public List<InoutLossOver> listLossOver(String companyId, String depotId, Date startTime, Date endTime) {
+		String hql = " from " + InoutLossOver.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/BlackListWarnInfo.java b/igds-core/src/main/java/com/ld/igds/models/BlackListWarnInfo.java
deleted file mode 100644
index 17953fd..0000000
--- a/igds-core/src/main/java/com/ld/igds/models/BlackListWarnInfo.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.ld.igds.models;
-
-import com.bstek.dorado.annotation.PropertyDef;
-import com.ld.igds.constant.WarnStatus;
-import lombok.Data;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 瀹夐槻妯″潡-鎶ヨ绠＄悊
- * 榛戝悕鍗曞憡璀﹀垪琛�
- * @author: he
- */
-@Data
-@Entity
-@Table(name = "D_BLACK_LIST_WARN_INFO")
-public class BlackListWarnInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @Column(name = "ID_", length = 40)
-    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 = "SER_ID_", length = 40)
-    @PropertyDef(label = "璁惧缂栫爜")
-    private String serId;
-
-    @Column(name = "NAME_", length = 50)
-    @PropertyDef(label = "璀﹀憡鍚嶇О")
-    private String name;
-
-    @Column(name = "BIZ_TYPE_", length = 15)
-    @PropertyDef(label = "涓氬姟绫诲瀷")
-    private String bizType;
-
-    @Column(name = "TYPE_", length = 5)
-    @PropertyDef(label = "璀﹀憡绫诲瀷")
-    private String type;
-
-    @PropertyDef(label = "璀﹀憡绾у埆")
-    @Column(name = "LEVEL_", length = 5)
-    private String level;
-
-    @Column(name = "STATUS_", length = 5)
-    @PropertyDef(label = "璀︽姤鐘舵��")
-    private String status = WarnStatus.STATUS_10.getCode();
-
-    @Column(name = "INFO_", length = 300)
-    @PropertyDef(label = "璀﹀憡鍐呭")
-    private String info;
-
-    @Column(name = "TIME_")
-    @PropertyDef(label = "璀﹀憡鏃堕棿")
-    private Date time;
-
-    @Column(name = "NOTICE_RESULT_", length = 20)
-    @PropertyDef(label = "閫氱煡缁撴灉")
-    private String noticeResult = "涓嶆帹閫�";
-
-    @Column(name = "NOTICE_USER_", length = 200)
-    @PropertyDef(label = "閫氱煡浜�", description = "澶氫汉鐢ㄩ�楀彿闅斿紑")
-    private String noticeUser;
-
-    @Column(name = "COMPLETE_USER_", length = 30)
-    @PropertyDef(label = "澶勭悊浜�", description = "涓枃鍚嶇О")
-    private String completeUser;
-
-    @Column(name = "COMPLETE_TIME_")
-    @PropertyDef(label = "澶勭悊鏃堕棿")
-    private Date completeTime;
-
-    @Column(name = "REMARK_", length = 200)
-    @PropertyDef(label = "澶勭悊璇存槑")
-    private String remark;
-
-    @Column(name = "PER_NAME_", length = 30)
-    @PropertyDef(label = "浜哄憳鍚嶇О", description = "涓枃鍚嶇О")
-    private String perName;
-
-    @Column(name = "PLATE_NUM_", length = 30)
-    @PropertyDef(label = "杞︾墝鍙�", description = "涓枃鍚嶇О")
-    private String plateNum;
-
-    @Transient
-    private List<FileInfo> files;
-}
diff --git a/igds-core/src/main/java/com/ld/igds/models/Building.java b/igds-core/src/main/java/com/ld/igds/models/Building.java
index 61e0d46..a46af0b 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Building.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Building.java
@@ -2,6 +2,7 @@
 
 import com.bstek.dorado.annotation.PropertyDef;
 import lombok.Data;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -11,11 +12,9 @@
 import java.util.Date;
 
 /**
- * 寤虹瓚鐗╋紝鍖呮嫭浠撴埧鍜屽叾浠栨埧瀛�
- * <p>
- * 浠撳簱鐨勬晼闂翠娇鐢ㄧ殑鏄細Depot绫伙紝涓�涓粨鎴垮缓绛戝彲鑳藉寘鍚涓晼闂淬��
- * <p>
- * 褰撳墠瀹氫箟瀵硅薄浠呬粎鐢ㄤ簬寤虹瓚鐗╃殑鏁版嵁閰嶇疆
+ * @Desc: 鍩虹淇℃伅-浠撴埧淇℃伅
+ * @author: Andy
+ * @update-time: 2023/5/26
  */
 @Data
 @Entity
@@ -23,11 +22,11 @@
 public class Building implements Serializable {
 
     /**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+     *
+     */
+    private static final long serialVersionUID = 1L;
 
-	@Id
+    @Id
     @Column(name = "ID_", length = 50)
     @PropertyDef(label = "浠撴埧缂栫爜")
     private String id;
@@ -96,12 +95,12 @@
     @Column(name = "CREATE_DATE_")
     @PropertyDef(label = "寤洪�犳棩鏈�")
     private Date createDate;
-    
-	@Column(name = "LON_", precision = 16, scale = 4)
-	@PropertyDef(label = "缁忓害")
-	private Double lon;
 
-	@Column(name = "LAT_", precision = 16, scale = 4)
-	@PropertyDef(label = "绾害")
-	private Double lat;
+    @Column(name = "LON_", precision = 16, scale = 4)
+    @PropertyDef(label = "缁忓害")
+    private Double lon;
+
+    @Column(name = "LAT_", precision = 16, scale = 4)
+    @PropertyDef(label = "绾害")
+    private Double lat;
 }
diff --git a/igds-core/src/main/java/com/ld/igds/models/Depot.java b/igds-core/src/main/java/com/ld/igds/models/Depot.java
index cf12217..749e422 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Depot.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Depot.java
@@ -10,14 +10,12 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
+
 
 /**
- * 浠撴埧鏁栭棿-涓庝粨鎴垮缓绛戜笉涓�鏍凤紝鍙綔涓哄叿浣撲粨搴撲娇鐢紝绯荤粺涓粨搴撶殑鏈�灏忓崟浣嶅畾涔�
- *
- * @author Andy
- * <p>
- * 鐗堟湰鍗囩骇璁板綍锛� 1锛岃皟鏁村瓧娈电粨鏋勶紝鍒犻櫎閰嶇疆绫诲瀷瀛楁
+ * @Desc: 鍩虹淇℃伅-璐т綅淇℃伅
+ * @author: Andy
+ * @update-time: 2023/5/26
  */
 @Data
 @Entity
@@ -29,12 +27,12 @@
      */
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @Column(name = "ID_", length = 50)
-    @PropertyDef(label = "浠撳簱缂栧彿")
-    private String id;
 
     @Id
+    @Column(name = "ID_", length = 50)
+    @PropertyDef(label = "璐т綅缂栧彿")
+    private String id;
+
     @Column(name = "COMPANY_ID_", length = 10)
     @PropertyDef(label = "缁勭粐缂栫爜")
     private String companyId;
@@ -44,64 +42,64 @@
     private String deptId;
 
     @Column(name = "NAME_", length = 50)
-    @PropertyDef(label = "浠撳簱鍚嶇О")
+    @PropertyDef(label = "璐т綅鍚嶇О")
     private String name;
 
-    @Column(name = "BUILDING_ID_", length = 50)
-    @PropertyDef(label = "鎵�灞炰粨鎴垮缓绛�")
+    @Column(name = "BUILDING_ID_", length = 40)
+    @PropertyDef(label = "鎵�灞炰粨鎴�")
     private String buildingId;
 
+    @Column(name = "GRANARY_ID_", length = 40)
+    @PropertyDef(label = "鎵�灞炲粧闂�")
+    private String granaryId;
+
     @Column(name = "DEPOT_TYPE_", length = 10)
-    @PropertyDef(label = "浠撳簱绫诲瀷", description = "鏅�氬钩鎴夸粨")
+    @PropertyDef(label = "浠撳簱绫诲瀷", description = "鏍规嵁鍥芥爣閰嶇疆绫诲瀷锛屽钩鎴夸粨銆佺珛绛掍粨銆佹祬鍦嗕粨銆佸偍娌圭綈")
     private String depotType;
 
     @Column(name = "DEPOT_STATUS_", length = 10)
-    @PropertyDef(label = "浠撳簱鐘舵��", description = "")
+    @PropertyDef(label = "浠撳簱鐘舵��", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
     private String depotStatus;
 
     @Column(name = "STORE_TYPE_", length = 6)
-    @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "1:鏁ｈ鍌ㄧ伯 2:鍖呰鍌ㄧ伯 3:鍥村寘鏁ｅ瓨 9:鍏朵粬")
+    @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "涓庡簱瀛樿〃鍏宠仈")
     private String storeType;
 
     @Column(name = "STORAGE_MAX_")
-    @PropertyDef(label = "璁捐鍌ㄩ噺", description = "鍗曚綅锛欿G")
+    @PropertyDef(label = "璁捐鍌ㄩ噺", description = "鍗曚綅锛氬惃")
     private Double storageMax;
 
-    /**
-     * 瀹為檯鍌ㄩ噺闇�瑕佺嫭绔嬪幓淇敼
-     */
     @Column(name = "STORAGE_REAL_", insertable = true)
-    @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G")
+    @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G锛岄�氳繃搴撳瓨鍙樻洿")
     private Double storageReal;
 
-    @Column(name = "ORIENTATION_", length = 10)
-    @PropertyDef(label = "鏈濆悜", description = "涓溿�佸崡銆佽タ銆佸寳")
-    private String orientation;
-
     @Column(name = "FOOD_TYPE_", length = 10)
-    @PropertyDef(label = "绮鎬ц川")
+    @PropertyDef(label = "绮鎬ц川", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
     private String foodType;
 
     @Column(name = "FOOD_VARIETY_", length = 10)
-    @PropertyDef(label = "绮鍝佺")
+    @PropertyDef(label = "绮鍝佺", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
     private String foodVariety;
 
     @Column(name = "FOOD_LEVEL_", length = 10)
-    @PropertyDef(label = "绮绛夌骇")
+    @PropertyDef(label = "绮绛夌骇", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
     private String foodLevel;
 
-    @Column(name = "FOOD_LOCATION_", length = 200)
-    @PropertyDef(label = "绮浜у湴")
+    @Column(name = "FOOD_LOCATION_", length = 50)
+    @PropertyDef(label = "绮浜у湴", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
     private String foodLocation;
 
-    // -----浠ヤ笅涓虹伯椋熻川閲忎俊鎭� ------//
+    @Column(name = "FOOD_YEAR_", length = 10)
+    @PropertyDef(label = "绮骞翠唤", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+    private String foodYear;
+
 
     @Column(name = "PER_WET_")
-    @PropertyDef(label = "姘村垎", description = "鐧惧垎姣�")
+    @PropertyDef(label = "姘村垎", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
     private Double perWet;
 
     @Column(name = "PER_IMPURITY_")
-    @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣�")
+    @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
     private Double perImpurity;
 
     @Column(name = "BULK_WEIGHT_")
@@ -117,28 +115,19 @@
     private String storeKeeperName;
 
     @Column(name = "CHECK_DATE_")
-    @PropertyDef(label = "妫�娴嬫椂闂�", description = "鏈�鍚庤川妫�鏃堕棿")
+    @PropertyDef(label = "鏈�鍚庤川妫�鏃堕棿", description = "榛樿绌猴紝鏉ユ簮璐ㄦ淇℃伅")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date checkDate;
 
-    @Column(name = "STORE_DATE_")
-    @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "鍏ュ簱鏃堕棿")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date storeDate;
-
-    @Column(name = "FOOD_YEAR_", length = 10)
-    @PropertyDef(label = "绮骞翠唤")
-    private String foodYear;
-
-    @Column(name = "REMARK_", length = 250)
+    @Column(name = "REMARK_", length = 200)
     @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
     private String remark;
 
-    // ------------鍏朵粬灞炴�т俊鎭�------------//
-    @Transient
-    @PropertyDef(label = "褰撳墠鍙傝�冧笅璁惧淇℃伅")
-    private List<Device> devices;
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
 
+    // ------------鍏朵粬灞炴�т俊鎭�------------//
     @Transient
     @PropertyDef(label = "绮鍝佺")
     private String foodVarietyName;
@@ -166,10 +155,6 @@
     @Transient
     @PropertyDef(label = "Y鍧愭爣", description = "涓夌淮妯″瀷涓潗鏍囷紝椤甸潰鏃犻渶缁存姢")
     private Double posY;
-
-    @Transient
-    @PropertyDef(label = "淇敼鏍囩")
-    private String editTag;
 
 
     public String getFoodLevelName() {
diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotStore.java b/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
index 7845f41..f8e0650 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
@@ -35,7 +35,7 @@
     @PropertyDef(label = "缁勭粐缂栫爜")
     private String companyId;
 
-    @Column(name = "DEPT_ID_", length = 20)
+    @Column(name = "DEPT_ID_", length = 40)
     @PropertyDef(label = "鎵�灞炲簱鍖�")
     private String deptId;
 
@@ -43,9 +43,17 @@
     @PropertyDef(label = "鎵�灞炰粨搴�")
     private String depotId;
 
+    @Column(name = "COUNTRY_", length = 10)
+    @PropertyDef(label = "鍥藉埆")
+    private String country;
+
     @Column(name = "STORE_TYPE_", length = 6)
     @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "1:鏁ｈ鍌ㄧ伯 2:鍖呰鍌ㄧ伯 3:鍥村寘鏁ｅ瓨 9:鍏朵粬")
     private String storeType;
+
+    @Column(name = "MANAGE_TYPE_", length = 6)
+    @PropertyDef(label = "绠＄悊鏂瑰紡", description = "01 鐩村偍02 浠ｅ偍03 绉熶粨04 濮旀墭")
+    private String manageType;
 
     @Column(name = "FOOD_TYPE_", length = 10)
     @PropertyDef(label = "绮鎬ц川")
@@ -59,33 +67,41 @@
     @PropertyDef(label = "绮绛夌骇")
     private String foodLevel;
 
+    @Column(name = "FOOD_LOCATION_ID_", length = 50)
+    @PropertyDef(label = "绮浜у湴")
+    private String foodLocationId;
+
     @Column(name = "FOOD_LOCATION_", length = 50)
     @PropertyDef(label = "绮浜у湴")
     private String foodLocation;
-
-    @Column(name = "DEPOT_STATUS_", length = 10)
-    @PropertyDef(label = "浠撳簱鐘舵��")
-    private String depotStatus;
 
     @Column(name = "FOOD_YEAR_", length = 10)
     @PropertyDef(label = "鏀惰揣骞村害")
     private String foodYear;
 
+    @Column(name = "DEPOT_STATUS_", length = 10)
+    @PropertyDef(label = "浠撳簱鐘舵��", description = "1=绌轰粨銆�2=鍏ュ簱涓��3=婊′粨銆�4=鍑哄簱涓��9=鍏朵粬")
+    private String depotStatus;
+
     @Column(name = "STORE_DATE_")
     @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "鍏ュ簱鏃堕棿锛岀涓�杞︾伯椋熷叆浠撴椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
     private Date storeDate;
-
-    @Column(name = "STORAGE_REAL_")
-    @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G")
-    private Double storageReal;
 
     @Column(name = "FULL_DATE_")
     @PropertyDef(label = "灏佷粨鏃ユ湡", description = "褰撹揣浣嶏紙娌圭綈锛夌姸鎬佷负灏佷粨鏃讹紝姝ら」涓哄繀濉」")
     private Date fullDate;
 
     @Column(name = "OUT_DATE_")
-    @PropertyDef(label = "鍑轰粨鏃堕棿", description = "鍏ュ簱鏃堕棿锛岀涓�杞︾伯椋熷嚭浠撴椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+    @PropertyDef(label = "鍑轰粨鏃堕棿", description = "鍑哄簱鏃堕棿锛屾渶鍚庝竴杞︾伯椋熷嚭浠撳畬鎴愭椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
     private Date outDate;
+
+    @Column(name = "STORAGE_REAL_")
+    @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G")
+    private Double storageReal;
+
+    @Column(name = "STORE_SETTLE__")
+    @PropertyDef(label = "璁′环鏁伴噺", description = "鍗曚綅锛欿G")
+    private Double storageSettle;
 
     @Column(name = "GRAIN_HEIGHT_")
     @PropertyDef(label = "瑁呯伯绾块珮", description = "鍗曚綅锛氱背")
@@ -106,10 +122,6 @@
     @Column(name = "UPDATE_DATE_")
     @PropertyDef(label = "淇敼鏃堕棿")
     private Date updateDate;
-
-    @Column(name = "CREATE_DATE_")
-    @PropertyDef(label = "鍒涘缓鏃堕棿")
-    private Date createDate;
 
     public DepotStore() {
     }
@@ -135,7 +147,6 @@
         this.remark = remark;
         this.updateUser = updateUser;
         this.updateDate = updateDate;
-        this.createDate = createDate;
     }
 
     public DepotStore(Depot depot, String depotStatus) {
@@ -152,6 +163,5 @@
         this.storageReal = depot.getStorageReal();
         this.storeDate = new Date();
         this.updateDate = new Date();
-        this.createDate = new Date();
     }
 }
diff --git a/igds-core/src/main/java/com/ld/igds/models/Granary.java b/igds-core/src/main/java/com/ld/igds/models/Granary.java
new file mode 100644
index 0000000..af3f210
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/Granary.java
@@ -0,0 +1,80 @@
+package com.ld.igds.models;
+
+import com.alibaba.fastjson.annotation.JSONField;
+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_GRANARY")
+public class Granary implements Serializable {
+
+    private static final long serialVersionUID = 9157617424050247565L;
+
+    @Id
+    @PropertyDef(label = "寤掗棿浠ｇ爜")
+    @Column(name = "ajdh", length = 28)
+    private String ajdh;
+
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
+
+    @Column(name = "DEPT_ID_", length = 40)
+    @PropertyDef(label = "鎵�灞炲垎搴�")
+    private String deptId;
+
+    @PropertyDef(label = "寤掗棿鍚嶇О")
+    @Column(name = "ajmc", length = 100)
+    private String ajmc;
+
+    @PropertyDef(label = "浠撴埧(鎴栨补缃�)缂栫爜")
+    @Column(name = "cfbh", length = 25)
+    private String cfbh;
+
+    @PropertyDef(label = "寤掗棿闀垮害")
+    @Column(name = "ajcd", precision = 8, scale = 4)
+    private double ajcd;
+
+    @PropertyDef(label = "寤掗棿瀹藉害")
+    @Column(name = "ajkd", precision = 8, scale = 4)
+    private double ajkd;
+
+    @PropertyDef(label = "寤掗棿楂樺害")
+    @Column(name = "ajgd", precision = 8, scale = 4)
+    private double ajgd;
+
+    @PropertyDef(label = "寤掗棿璁捐浠撳")
+    @Column(name = "ajsjcr", precision = 20, scale = 3)
+    private double ajsjcr;
+
+    @PropertyDef(label = "寤掗棿鑱旂郴鐢佃瘽")
+    @Column(name = "ajlxdh", length = 20)
+    private String ajlxdh;
+
+    @JSONField(format = "yyyy-MM-dd")
+    @PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
+    @Column(name = "ajqyrq")
+    private Date ajqyrq;
+
+    @PropertyDef(label = "寤掗棿鐘舵��")
+    @Column(name = "ajzt", length = 1)
+    private String ajzt;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
+
+}
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 + "]";
-    }
 }
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 47a3f4f..62e08a3 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
@@ -138,13 +138,12 @@
     @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 5d15af6..49d48fa 100644
--- a/igds-doc/sql/update-v35-to-v40.sql
+++ b/igds-doc/sql/update-v35-to-v40.sql
@@ -14,4 +14,13 @@
 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
+UPDATE D_M_QUALITY SET STANDARD_ = '0', WHERE STANDARD_ ='02';
+
+-- 鎹熸孩琛�
+RENAME TABLE D_M_LOSS_OVER TO D_INOUT_LOSS_OVER;
+
+-- 鍊掍粨
+RENAME TABLE D_M_STOCK_CHANGE TO D_INOUT_STOCK_CHANGE;
+
+--瀹㈡埛淇＄敤
+RENAME TABLE D_CREDIT TO D_INTOU_CREDIT;
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java
index 7c130b3..b41fa21 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java
@@ -1,7 +1,7 @@
 package com.ld.igds.m.service;
 
 import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
-import com.ld.igds.models.Credit;
+import com.ld.igds.models.InoutCredit;
 import com.ld.igds.util.ContextUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Session;
@@ -17,8 +17,8 @@
 @Component
 public class HCreditService extends HibernateDao {
 
-	public List<Credit> listCredit(Map<String, Object> param) {
-		String hql = " from " + Credit.class.getName() + " where companyId=:companyId and deptId =:deptId ";
+	public List<InoutCredit> listCredit(Map<String, Object> param) {
+		String hql = " from " + InoutCredit.class.getName() + " where companyId=:companyId and deptId =:deptId ";
 
 		Map<String, Object> args = new HashMap<String, Object>();
 		args.put("companyId", ContextUtil.getCompanyId());
@@ -42,7 +42,7 @@
 		return this.query(hql,args);
 	}
 
-	public String saveCredit(Credit data) {
+	public String saveCredit(InoutCredit data) {
 		Session session = this.getSessionFactory().openSession();
 		try {
 			if(StringUtils.isEmpty(data.getCompanyId())){
@@ -62,7 +62,7 @@
 		return null;
 	}
 
-	public String delCredit(Credit data) {
+	public String delCredit(InoutCredit data) {
 		Session session = this.getSessionFactory().openSession();
 		try {
 			if(null == data.getCompanyId()) data.setCompanyId(ContextUtil.getCompanyId());
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
index ca72905..c12d3b6 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
@@ -8,6 +8,7 @@
 import com.ld.igds.inout.dto.InoutData;
 import com.ld.igds.inout.dto.InoutParam;
 import com.ld.igds.inout.service.InoutService;
+import com.ld.igds.models.InoutLossOver;
 import com.ld.igds.util.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -18,7 +19,6 @@
 import com.bstek.bdf2.core.business.IUser;
 import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
 import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.models.MLossOver;
 import com.ld.igds.util.ContextUtil;
 
 @Component
@@ -27,9 +27,9 @@
     @Autowired
     private InoutService inoutService;
 
-    public void pageData(Page<MLossOver> page, Map<String, Object> param)
+    public void pageData(Page<InoutLossOver> page, Map<String, Object> param)
             throws Exception {
-        String hql = " from " + MLossOver.class.getName()
+        String hql = " from " + InoutLossOver.class.getName()
                 + " where companyId=:companyId";
 
         Map<String, Object> args = new HashMap<String, Object>();
@@ -71,7 +71,7 @@
     }
 
     @Transactional(rollbackOn = Exception.class)
-    public void saveData(MLossOver data) throws Exception {
+    public void saveData(InoutLossOver data) throws Exception {
         Session session = this.getSessionFactory().openSession();
         data.setUpdateTime(new Date());
         data.setUpdateUser(ContextUtil.getLoginUserCName());
@@ -116,7 +116,7 @@
         }
     }
 
-    private String addInoutDataByLossOver(MLossOver lossOver){
+    private String addInoutDataByLossOver(InoutLossOver lossOver){
     	if (null == lossOver.getSubmitTime()) {
 			lossOver.setSubmitTime(new Date());
 		}
@@ -150,7 +150,7 @@
 	}
 
 	@Transactional(rollbackOn = Exception.class)
-    public String delData(MLossOver data) throws Exception {
+    public String delData(InoutLossOver data) throws Exception {
         Session session = this.getSessionFactory().openSession();
         try {
             if (null != data.getId()) {
@@ -166,7 +166,7 @@
         return null;
     }
 
-	private void delInoutDataByLossOver(MLossOver lossOver) {
+	private void delInoutDataByLossOver(InoutLossOver lossOver) {
 		InoutParam param = new InoutParam();
 		param.setCompanyId(lossOver.getCompanyId());
 		param.setId(lossOver.getId());
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
index 62c12a4..e24e7c7 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
@@ -2,7 +2,7 @@
 
 import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
 import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.models.MStockChange;
+import com.ld.igds.models.InoutStockChange;
 import com.ld.igds.util.ContextUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Session;
@@ -13,9 +13,9 @@
 
 @Service
 public class HMAtockChangeService extends HibernateDao {
-    public void pageData(Page<MStockChange> page, Map<String, Object> param)
+    public void pageData(Page<InoutStockChange> page, Map<String, Object> param)
             throws Exception {
-        String hql = " from " + MStockChange.class.getName()
+        String hql = " from " + InoutStockChange.class.getName()
                 + " where companyId=:companyId";
 
         Map<String, Object> args = new HashMap<String, Object>();
@@ -36,7 +36,7 @@
 
     }
 
-    public void saveData(MStockChange data) {
+    public void saveData(InoutStockChange data) {
         if (null == data.getCompanyId()) {
             data.setCompanyId(ContextUtil.getCompanyId());
         }
@@ -60,7 +60,7 @@
             session.close();
         }
     }
-    public String delData(MStockChange data) {
+    public String delData(InoutStockChange data) {
         Session session = this.getSessionFactory().openSession();
         try {
             if (null != data.getId()) {
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml
index 839f4aa..95bd3f6 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml
@@ -4,7 +4,7 @@
   <Context/>
   <Model>
     <DataType name="dtMain">
-      <Property name="creationType">com.ld.igds.models.Credit</Property>
+      <Property name="creationType">com.ld.igds.models.InoutCredit</Property>
       <PropertyDef name="id">
         <Property></Property>
         <Property name="label">涓婚敭id</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/CreditPR.java b/igds-inout/src/main/java/com/ld/igds/m/view/CreditPR.java
index 4782c5e..61fd5e7 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/CreditPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/CreditPR.java
@@ -4,7 +4,7 @@
 import com.bstek.dorado.annotation.DataResolver;
 import com.bstek.dorado.annotation.Expose;
 import com.ld.igds.m.service.HCreditService;
-import com.ld.igds.models.Credit;
+import com.ld.igds.models.InoutCredit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.List;
@@ -28,7 +28,7 @@
 	 * @return
 	 */
 	@DataProvider
-	public List<Credit> listCredit(Map<String, Object> param) {
+	public List<InoutCredit> listCredit(Map<String, Object> param) {
 		return creditService.listCredit(param);
 	}
 
@@ -39,7 +39,7 @@
 	 * @return
 	 */
 	@DataResolver
-	public String saveCredit(Credit data) {
+	public String saveCredit(InoutCredit data) {
 		return creditService.saveCredit(data);
 	}
 
@@ -50,7 +50,7 @@
 	 * @return
 	 */
 	@Expose
-	public String delCredit(Credit data) {
+	public String delCredit(InoutCredit data) {
 		return creditService.delCredit(data);
 	}
 }
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
index 2c46e4c..ade63a5 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
@@ -7,7 +7,7 @@
       <ClientEvent name="onDataChange">if(arg.property ==&quot;depotId&quot;){&#xD;
 	autoByDepot(arg.newValue);&#xD;
 }</ClientEvent>
-      <Property name="creationType">com.ld.igds.models.MLossOver</Property>
+      <Property name="creationType">com.ld.igds.models.InoutLossOver</Property>
       <PropertyDef name="id">
         <Property></Property>
         <Property name="label">ID</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java b/igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java
index 42a1755..43022de 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import com.ld.igds.models.InoutLossOver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -10,7 +11,6 @@
 import com.bstek.dorado.annotation.Expose;
 import com.bstek.dorado.data.provider.Page;
 import com.ld.igds.m.service.HLossOverService;
-import com.ld.igds.models.MLossOver;
 
 /**
  * 缁煎悎涓氬姟-鎹熸孩绠＄悊
@@ -36,7 +36,7 @@
 	 * @throws Exception
 	 */
 	@DataProvider
-	public void pageData(Page<MLossOver> page, Map<String, Object> param)
+	public void pageData(Page<InoutLossOver> page, Map<String, Object> param)
 			throws Exception {
 		service.pageData(page, param);
 	}
@@ -48,7 +48,7 @@
 	 * @throws Exception 
 	 */
 	@DataResolver
-	public void saveData(MLossOver data) throws Exception {
+	public void saveData(InoutLossOver data) throws Exception {
 		service.saveData(data);
 	}
 
@@ -60,7 +60,7 @@
 	 * @throws Exception 
 	 */
 	@Expose
-	public String delData(MLossOver data) throws Exception {
+	public String delData(InoutLossOver data) throws Exception {
 		return service.delData(data);
 	}
 
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
index 9e06ed7..71dc161 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
@@ -4,7 +4,7 @@
   <Context/>
   <Model>
     <DataType name="dtMain">
-      <Property name="creationType">com.ld.igds.models.MStockChange</Property>
+      <Property name="creationType">com.ld.igds.models.InoutStockChange</Property>
       <PropertyDef name="id">
         <Property></Property>
         <Property name="label">ID</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
index 52131da..71c45c9 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
@@ -6,7 +6,7 @@
 import com.bstek.dorado.data.provider.Page;
 import com.ld.igds.m.service.HMAtockChangeService;
 import com.ld.igds.models.DicTrigger;
-import com.ld.igds.models.MStockChange;
+import com.ld.igds.models.InoutStockChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -54,7 +54,7 @@
 	 * @throws Exception
 	 */
 	@DataProvider
-	public void pageData(Page<MStockChange> page, Map<String, Object> param)
+	public void pageData(Page<InoutStockChange> page, Map<String, Object> param)
 			throws Exception {
 		service.pageData(page, param);
 	}
@@ -65,7 +65,7 @@
 	 * @param data
 	 */
 	@DataResolver
-	public void saveData(MStockChange data) {
+	public void saveData(InoutStockChange data) {
 		service.saveData(data);
 	}
 
@@ -76,7 +76,7 @@
 	 * @return
 	 */
 	@Expose
-	public String delData(MStockChange data) {
+	public String delData(InoutStockChange data) {
 		return service.delData(data);
 	}
 
diff --git a/igds-inout/src/main/java/com/ld/igds/models/Credit.java b/igds-inout/src/main/java/com/ld/igds/models/InoutCredit.java
similarity index 67%
rename from igds-inout/src/main/java/com/ld/igds/models/Credit.java
rename to igds-inout/src/main/java/com/ld/igds/models/InoutCredit.java
index cf2189d..9ba26d4 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/Credit.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutCredit.java
@@ -2,6 +2,7 @@
 
 import com.bstek.dorado.annotation.PropertyDef;
 import lombok.Data;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -10,16 +11,17 @@
 import java.util.Date;
 
 /**
- * 浼佷笟淇＄敤璁板綍
+ * 浼佷笟淇＄敤璁板綍 锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲
+ *
  * @author czt
  * @date 2023-04-10 11:00
  */
 @Data
 @Entity
-@Table(name = "D_CREDIT")
-public class Credit implements Serializable {
+@Table(name = "D_INTOU_CREDIT")
+public class InoutCredit implements Serializable {
 
-	private static final long serialVersionUID = 4416097604510905407L;
+    private static final long serialVersionUID = 4416097604510905407L;
 
     @Id
     @Column(name = "ID_", length = 40)
@@ -38,22 +40,23 @@
     @PropertyDef(label = "瀹㈡埛鍗曚綅缂栫爜")
     private String customerId;
 
-    @Column(name = "CUSTOMER_NAME_", length = 40)
+    @Column(name = "CUSTOMER_NAME_", length = 50)
     @PropertyDef(label = "瀹㈡埛鍗曚綅鍚嶇О")
     private String customerName;
 
-    @PropertyDef(label = "淇＄敤绛夌骇" )
+    @PropertyDef(label = "淇＄敤绛夌骇")
     @Column(name = "xydj", length = 6)
     private String xydj;
 
-    @PropertyDef(label = "璇勫畾骞翠唤" )
+    @PropertyDef(label = "璇勫畾骞翠唤")
     @Column(name = "pdnf", length = 4)
     private String pdnf;
 
-    @PropertyDef(label = "璇勫畾鍗曚綅/鏈烘瀯鍚嶇О" )
+    @PropertyDef(label = "璇勫畾鍗曚綅/鏈烘瀯鍚嶇О")
     @Column(name = "pddw", length = 64)
     private String pddw;
 
-    @Column(name = "zhgxsj")
-    private Date zhgxsj;
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
 }
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java b/igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java
index 630579b..239a0bf 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java
@@ -2,12 +2,14 @@
 
 import java.io.Serializable;
 import java.util.Date;
+
 import com.bstek.dorado.annotation.PropertyDef;
 import lombok.Data;
+
 import javax.persistence.*;
 
 /**
- * 鍑哄叆搴撳鎴�-寰�鏉ュ崟浣嶄俊鎭�
+ * 鍑哄叆搴撳鎴�-寰�鏉ュ崟浣嶄俊鎭� 2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲
  *
  * @author czt
  * @description 鐗堟湰4.0瀛楁宸插
@@ -16,81 +18,81 @@
 @Data
 @Entity
 @Table(name = "D_INOUT_CUSTOMER")
-public class InoutCustomer  implements Serializable{
+public class InoutCustomer implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "涓婚敭id缂栫爜", description = "绯荤粺鍐呯紪鐮�")
-	private String id;
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "涓婚敭id缂栫爜", description = "绯荤粺鍐呯紪鐮�")
+    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 = "TYPE_", length = 4)
-	@PropertyDef(label = "瀹㈡埛鍒嗙被", description = "绯荤粺鍐呬娇鐢細鎻愯揣鍟嗐�佷緵璐у晢")
-	private String type;
+    @Column(name = "TYPE_", length = 4)
+    @PropertyDef(label = "涓氬姟鍒嗙被", description = "绯荤粺鍐呬娇鐢細鎻愯揣鍟嗐�佷緵璐у晢")
+    private String type;
 
-	@Column(name = "khlx", length = 50)
-	@PropertyDef(label = "鍗曚綅绫诲瀷", description = "1-浼佷笟锛�2-涓汉")
-	private String khlx;
+    @Column(name = "khlx", length = 50)
+    @PropertyDef(label = "瀹㈡埛绫诲瀷", description = "1-浼佷笟锛�2-涓汉")
+    private String khlx;
 
-	@PropertyDef(label = "瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜鎴栬韩浠借瘉鍙�" )
-	@Column(name = "khtyshxydmhsfzh", length = 18)
-	private String khtyshxydmhsfzh;
+    @PropertyDef(label = "瀹㈡埛缂栫爜锛氫紒涓氬鎴峰～鍐欑粺涓�绀句細淇＄敤浠ｇ爜锛屼釜浜哄鎴峰～鍐欒韩浠借瘉鍙�")
+    @Column(name = "khbh", length = 18)
+    private String khbh;
 
-	@Column(name = "NAME_", length = 50)
-	@PropertyDef(label = "瀹㈡埛鍚嶇О")
-	private String name;
+    @Column(name = "NAME_", length = 50)
+    @PropertyDef(label = "瀹㈡埛鍚嶇О")
+    private String name;
 
-	@PropertyDef(label = "娉曞畾浠ｈ〃浜�" )
-	@Column(name = "fddbr", length = 64)
-	private String fddbr;
+    @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
+    @Column(name = "fddbr", length = 64)
+    private String fddbr;
 
-	@Column(name = "ADDRESS_", length = 200)
-	@PropertyDef(label = "閫氳鍦板潃")
-	private String address;
+    @Column(name = "ADDRESS_", length = 200)
+    @PropertyDef(label = "閫氳鍦板潃")
+    private String address;
 
-	@PropertyDef(label = "閭斂缂栫爜" )
-	@Column(name = "yzbm", length = 6)
-	private String yzbm;
+    @PropertyDef(label = "閭斂缂栫爜")
+    @Column(name = "yzbm", length = 6)
+    private String yzbm;
 
-	@Column(name = "CONTACT_USER_", length = 50)
-	@PropertyDef(label = "鑱旂郴浜�")
-	private String contactUser;
+    @Column(name = "CONTACT_USER_", length = 50)
+    @PropertyDef(label = "鑱旂郴浜�")
+    private String contactUser;
 
-	@Column(name = "PHONE_", length = 20)
-	@PropertyDef(label = "鑱旂郴鐢佃瘽")
-	private String phone;
+    @Column(name = "PHONE_", length = 20)
+    @PropertyDef(label = "鑱旂郴鐢佃瘽")
+    private String phone;
 
-	@Column(name = "CARD_ID_", length = 20)
-	@PropertyDef(label = "鑱旂郴浜鸿韩浠借瘉鍙�")
-	private String cardId;
+    @Column(name = "CARD_ID_", length = 20)
+    @PropertyDef(label = "鑱旂郴浜鸿韩浠借瘉鍙�")
+    private String cardId;
 
-	@PropertyDef(label = "鐢靛瓙淇＄" )
-	@Column(name = "dzyx", length = 64)
-	private String dzyx;
+    @PropertyDef(label = "鐢靛瓙淇＄")
+    @Column(name = "dzyx", length = 64)
+    private String dzyx;
 
-	@Column(name = "BANK_", length = 50)
-	@PropertyDef(label = "寮�鎴烽摱琛�")
-	private String bank;
+    @Column(name = "BANK_", length = 50)
+    @PropertyDef(label = "寮�鎴烽摱琛�")
+    private String bank;
 
-	@Column(name = "BANK_NUM_", length = 30)
-	@PropertyDef(label = "閾惰璐﹀彿")
-	private String bankNum;
+    @Column(name = "BANK_NUM_", length = 30)
+    @PropertyDef(label = "閾惰璐﹀彿")
+    private String bankNum;
 
-	@Column(name = "FOOD_AREA_", length = 30)
-	@PropertyDef(label = "绉嶆闈㈢Н")
-	private Double foodArea = 0.0;
+    @Column(name = "FOOD_AREA_", length = 30)
+    @PropertyDef(label = "绉嶆闈㈢Н")
+    private Double foodArea = 0.0;
 
-	@Column(name = "UPDATE_TIME_")
-	@PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
-	private Date updateTime;
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
 
 }
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutLossOver.java b/igds-inout/src/main/java/com/ld/igds/models/InoutLossOver.java
new file mode 100644
index 0000000..795d17c
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutLossOver.java
@@ -0,0 +1,187 @@
+package com.ld.igds.models;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 缁煎悎绠＄悊-鎹熸孩绠＄悊
+ *
+ * @author: andy.jia
+ * @description:
+ * @version:
+ * @data:2020骞�5鏈�27鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_LOSS_OVER")
+public class InoutLossOver 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 = "TYPE_", length = 10)
+    @PropertyDef(label = "绫诲瀷", description = "鎹熻��/婧㈠嚭")
+    private String type;
+
+    @Column(name = "SUBMIT_TIME_")
+    @PropertyDef(label = "涓氬姟鏃ユ湡", description = "yyyy-MM-dd")
+    private Date submitTime;
+
+    @PropertyDef(label = "鍏ュ簱鍑�閲�", description = "鍗曚綅锛欿G")
+    @Column(name = "rkjz", precision = 20, scale = 6)
+    private double rkjz;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @PropertyDef(label = "鍏ュ簱鏃堕棿")
+    @Column(name = "rksj")
+    private Date rksj;
+
+    @PropertyDef(label = "鍏ュ簱姘村垎(%)")
+    @Column(name = "rksf", precision = 20, scale = 6)
+    private double rksf;
+
+    @PropertyDef(label = "鍏ュ簱鏉傝川(%)")
+    @Column(name = "rkzz", precision = 20, scale = 6)
+    private double rkzz;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @PropertyDef(label = "鍑哄簱鏃堕棿")
+    @Column(name = "cksj")
+    private Date cksj;
+
+    @PropertyDef(label = "鍑哄簱鍑�閲�", description = "鍗曚綅锛欿G")
+    @Column(name = "ckjz", precision = 20, scale = 6)
+    private double ckjz;
+
+    @PropertyDef(label = "鍑哄簱姘村垎(%)")
+    @Column(name = "cksf", precision = 16, scale = 6)
+    private double cksf;
+
+    @PropertyDef(label = "鍑哄簱鏉傝川(%)")
+    @Column(name = "ckzz", precision = 16, scale = 6)
+    private double ckzz;
+
+    @Column(name = "AMOUNT_")
+    @PropertyDef(label = "閲嶉噺", description = "鎹熸孩鏁伴噺KG")
+    private Double amount;
+
+//	@PropertyDef(label = "鍏朵腑锛氭垚璐т綅鍓嶆崯鑰�(鍏枻)" )
+//	@Column(name = "qzchwqsh", precision = 20, scale = 6)
+//	private double qzchwqsh;
+//
+//	@PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)" )
+//	@Column(name = "qzszkl", precision = 20, scale = 6)
+//	private double qzszkl;
+//
+//	@PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)" )
+//	@Column(name = "qzzrshde", precision = 20, scale = 6)
+//	private double qzzrshde;
+//
+//	@PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)" )
+//	@Column(name = "chsl", precision = 20, scale = 6)
+//	private double chsl;
+
+    @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父", description = "0锛氭甯� 1锛氫笉姝ｅ父")
+    @Column(name = "sysfzc", length = 1)
+    private String sysfzc;
+
+    @PropertyDef(label = "鎹熸孩鍘熷洜")
+    @Column(name = "syyy", length = 400)
+    private String syyy;
+
+    @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 = "REMARK_", length = 300)
+    @PropertyDef(label = "澶囨敞")
+    private String remark;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏇存柊鏃堕棿")
+    private Date updateTime;
+
+    @Column(name = "UPDATE_USER_", length = 50)
+    @PropertyDef(label = "鏇存柊浜�")
+    private String updateUser;
+
+}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java b/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
index c923025..6a36aa5 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
@@ -9,110 +9,98 @@
 import lombok.Data;
 
 /**
- * 鍑哄叆搴撴暟鎹褰曪紝褰撳墠璁板綍鍖呮嫭 鍏ュ簱淇℃伅鍜屽嚭鍏ュ簱淇℃伅锛�
+ * 鍑哄叆搴撶粨绠楋紝2023骞�5鏈�26鏃ワ紝鏍规嵁鏂板浗绮浼樺寲璋冩暣
  */
 @Data
 @Entity
 @Table(name = "D_INOUT_SETTLE")
 public class InoutSettle {
 
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "娴佹按鍙�")
-	private String id;
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "娴佹按鍙�")
+    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 = "PAY_PRICE_")
-	@PropertyDef(label = "鍗曚环")
-	private Double payPrice = 0.0;
+    @Column(name = "DEPT_ID_", length = 50)
+    @PropertyDef(label = "搴撳尯缂栫爜")
+    private String deptId;
 
-	@Column(name = "PAY_SUM_")
-	@PropertyDef(label = "缁撶畻鎬婚")
-	private Double paySum = 0.0;
+    @Column(name = "INOUT_TYPE_")
+    @PropertyDef(label = "鍑哄叆搴撶被鍨�")
+    private String inoutType;
 
-	@Column(name = "PAY_TYPE_", length = 10)
-	@PropertyDef(label = "浠樻鏂瑰紡")
-	private String payType;
+    @Column(name = "BIZ_TYPE_")
+    @PropertyDef(label = "澶勭悊鏂瑰紡", description = "鍗曡溅缁撶畻/鍚堝悓缁撶畻")
+    private String bizType;
 
-	@Column(name = "CUSTOMER_ID_")
-	@PropertyDef(label = "瀹㈡埛缂栫爜")
-	private String customerId;
+    @Column(name = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "鎵�灞炰粨搴�")
+    private String depotId;
 
-	@Column(name = "CUSTOMER_NAME_")
-	@PropertyDef(label = "瀹㈡埛鍚嶇О")
-	private String customerName;
 
-	@Column(name = "BANK_", length = 40)
-	@PropertyDef(label = "寮�鎴疯")
-	private String bank;
+    @Column(name = "CONTRACT_ID_", length = 40)
+    @PropertyDef(label = "鍚堝悓缂栫爜", description = "閽堝杞崲绮蹇呭～")
+    private String contractId;
 
-	@Column(name = "BANK_NUM_", length = 20)
-	@PropertyDef(label = "閾惰鍗″彿")
-	private String bankNum;
+    @Column(name = "CONTRACT_NAME_", length = 50)
+    @PropertyDef(label = "鍚堝悓鍚嶇О", description = "閽堝杞崲绮蹇呭～")
+    private String contractName;
 
-	@Column(name = "PAY_USER_", length = 40)
-	@PropertyDef(label = "浠樻鎿嶄綔浜�")
-	private String payUser;
+    // 缁撶畻淇℃伅
+    @Column(name = "PAY_PRICE_")
+    @PropertyDef(label = "鍗曚环")
+    private Double payPrice = 0.0;
 
-	@Column(name = "PAY_TIME_")
-	@PropertyDef(label = "缁撶畻鏃堕棿")
-	private Date payTime;
+    @Column(name = "PAY_SUM_")
+    @PropertyDef(label = "缁撶畻鎬婚")
+    private Double paySum = 0.0;
 
-	@Column(name = "FULL_WEIGHT_")
-	@PropertyDef(label = "姣涢噸")
-	private double fullWeight = 0.0;
+    @Column(name = "SETTLE_WEIGHT_")
+    @PropertyDef(label = "缁撶畻閲嶉噺")
+    private double settleWeight = 0.0;
 
-	@Column(name = "EMPTY_WEIGHT_")
-	@PropertyDef(label = "鐨噸")
-	private double emptyWeight = 0.0;
+    @Column(name = "PAY_TIME_")
+    @PropertyDef(label = "缁撶畻鏃堕棿")
+    private Date payTime;
 
-	@Column(name = "NET_WEIGHT_")
-	@PropertyDef(label = "鍑�閲�", description = "鍗曚綅KG")
-	private Double netWeight = 0.0;
+    @Column(name = "PAY_TYPE_", length = 10)
+    @PropertyDef(label = "浠樻鏂瑰紡")
+    private String payType;
 
-	@Column(name = "DE_SUM_")
-	@PropertyDef(label = "鎬绘墸閲�")
-	private double deSum;
+    @Column(name = "PAYEE_")
+    @PropertyDef(label = "鏀舵浜�", description = "鏀舵鍗曚綅鎴栬�呬釜浜�")
+    private String payee;
 
-	@Column(name = "SETTLE_WEIGHT_")
-	@PropertyDef(label = "缁撶畻閲嶉噺")
-	private double settleWeight = 0.0;
+    @Column(name = "PAYEE_ID_")
+    @PropertyDef(label = "鏀舵浜虹渷浠借瘉鍙�")
+    private String payeeId;
 
-	@Column(name = "TYPE_")
-	@PropertyDef(label = "鍑哄叆搴撶被鍨�")
-	private String type;
+    @Column(name = "BANK_", length = 40)
+    @PropertyDef(label = "寮�鎴疯")
+    private String bank;
 
-	@Column(name = "OTHER_SUN_")
-	@PropertyDef(label = "鍏朵粬璐圭敤", description = "鍗曚綅锛氬厓")
-	private Double otherSum = 0.0;
+    @Column(name = "BANK_NUM_", length = 20)
+    @PropertyDef(label = "閾惰鍗″彿")
+    private String bankNum;
 
-	@Column(name = "REMARKS_", length = 200)
-	@PropertyDef(label = "澶囨敞淇℃伅")
-	private String remarks;
-	
-	
-	@Transient
-	private String depotId;
+    @Column(name = "PAY_UNIT_", length = 50)
+    @PropertyDef(label = "浠樻鍗曚綅")
+    private String payUnit;
 
-	@Transient
-	private String deptId;
+    @Column(name = "PAY_USER_", length = 40)
+    @PropertyDef(label = "浠樻鎿嶄綔浜�")
+    private String payUser;
 
-	@Transient
-	private String userName;
+    @Column(name = "REMARKS_", length = 200)
+    @PropertyDef(label = "澶囨敞淇℃伅")
+    private String remarks;
 
-	@Transient
-	private String plateNum;
-	
-	@Transient
-	private String foodVariety;
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
 
-	@Transient
-	private String foodLevel;
-
-	@Transient
-	private Date completeTime;
 }
diff --git a/igds-inout/src/main/java/com/ld/igds/models/MStockChange.java b/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
similarity index 73%
rename from igds-inout/src/main/java/com/ld/igds/models/MStockChange.java
rename to igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
index 1cef376..a3a8283 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/MStockChange.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
@@ -10,16 +10,14 @@
 import java.util.Date;
 
 /**
- * @author vince.xu
- * @Title: StockChange
- * @ProjectName igds-35
- * @Description: 鍊掍粨锛岀Щ搴�
- * @date 2022-7-2711:50
+ * @Desc: 鍊掍粨鍔熻兘锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮鏇存柊浼樺寲
+ * @author: Andy
+ * @update-time: 2023/5/26
  */
 @Data
 @Entity
-@Table(name = "D_M_STOCK_CHANGE")
-public class MStockChange {
+@Table(name = "D_INOUT_STOCK_CHANGE")
+public class InoutStockChange {
 
 
     @Id
@@ -35,16 +33,16 @@
     @PropertyDef(label = "鎵�灞炲垎搴�")
     private String deptId;
 
-    @Column(name = "TYPE_", length = 5)
-    @PropertyDef(label = "鍊掍粨绫诲瀷",description = "0锛氬�掍粨 1锛氱Щ搴�")
+    @Column(name = "TYPE_", length = 2)
+    @PropertyDef(label = "鍊掍粨绫诲瀷", description = "0锛氬�掍粨 1锛氱Щ搴�")
     private String type;
 
     @Column(name = "PLAN_CODE_", length = 40)
-    @PropertyDef(label = "鍊掍粨璁″垝鏂囦欢缂栧彿",description = "鍊掍粨璁″垝鏂囦欢缂栧彿")
+    @PropertyDef(label = "鍊掍粨璁″垝鏂囦欢缂栧彿", description = "鍊掍粨璁″垝鏂囦欢缂栧彿")
     private String planCode;
 
     @Column(name = "NOTICE_ID_", length = 40)
-    @PropertyDef(label = "閫氱煡鍗曞彿",description = "閫氱煡鍗曞彿")
+    @PropertyDef(label = "閫氱煡鍗曞彿", description = "閫氱煡鍗曞彿")
     private String noticeId;
 
     @Column(name = "FOOD_VARIETY_", length = 10)
@@ -71,8 +69,7 @@
     @PropertyDef(label = "鏇存柊鏃堕棿")
     private Date updateTime;
 
-    @Column(name = "UPDATE_USER_",length = 50)
+    @Column(name = "UPDATE_USER_", length = 50)
     @PropertyDef(label = "鏇存柊浜�")
-    private String  updateUser;
-
+    private String updateUser;
 }
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
index 2a744c0..7c4e7ad 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
@@ -89,7 +89,7 @@
 
     @Column(name = "INFO_ZJSH_", length = 200)
     @PropertyDef(label = "瀹℃牳璇存槑")
-    private String InfoZjsh;
+    private String infoZjsh;
 
     @PropertyDef(label = "缁熻瀹℃牳浜�")
     @Column(name = "tjshr", length = 64)
@@ -101,7 +101,7 @@
 
     @Column(name = "INFO_TJSH_", length = 200)
     @PropertyDef(label = "瀹℃牳璇存槑")
-    private String InfoTjsh;
+    private String infoTjsh;
 
     @PropertyDef(label = "浼氳瀹℃牳浜�")
     @Column(name = "kjshr", length = 64)
@@ -113,7 +113,7 @@
 
     @Column(name = "INFO_KJSH_", length = 200)
     @PropertyDef(label = "瀹℃牳璇存槑")
-    private String InfoKjsh;
+    private String infoKjsh;
 
     @PropertyDef(label = "棰嗗瀹℃牳浜�")
     @Column(name = "ldshr", length = 64)
@@ -125,7 +125,7 @@
 
     @Column(name = "INFO_LDSH_", length = 200)
     @PropertyDef(label = "瀹℃牳璇存槑")
-    private String InfoLdsh;
+    private String infoLdsh;
 
     @Column(name = "UPDATE_TIME_")
     @PropertyDef(label = "鏇存柊鏃堕棿")
diff --git a/igds-inout/src/main/java/com/ld/igds/models/MLossOver.java b/igds-inout/src/main/java/com/ld/igds/models/MLossOver.java
deleted file mode 100644
index b0b7718..0000000
--- a/igds-inout/src/main/java/com/ld/igds/models/MLossOver.java
+++ /dev/null
@@ -1,77 +0,0 @@
-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;
-
-/**
- * 缁煎悎绠＄悊-鎹熸孩绠＄悊
- * 
- * @author: andy.jia
- * @description:
- * @version:
- * @data:2020骞�5鏈�27鏃�
- *
- */
-@Data
-@Entity
-@Table(name = "D_M_LOSS_OVER")
-public class MLossOver 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 = 30)
-	@PropertyDef(label = "鎵�灞炲垎搴�")
-	private String deptId;
-
-	@Column(name = "TYPE_", length = 10)
-	@PropertyDef(label = "绫诲瀷")
-	private String type;
-
-	@Column(name = "SUBMIT_TIME_")
-	@PropertyDef(label = "鐧昏鏃堕棿")
-	private Date submitTime;
-
-	@Column(name = "DEPOT_ID_", length = 50)
-	@PropertyDef(label = "鎵�灞炰粨搴�")
-	private String depotId;
-
-	@Column(name = "FOOD_VARIETY_", length = 10)
-	@PropertyDef(label = "绮鍝佺")
-	private String foodVariety;
-
-	@Column(name = "AMOUNT_")
-	@PropertyDef(label = "閲嶉噺")
-	private Double amount;
-
-	@Column(name = "FOOD_LOCATION_", length = 100)
-	@PropertyDef(label = "绮浜у湴")
-	private String foodLocation;
-
-	@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;
-
-}
diff --git a/igds-security/src/main/java/com/ld/igds/sec/service/BlackListWarnService.java b/igds-security/src/main/java/com/ld/igds/sec/service/BlackListWarnService.java
index 4ee58f8..b0dc286 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/service/BlackListWarnService.java
+++ b/igds-security/src/main/java/com/ld/igds/sec/service/BlackListWarnService.java
@@ -4,7 +4,6 @@
 import com.bstek.dorado.data.provider.Page;
 import com.ld.igds.constant.WarnStatus;
 import com.ld.igds.models.MWarnConf;
-import com.ld.igds.models.BlackListWarnInfo;
 import com.ld.igds.util.ContextUtil;
 import com.ld.igds.util.DateUtil;
 import com.ld.igds.warn.service.CoreWarnService;
diff --git a/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarnPR.java b/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarnPR.java
index b777de0..e16e845 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarnPR.java
+++ b/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarnPR.java
@@ -8,10 +8,8 @@
 import com.ld.igds.constant.NoticeType;
 import com.ld.igds.constant.WarnLevel;
 import com.ld.igds.constant.WarnStatus;
-import com.ld.igds.constant.WarnType;
 import com.ld.igds.models.DicTrigger;
 import com.ld.igds.models.MWarnConf;
-import com.ld.igds.models.BlackListWarnInfo;
 import com.ld.igds.sec.service.BlackListWarnService;
 import com.ld.igds.sys.service.SysUserService;
 import com.ld.igds.util.ContextUtil;

--
Gitblit v1.9.3