From b667644b1a9f93583b4bb2d508c570c65aa3497b Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 27 五月 2023 19:01:47 +0800
Subject: [PATCH] 调整模块货位和库存

---
 igds-core/src/main/java/com/ld/igds/view/Depot.view.xml                      |   69 +---
 igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java               |    4 
 igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java |   60 +--
 igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java   |   45 +-
 igds-core/src/main/java/com/ld/igds/models/DepotStore.java                   |    4 
 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java |    3 
 igds-core/src/main/java/com/ld/igds/constant/FoodLevel.java                  |    6 
 igds-core/src/main/java/com/ld/igds/models/MWarnConf.java                    |    2 
 igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java     |    5 
 igds-core/src/main/java/com/ld/igds/constant/FoodType.java                   |    1 
 igds-core/src/main/java/com/ld/igds/common/DepotStatusService.java           |    6 
 igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java                   |   11 
 igds-core/src/main/java/com/ld/igds/view/DepotPR.java                        |   82 +++++
 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java |    6 
 igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java                |   80 +++--
 igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml                 |  115 +++++--
 igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java               |   28 -
 igds-doc/sql/update-v35-to-v40.sql                                           |   23 +
 igds-core/src/main/java/com/ld/igds/constant/DepotType.java                  |    7 
 igds-core/src/main/java/models/igds.model.xml                                |  301 ++++++++++---------
 20 files changed, 485 insertions(+), 373 deletions(-)

diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java
index 486e339..c710ebf 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java
@@ -1,5 +1,6 @@
 package com.ld.igds.sh.service;
 
+import com.ld.igds.constant.DepotStatus;
 import com.ld.igds.log.service.InteStatusLogService;
 import com.ld.igds.models.Depot;
 import com.ld.igds.models.InteStatusLog;
@@ -71,7 +72,7 @@
             dto.setHwqyrq(DateFormatUtils.format((depot.getStoreDate()==null?new Date():depot.getStoreDate()),"yyyy-MM-dd"));
             dto.setHwrl(depot.getStorageReal()==null?"0.0":depot.getStorageReal() + "");
             dto.setCfbh(depot.getId().substring(0,25));
-            dto.setHwzt(apiShUtil.getDepotStatus(depot.getDepotStatus()));
+            dto.setHwzt(DepotStatus.getGBCode(depot.getDepotStatus()));
             dto.setClfs(depot.getStoreType());
             dto.setBgy(depot.getStoreKeeper());
             dto.setBgyxm(depot.getStoreKeeperName());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
index 390a5b8..eb38708 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
@@ -84,11 +84,7 @@
             dto.setSjcr(depot.getStorageMax() == null ? "0.0" : depot.getStorageMax() + "");
             dto.setQyrq(DateFormatUtils.format((depot.getStoreDate() == null ? new Date() : depot.getStoreDate()), "yyyy-MM-dd"));
 
-            if(DepotStatus.STATUS_08.getCode().equals(depot.getDepotStatus())){
-                dto.setAjzt("3"); //闇�澶т慨
-            }else {
-                dto.setAjzt("1"); //鐜╁ソ
-            }
+            dto.setAjzt("1"); //鐜╁ソ
 
             dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
             //鏌ヨ鏃ュ織鐘舵�佽〃锛岃缃搷浣滄爣蹇�
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java b/igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java
index 8d4fe41..88a5464 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java
@@ -2,6 +2,7 @@
 
 import com.ld.igds.constant.DepotStatus;
 import org.springframework.stereotype.Component;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -14,33 +15,14 @@
 @Component
 public class ApiShUtil {
 
-    /**
-     * 浠撳簱鐘舵�佽浆涓鸿揣浣嶇姸鎬�
-     * @param depotStatus
-     * @return
-     */
-    public String getDepotStatus(String depotStatus){
-        if(DepotStatus.STATUS_01.getCode().equals(depotStatus)){
-            return "1";
-        }
-        if(DepotStatus.STATUS_03.getCode().equals(depotStatus)){
-            return "2";
-        }
-        if(DepotStatus.STATUS_02.getCode().equals(depotStatus)){
-            return "3";
-        }
-        if(DepotStatus.STATUS_04.getCode().equals(depotStatus)){
-            return "4";
-        }
-        return "9";
-    }
 
     /**
      * 鑾峰彇鍥剧墖鐨勪簩杩涘埗娴�
+     *
      * @param imgPath
      * @return
      */
-    public String imgToIo(String imgPath){
+    public String imgToIo(String imgPath) {
         //鍥剧墖杞寲涓轰簩杩涘埗
         byte[] imageBytes = null;
         try {
@@ -56,9 +38,9 @@
         return UnicodeByteToStr(imageBytes);
     }
 
-    private static String UnicodeByteToStr(byte[] b){
+    private static String UnicodeByteToStr(byte[] b) {
         StringBuilder sb = new StringBuilder();
-        for(int i=0;i<b.length;i++) {
+        for (int i = 0; i < b.length; i++) {
             sb.append(String.format("%02x", b[i]));
         }
         return sb.toString();
diff --git a/igds-core/src/main/java/com/ld/igds/common/DepotStatusService.java b/igds-core/src/main/java/com/ld/igds/common/DepotStatusService.java
index cd82e2b..9a2d42b 100644
--- a/igds-core/src/main/java/com/ld/igds/common/DepotStatusService.java
+++ b/igds-core/src/main/java/com/ld/igds/common/DepotStatusService.java
@@ -43,7 +43,7 @@
 
         //姘旇皟鐘舵�侊紝涓嶈兘鎿嶄綔绐楁埛銆佺┖璋冦�侀�氶鍙ｃ�佹贩娴侀鏈恒�佽酱娴侀鏈�
         String msg = "褰撳墠浠撳簱鐘舵�佷负锛氭皵璋冧腑锛岀姝㈡墽琛岄�氶绛夋搷浣滐紝璇疯仈绯荤鐞嗗憳銆�";
-        if (DepotStatus.STATUS_05.getCode().equals(depot.getDepotStatus())) {
+        if (DepotStatus.STATUS_31.getCode().equals(depot.getDepotStatus())) {
             for (ExeDevice device : deviceList) {
                 if (DeviceType.TYPE_01.getCode().equals(device.getType())) return msg;
 
@@ -63,7 +63,7 @@
 
         //娓╂帶鐘舵�侊紝涓嶈兘鎿嶄綔绐楁埛銆侀�氶鍙ｃ�佹贩娴侀鏈恒�佽酱娴侀鏈�
         msg = "褰撳墠浠撳簱鐘舵�佷负锛氭俯鎺т腑锛岀姝㈡墽琛岄�氶绛夋搷浣滐紝璇疯仈绯荤鐞嗗憳銆�";
-        if (DepotStatus.STATUS_09.getCode().equals(depot.getDepotStatus())) {
+        if (DepotStatus.STATUS_34.getCode().equals(depot.getDepotStatus())) {
             for (ExeDevice device : deviceList) {
                 if (DeviceType.TYPE_01.getCode().equals(device.getType())) return msg;
 
@@ -82,7 +82,7 @@
 
         //鐔忚捀鐘舵�侊紝鎵�鏈夎澶囧潎涓嶆敮鎸佹搷浣�
         msg = "褰撳墠浠撳簱鐘舵�佷负锛氱啅钂镐腑锛岀姝㈡墍鏈夎繙绋嬫搷浣滐紝璇疯仈绯荤鐞嗗憳銆�";
-        if (DepotStatus.STATUS_06.getCode().equals(depot.getDepotStatus())) {
+        if (DepotStatus.STATUS_32.getCode().equals(depot.getDepotStatus())) {
             return msg;
         }
 
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 4a46da3..08ca40d 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -318,39 +318,34 @@
     @Override
     public void initInoutDepotStore(InoutData data) {
 
-        String depotStatus = DepotStatus.STATUS_03.getCode();
-        if (InoutConstant.TYPE_OUT.equals(data.getType())) {
-            depotStatus = DepotStatus.STATUS_04.getCode();
-        }
-
         //鍏堜粠缂撳瓨涓幏鍙栦笅淇℃伅锛屾煡鐪嬫槸鍚﹀凡缁忓垵濮嬪寲杩囨暟鎹紝濡傛灉鏈夊垯鐩存帴璺宠繃锛屽鏋滄病鏈夊垯閲嶆柊楠岃瘉
-        String key = RedisConst.buildKey(data.getDepotId(), "DEPOT_STORE", depotStatus);
-        String tag = (String) redisUtil.get(key);
-        if (null != tag) return;
+       // String key = RedisConst.buildKey(data.getDepotId(), "DEPOT_STORE", depotStatus);
+//        String tag = (String) redisUtil.get(key);
+//        if (null != tag) return;
 
 
         //鑾峰彇褰撳墠浠撳簱鏈�鍚庝竴涓簱瀛樿褰�
         DepotStore depotStore = getLastDepotStore(data.getDepotId());
 
         //濡傛灉鏈夋暟鎹紝骞朵笖鐘舵�佺被涓�鑷达紝琛ㄧず缂撳瓨娌℃湁浜嗭紝浣嗘槸宸茬粡鍋氳繃鍒濆鍖�
-        if (null != depotStore && depotStatus.equals(depotStore.getDepotStatus())) {
-            redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60);
-            return;
-        }
+//        if (null != depotStore && depotStatus.equals(depotStore.getDepotStatus())) {
+//            redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60);
+//            return;
+//        }
 
         //浠庢潵娌℃湁鍋氫釜搴撳瓨绠＄悊璋冩暣
-        if (null == depotStore) {
-            Depot depot = this.getCacheDepot(data.getCompanyId(), data.getDepotId());
-            depotStore = new DepotStore(depot, depotStatus);
-            if (null != data.getFoodYear()) {
-                depotStore.setFoodYear(data.getFoodYear());
-            }
-
-        } else { //鏈夎褰曪紝浣嗘槸鐘舵�佷笌褰撳墠浣滀笟涓嶄竴鑷达紝涔熼渶瑕佸垵濮嬪寲
-            depotStore.setDepotStatus(depotStatus);
-            depotStore.setUpdateDate(new Date());
-            depotStore.setUpdateUser(null);
-        }
+//        if (null == depotStore) {
+//            Depot depot = this.getCacheDepot(data.getCompanyId(), data.getDepotId());
+//            depotStore = new DepotStore(depot, depotStatus);
+//            if (null != data.getFoodYear()) {
+//                depotStore.setFoodYear(data.getFoodYear());
+//            }
+//
+//        } else { //鏈夎褰曪紝浣嗘槸鐘舵�佷笌褰撳墠浣滀笟涓嶄竴鑷达紝涔熼渶瑕佸垵濮嬪寲
+//            depotStore.setDepotStatus(depotStatus);
+//            depotStore.setUpdateDate(new Date());
+//            depotStore.setUpdateUser(null);
+//        }
 
         depotStore.setId(null);
         if (InoutConstant.TYPE_OUT.equals(data.getType())) {
@@ -367,7 +362,7 @@
         addDepotStore(depotStore, false);
         commonMapper.updateDepotStatus(depotStore.getCompanyId(), depotStore.getDepotId(), depotStore.getDepotStatus());
 
-        redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60);
+       // redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60);
     }
 
     @Override
diff --git a/igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java b/igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java
index 4beaac8..69df1c0 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java
@@ -5,44 +5,58 @@
  */
 public enum DepotStatus {
 
-	STATUS_01("01", "绌轰粨"), 
-	STATUS_02("02", "婊′粨"), 
-	STATUS_03("03", "鍏ュ簱涓�"), 
-	STATUS_04("04", "鍑哄簱涓�"), 
-	STATUS_05("05", "姘旇皟涓�"), 
-	STATUS_06("06", "鐔忚捀涓�"), 
-	STATUS_07("07", "閫氶涓�"),
-	STATUS_09("09", "娓╂帶涓�"),
-	STATUS_08("08", "缁翠慨涓�");
+    STATUS_1("1", "绌轰粨"),
+    STATUS_2("2", "鍏ュ簱涓�"),
+    STATUS_3("3", "婊′粨"),
+    STATUS_4("4", "鍑哄簱涓�"),
+    STATUS_31("31", "婊′粨-姘旇皟涓�"),
+    STATUS_32("32", "婊′粨-鐔忚捀涓�"),
+    STATUS_33("33", "婊′粨-閫氶涓�"),
+    STATUS_34("34", "婊′粨-娓╂帶涓�"),
+    STATUS_9("9", "鍏朵粬");
 
-	private String code;
-	private String msg;
+    private String code;
+    private String msg;
 
-	DepotStatus(String code, String msg) {
-		this.code = code;
-		this.msg = msg;
-	}
+    DepotStatus(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
 
-	public String getCode() {
-		return code;
-	}
+    public String getCode() {
+        return code;
+    }
 
-	public String getMsg() {
-		return msg;
-	}
+    public String getMsg() {
+        return msg;
+    }
 
-	public static String getMsg(String code) {
-		if(null == code) return null;
+    public static String getMsg(String code) {
+        if (null == code) return null;
 
-		if(DepotStatus.STATUS_01.getCode().equals(code)) return DepotStatus.STATUS_01.getMsg();
-		if(DepotStatus.STATUS_02.getCode().equals(code)) return DepotStatus.STATUS_02.getMsg();
-		if(DepotStatus.STATUS_03.getCode().equals(code)) return DepotStatus.STATUS_03.getMsg();
-		if(DepotStatus.STATUS_04.getCode().equals(code)) return DepotStatus.STATUS_04.getMsg();
-		if(DepotStatus.STATUS_05.getCode().equals(code)) return DepotStatus.STATUS_05.getMsg();
-		if(DepotStatus.STATUS_06.getCode().equals(code)) return DepotStatus.STATUS_06.getMsg();
-		if(DepotStatus.STATUS_07.getCode().equals(code)) return DepotStatus.STATUS_07.getMsg();
-		if(DepotStatus.STATUS_08.getCode().equals(code)) return DepotStatus.STATUS_08.getMsg();
-		return code;
-	}
+        if (DepotStatus.STATUS_1.getCode().equals(code)) return DepotStatus.STATUS_1.getMsg();
+        if (DepotStatus.STATUS_2.getCode().equals(code)) return DepotStatus.STATUS_2.getMsg();
+        if (DepotStatus.STATUS_3.getCode().equals(code)) return DepotStatus.STATUS_3.getMsg();
+        if (DepotStatus.STATUS_4.getCode().equals(code)) return DepotStatus.STATUS_4.getMsg();
+        if (DepotStatus.STATUS_31.getCode().equals(code)) return DepotStatus.STATUS_31.getMsg();
+        if (DepotStatus.STATUS_32.getCode().equals(code)) return DepotStatus.STATUS_32.getMsg();
+        if (DepotStatus.STATUS_33.getCode().equals(code)) return DepotStatus.STATUS_33.getMsg();
+        if (DepotStatus.STATUS_34.getCode().equals(code)) return DepotStatus.STATUS_34.getMsg();
+
+        return DepotStatus.STATUS_9.getMsg();
+    }
+
+
+    public static String getGBCode(String code) {
+        if (null == code) DepotStatus.STATUS_9.getCode();
+
+        if (DepotStatus.STATUS_31.equals(code)) return DepotStatus.STATUS_3.getCode();
+        if (DepotStatus.STATUS_32.equals(code)) return DepotStatus.STATUS_3.getCode();
+        if (DepotStatus.STATUS_33.equals(code)) return DepotStatus.STATUS_3.getCode();
+        if (DepotStatus.STATUS_34.equals(code)) return DepotStatus.STATUS_3.getCode();
+
+        return code;
+    }
+
 
 }
diff --git a/igds-core/src/main/java/com/ld/igds/constant/DepotType.java b/igds-core/src/main/java/com/ld/igds/constant/DepotType.java
index 29ba8ff..6fde08b 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/DepotType.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/DepotType.java
@@ -1,12 +1,13 @@
 package com.ld.igds.constant;
 
 /**
- * 浠撳簱绫诲瀷
+ * 浠撳簱绫诲瀷锛岄拡瀵瑰綋鍓嶇郴缁熸墍鏀寔鐨勪粨鎴跨被鍨嬶紝闈炲浗鏍囩被鍨�
  * @author jiazx
  *
  */
 public enum DepotType {
-	TYPE_01("01", "楂樺ぇ骞虫埧浠�"),
+	
+	TYPE_01("01", "骞虫埧浠�"),
     TYPE_02("02", "娴呭渾浠�"),
     TYPE_03("03", "鍌ㄦ补缃�"),
     TYPE_04("04", "绔嬬瓛浠�"),
@@ -39,7 +40,7 @@
 		
 		if(DepotType.TYPE_04.getCode().equals(code)) return DepotType.TYPE_04.getMsg();
 		
-		return code;
+		return TYPE_99.getMsg();
 	}
 
 }
diff --git a/igds-core/src/main/java/com/ld/igds/constant/FoodLevel.java b/igds-core/src/main/java/com/ld/igds/constant/FoodLevel.java
index 5dfc177..a3d6747 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/FoodLevel.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/FoodLevel.java
@@ -7,12 +7,13 @@
  * 1锛屽垹闄ょ壒绛夛紝浠�1绛夊紑濮�
  */
 public enum FoodLevel {
+	
     LEVEL_01("01", "涓�绛�"),
     LEVEL_02("02", "浜岀瓑"),
     LEVEL_03("03", "涓夌瓑"),
     LEVEL_04("04", "鍥涚瓑"),
     LEVEL_05("05", "浜旂瓑"),
-    LEVEL_99("99", "绛夊");
+    LEVEL_06("06", "绛夊");
 
     private String code;
     private String msg;
@@ -37,7 +38,6 @@
         if(FoodLevel.LEVEL_03.getCode().equals(code)) return FoodLevel.LEVEL_03.getMsg();
         if(FoodLevel.LEVEL_04.getCode().equals(code)) return FoodLevel.LEVEL_04.getMsg();
         if(FoodLevel.LEVEL_05.getCode().equals(code)) return FoodLevel.LEVEL_05.getMsg();
-        if(FoodLevel.LEVEL_99.getCode().equals(code)) return FoodLevel.LEVEL_99.getMsg();
-        return code;
+        return FoodLevel.LEVEL_06.getMsg();
     }
 }
diff --git a/igds-core/src/main/java/com/ld/igds/constant/FoodType.java b/igds-core/src/main/java/com/ld/igds/constant/FoodType.java
index 026e2dc..9e371ff 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/FoodType.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/FoodType.java
@@ -10,7 +10,6 @@
 
     public static String getMsg(String code) {
         if (null == code) return "";
-
         return DicTrigger.mapFoodType.get(code);
     }
 }
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 f8e0650..28acf5e 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
@@ -118,10 +118,14 @@
     @Column(name = "UPDATE_USER_", length = 50)
     @PropertyDef(label = "淇敼浜�")
     private String updateUser;
+   
 
     @Column(name = "UPDATE_DATE_")
     @PropertyDef(label = "淇敼鏃堕棿")
     private Date updateDate;
+    
+    @Column(name = "CREATE_DATE_")
+    private Date createDate;
 
     public DepotStore() {
     }
diff --git a/igds-core/src/main/java/com/ld/igds/models/MWarnConf.java b/igds-core/src/main/java/com/ld/igds/models/MWarnConf.java
index df9887a..20ac1f8 100644
--- a/igds-core/src/main/java/com/ld/igds/models/MWarnConf.java
+++ b/igds-core/src/main/java/com/ld/igds/models/MWarnConf.java
@@ -4,14 +4,12 @@
 import com.ld.igds.constant.Constant;
 import com.ld.igds.constant.NoticeType;
 import lombok.Data;
-import org.h2.api.DatabaseEventListener;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 璀﹀憡閰嶇疆
diff --git a/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml b/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
index ccbfb50..361906c 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
@@ -129,30 +129,7 @@
         <Property name="dataType">String</Property>
       </PropertyDef>
     </DataType>
-    <DataType name="dtDepot" parent="global:dtDepot">
-      <ClientEvent name="onDataChange">var prop = arg.property;&#xD;
-var entity = arg.entity;&#xD;
-&#xD;
-/**&#xD;
- * &quot;01&quot;, //绌轰粨&#xD;
-   &quot;02&quot;,//婊′粨&#xD;
-    &quot;03&quot;,//鍏ュ簱&#xD;
- &quot;04&quot;,//鍑哄簱&#xD;
- */&#xD;
-if(&quot;depotStatus&quot; == prop){//琛ㄧず鐘舵�佷慨鏀�&#xD;
-    entity.set(&quot;editTag&quot;,entity.get(&quot;editTag&quot;)+&quot;-depotStatus&quot;);&#xD;
-	&#xD;
-	if(arg.newValue == &quot;01&quot; || arg.newValue == &quot;02&quot; || arg.newValue == &quot;03&quot; || arg.newValue == &quot;04&quot;){&#xD;
-		$alert(&quot;浠撳簱鐘舵��=婊′粨銆佺┖浠撱�佸嚭搴撲腑銆佸叆搴撲腑鏃堕渶瑕侀�氳繃 搴撳瓨绠＄悊 鍔熻兘杩涜淇敼锛侊紒&quot;);&#xD;
-		view.get(&quot;#btnOK&quot;).set(&quot;disabled&quot;,true);&#xD;
-	}else{&#xD;
-		view.get(&quot;#btnOK&quot;).set(&quot;disabled&quot;,false);&#xD;
-	}&#xD;
-}</ClientEvent>
-      <PropertyDef name="editTag">
-        <Property name="label">淇敼鏍囪</Property>
-      </PropertyDef>
-    </DataType>
+    <DataType name="dtDepot" parent="global:dtDepot"/>
   </Model>
   <View layout="padding:5;regionPadding:5">
     <ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//椤甸潰閫夋嫨鐨勫垎搴撶紪鐮�&#xD;
@@ -269,17 +246,13 @@
         <Property name="property">foodYear</Property>
         <Property name="align">center</Property>
       </DataColumn>
-      <DataColumn name="foodLocation">
-        <Property name="property">foodLocation</Property>
-        <Property name="align">center</Property>
-      </DataColumn>
       <DataColumn name="depotType">
         <Property name="property">depotType</Property>
         <Property name="align">center</Property>
       </DataColumn>
     </DataGrid>
     <Dialog id="depotdialog">
-      <Property name="caption">浠撳簱鍩烘湰淇℃伅</Property>
+      <Property name="caption">璐т綅淇℃伅</Property>
       <Property name="width">1200</Property>
       <Property name="closeable">false</Property>
       <Buttons>
@@ -308,7 +281,7 @@
       </Buttons>
       <Children>
         <FieldSet layout="padding:15">
-          <Property name="caption">浠撳簱鍩烘湰淇℃伅</Property>
+          <Property name="caption">鍩烘湰淇℃伅</Property>
           <Buttons/>
           <Children>
             <AutoForm>
@@ -343,9 +316,8 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">storageReal</Property>
-                <Property name="property">storageReal</Property>
-                <Property name="readOnly">true</Property>
+                <Property name="name">storeType</Property>
+                <Property name="property">storeType</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -359,14 +331,14 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">depotStatus</Property>
-                <Property name="property">depotStatus</Property>
-                <Property name="trigger">autoMappingDropDown2</Property>
+                <Property name="name">granaryId</Property>
+                <Property name="property">granaryId</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">storeType</Property>
-                <Property name="property">storeType</Property>
+                <Property name="name">depotStatus</Property>
+                <Property name="property">depotStatus</Property>
+                <Property name="trigger">autoMappingDropDown2</Property>
                 <Editor/>
               </AutoFormElement>
               <Label layoutConstraint="colSpan:3">
@@ -383,7 +355,7 @@
           <Property name="height">10</Property>
         </Control>
         <FieldSet layout="padding:15">
-          <Property name="caption">绮补鍩烘湰淇℃伅</Property>
+          <Property name="caption">鍌ㄧ伯淇℃伅</Property>
           <Buttons/>
           <Children>
             <AutoForm>
@@ -393,6 +365,12 @@
               <Property name="labelAlign">right</Property>
               <Property name="cols">*,*,*</Property>
               <Property name="labelWidth">110</Property>
+              <AutoFormElement>
+                <Property name="name">storageReal</Property>
+                <Property name="property">storageReal</Property>
+                <Property name="readOnly">true</Property>
+                <Editor/>
+              </AutoFormElement>
               <AutoFormElement>
                 <Property name="name">foodType</Property>
                 <Property name="property">foodType</Property>
@@ -453,17 +431,18 @@
                 <Property name="trigger">ddFoodOrigin</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement>
-                <Property name="name">orientation</Property>
-                <Property name="property">orientation</Property>
-                <Property name="trigger">listOri</Property>
-                <Editor/>
-              </AutoFormElement>
               <AutoFormElement layoutConstraint="colSpan:3">
                 <Property name="name">remark</Property>
                 <Property name="property">remark</Property>
                 <Editor/>
               </AutoFormElement>
+              <Label layoutConstraint="colSpan:3">
+                <Property name="text">璇存槑锛氬偍澶囩伯璐ㄦ淇℃伅浼氭牴鎹川閲忕鐞� 鑷姩鍚屾鏇存柊</Property>
+                <Property name="style">
+                  <Property name="color">blue</Property>
+                  <Property name="padding-left">50px</Property>
+                </Property>
+              </Label>
             </AutoForm>
           </Children>
         </FieldSet>
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
index e0752c8..5859990 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
@@ -10,11 +10,13 @@
 import com.ld.igds.io.request.DepotStatusRequest;
 import com.ld.igds.io.response.BaseResponse;
 import com.ld.igds.models.*;
+
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
+
 import com.bstek.bdf2.core.business.IUser;
 import com.bstek.dorado.annotation.DataProvider;
 import com.bstek.dorado.annotation.DataResolver;
@@ -23,6 +25,9 @@
 import com.ld.igds.common.CoreSerService;
 import com.ld.igds.constant.BizType;
 import com.ld.igds.constant.Constant;
+import com.ld.igds.constant.DepotStatus;
+import com.ld.igds.constant.DepotType;
+import com.ld.igds.constant.FoodLevel;
 import com.ld.igds.order.ExeOrderService;
 import com.ld.igds.order.data.ExeRequest;
 import com.ld.igds.util.ContextUtil;
@@ -45,6 +50,63 @@
     private RemoteManager remoteManager;
     @Autowired
     private ExeOrderService exeOrderService;
+    
+    
+    /**
+     * 浠撴埧绫诲瀷-闈炲浗鏍囧畾涔�
+     * ${dorado.getDataProvider("depotPR#triggerDepotType").getResult()}
+     *
+     * @return
+     */
+    @DataProvider
+    public List<DicTrigger> triggerDepotType() {
+        List<DicTrigger> list = new ArrayList<DicTrigger>();
+        list.add(new DicTrigger(DepotType.TYPE_01.getCode(), DepotType.TYPE_01.getMsg()));
+        list.add(new DicTrigger(DepotType.TYPE_02.getCode(), DepotType.TYPE_02.getMsg()));
+        list.add(new DicTrigger(DepotType.TYPE_03.getCode(), DepotType.TYPE_03.getMsg()));
+        list.add(new DicTrigger(DepotType.TYPE_04.getCode(), DepotType.TYPE_04.getMsg()));
+        list.add(new DicTrigger(DepotType.TYPE_99.getCode(), DepotType.TYPE_99.getMsg()));
+        return list;
+    }
+    
+    /**
+     * 浠撴埧鐘舵��
+     * ${dorado.getDataProvider("depotPR#triggerDepotStatus").getResult()}
+     *
+     * @return
+     */
+    @DataProvider
+    public List<DicTrigger> triggerDepotStatus() {
+        List<DicTrigger> list = new ArrayList<DicTrigger>();
+        list.add(new DicTrigger(DepotStatus.STATUS_1.getCode(), DepotStatus.STATUS_1.getMsg()));
+        list.add(new DicTrigger(DepotStatus.STATUS_2.getCode(), DepotStatus.STATUS_2.getMsg()));
+        list.add(new DicTrigger(DepotStatus.STATUS_3.getCode(), DepotStatus.STATUS_3.getMsg()));
+        list.add(new DicTrigger(DepotStatus.STATUS_4.getCode(), DepotStatus.STATUS_4.getMsg()));
+        list.add(new DicTrigger(DepotStatus.STATUS_31.getCode(), DepotStatus.STATUS_31.getMsg()));
+        list.add(new DicTrigger(DepotStatus.STATUS_32.getCode(), DepotStatus.STATUS_32.getMsg()));
+        list.add(new DicTrigger(DepotStatus.STATUS_33.getCode(), DepotStatus.STATUS_33.getMsg()));
+        list.add(new DicTrigger(DepotStatus.STATUS_34.getCode(), DepotStatus.STATUS_34.getMsg()));
+        list.add(new DicTrigger(DepotStatus.STATUS_9.getCode(), DepotStatus.STATUS_9.getMsg()));
+        return list;
+    }
+    
+    /**
+     * 绮绛夌骇
+     * ${dorado.getDataProvider("depotPR#triggerFoodLevel").getResult()}
+     *
+     * @return
+     */
+    @DataProvider
+    public List<DicTrigger> triggerFoodLevel() {
+        List<DicTrigger> list = new ArrayList<DicTrigger>();
+        list.add(new DicTrigger(FoodLevel.LEVEL_01.getCode(), FoodLevel.LEVEL_01.getMsg()));
+        list.add(new DicTrigger(FoodLevel.LEVEL_02.getCode(), FoodLevel.LEVEL_02.getMsg()));
+        list.add(new DicTrigger(FoodLevel.LEVEL_03.getCode(), FoodLevel.LEVEL_03.getMsg()));
+        list.add(new DicTrigger(FoodLevel.LEVEL_04.getCode(), FoodLevel.LEVEL_04.getMsg()));
+        list.add(new DicTrigger(FoodLevel.LEVEL_05.getCode(), FoodLevel.LEVEL_05.getMsg()));
+        list.add(new DicTrigger(FoodLevel.LEVEL_06.getCode(), FoodLevel.LEVEL_06.getMsg()));
+        return list;
+    }
 
     /**
      * 鍌ㄧ伯鏂瑰紡
@@ -57,10 +119,26 @@
         List<DicTrigger> list = new ArrayList<DicTrigger>();
         list.add(new DicTrigger("1", "鏁ｈ鍌ㄧ伯"));
         list.add(new DicTrigger("2", "鍖呰鍌ㄧ伯"));
-        list.add(new DicTrigger("3", "鍥村寘鏁ｅ瓨"));
+        list.add(new DicTrigger("3", "鍥村寘瀛�"));
         list.add(new DicTrigger("9", "鍏朵粬"));
         return list;
     }
+    
+    /**
+     * 绠＄悊鏂瑰紡
+     * ${dorado.getDataProvider("depotPR#triggerManagerType").getResult()}
+     *
+     * @return
+     */
+    @DataProvider
+    public List<DicTrigger> triggerManagerType() {
+        List<DicTrigger> list = new ArrayList<DicTrigger>();
+        list.add(new DicTrigger("01", "鐩村偍"));
+        list.add(new DicTrigger("02", "浠ｅ偍"));
+        list.add(new DicTrigger("03", "绉熶粨"));
+        list.add(new DicTrigger("04", "濮旀墭"));
+        return list;
+    }
 
     /**
      * 鐢电紗璧峰鏂逛綅
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
index e5fab96..a32b34c 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
@@ -13,12 +13,8 @@
     <DataSet id="dsMain">
       <Property name="pageSize">20</Property>
       <Property name="dataType">[dtMain]</Property>
-      <Property name="dataProvider">depotStorePR#pageListDepotStore</Property>
+      <Property name="dataProvider">depotStorePR#pageList</Property>
       <Property name="loadMode">lazy</Property>
-    </DataSet>
-    <DataSet id="dsDepot">
-      <Property name="dataType">[dtDepot]</Property>
-      <Property name="dataProvider">depotPR#getAllCache</Property>
     </DataSet>
     <Container layout="regionPadding:10" layoutConstraint="top">
       <Property name="exClassName">bg-color</Property>
@@ -78,11 +74,6 @@
           <Property name="align">center</Property>
           <Property name="name">depotId</Property>
         </DataColumn>
-        <DataColumn>
-          <Property name="property">storeType</Property>
-          <Property name="align">center</Property>
-          <Property name="name">storeType</Property>
-        </DataColumn>
         <DataColumn name="depotStatus">
           <Property name="property">depotStatus</Property>
           <Property name="align">center</Property>
@@ -107,26 +98,25 @@
           <Property name="property">foodYear</Property>
           <Property name="align">center</Property>
         </DataColumn>
-        <DataColumn name="storeDate">
-          <Property name="property">storeDate</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
         <DataColumn name="storageReal">
           <Property name="property">storageReal</Property>
           <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="storageSettle">
+          <Property name="property">storageSettle</Property>
         </DataColumn>
         <DataColumn name="updateDate">
           <Property name="property">updateDate</Property>
           <Property name="align">center</Property>
         </DataColumn>
       </DataGrid>
-    </Container>
-    <Container layoutConstraint="bottom">
-      <Property name="exClassName">bg-color</Property>
-      <DataPilot layoutConstraint="right">
-        <Property name="itemCodes">pageSize,pages</Property>
-        <Property name="dataSet">dsMain</Property>
-      </DataPilot>
+      <ToolBar layoutConstraint="bottom">
+        <Fill/>
+        <DataPilot layoutConstraint="right">
+          <Property name="itemCodes">pageSize,pages</Property>
+          <Property name="dataSet">dsMain</Property>
+        </DataPilot>
+      </ToolBar>
     </Container>
     <Dialog id="dialogMain">
       <Property name="caption">搴撳瓨淇℃伅</Property>
@@ -165,7 +155,7 @@
           <AutoFormElement>
             <Property name="name">depotId</Property>
             <Property name="property">depotId</Property>
-            <Property name="trigger">dsddDepot</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -177,6 +167,7 @@
           <AutoFormElement>
             <Property name="name">storeType</Property>
             <Property name="property">storeType</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -192,27 +183,74 @@
           <AutoFormElement>
             <Property name="name">foodLevel</Property>
             <Property name="property">foodLevel</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">foodLocation</Property>
-            <Property name="property">foodLocation</Property>
-            <Property name="trigger">ddFoodOrigin</Property>
+            <Property name="name">manageType</Property>
+            <Property name="property">manageType</Property>
             <Editor/>
           </AutoFormElement>
+          <Label>
+            <Property name="style">
+              <Property name="color">red</Property>
+              <Property name="font-size">12px</Property>
+            </Property>
+          </Label>
           <AutoFormElement>
             <Property name="name">foodYear</Property>
             <Property name="property">foodYear</Property>
             <Property name="trigger">yearDropDown1</Property>
             <Editor/>
           </AutoFormElement>
+          <Label>
+            <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+            <Property name="style">
+              <Property name="color">red</Property>
+              <Property name="font-size">12px</Property>
+            </Property>
+          </Label>
+          <AutoFormElement>
+            <Property name="name">country</Property>
+            <Property name="property">country</Property>
+            <Editor/>
+          </AutoFormElement>
+          <Label>
+            <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+            <Property name="style">
+              <Property name="color">blue</Property>
+            </Property>
+          </Label>
+          <AutoFormElement>
+            <Property name="name">foodLocation</Property>
+            <Property name="property">foodLocation</Property>
+            <Property name="trigger">ddFoodOrigin</Property>
+            <Editor/>
+          </AutoFormElement>
+          <Label>
+            <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+            <Property name="style">
+              <Property name="color">blue</Property>
+            </Property>
+          </Label>
           <AutoFormElement>
             <Property name="name">storageReal</Property>
             <Property name="property">storageReal</Property>
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璇存槑锛氫粨搴撶姸鎬�=婊′粨锛岀┖浠� 鍒囪褰曞叆搴撳瓨璁板綍</Property>
+            <Property name="text">蹇呭～锛岀┖浠�=0锛屽叆搴�/鍑哄簱鏁伴噺涔嬪拰</Property>
+            <Property name="style">
+              <Property name="color">blue</Property>
+            </Property>
+          </Label>
+          <AutoFormElement>
+            <Property name="name">storageSettle</Property>
+            <Property name="property">storageSettle</Property>
+            <Editor/>
+          </AutoFormElement>
+          <Label>
+            <Property name="text">蹇呭～锛岀┖浠�=0锛屽叆搴�/鍑哄簱缁撶畻鏁伴噺涔嬪拰</Property>
             <Property name="style">
               <Property name="color">blue</Property>
             </Property>
@@ -223,7 +261,7 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璇存槑锛氫粨搴撶姸鎬�=婊′粨锛屽繀濉�</Property>
+            <Property name="text">璐т綅鐘舵��=绌轰粨/鍑哄簱涓紝蹇呭～</Property>
             <Property name="style">
               <Property name="color">blue</Property>
             </Property>
@@ -234,7 +272,7 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璇存槑锛氱涓�杞﹀叆搴撴椂闂达紝浠撳簱鐘舵��=鍏ュ簱涓紝蹇呭～</Property>
+            <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～銆傜涓�杞﹀叆浠撴椂闂�</Property>
             <Property name="style">
               <Property name="color">blue</Property>
             </Property>
@@ -245,7 +283,7 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璇存槑锛氱涓�杞﹀嚭搴撴椂闂达紝浠撳簱鐘舵��=鍑哄簱涓紝蹇呭～</Property>
+            <Property name="text">璐т綅鐘舵��=绌轰粨锛屽繀濉�傛渶鍚庝竴杞︾伯椋熷嚭浠撴椂闂�</Property>
             <Property name="style">
               <Property name="color">blue</Property>
             </Property>
@@ -255,11 +293,23 @@
             <Property name="property">grainHeight</Property>
             <Editor/>
           </AutoFormElement>
+          <Label>
+            <Property name="text">璐т綅鐘舵��=婊′粨锛屽彲濉�</Property>
+            <Property name="style">
+              <Property name="color">blue</Property>
+            </Property>
+          </Label>
           <AutoFormElement>
             <Property name="name">grainVolume</Property>
             <Property name="property">grainVolume</Property>
             <Editor/>
           </AutoFormElement>
+          <Label>
+            <Property name="text">璐т綅鐘舵��=婊′粨锛屽彲濉�</Property>
+            <Property name="style">
+              <Property name="color">blue</Property>
+            </Property>
+          </Label>
           <AutoFormElement layoutConstraint="colSpan:2">
             <Property name="name">remark</Property>
             <Property name="property">remark</Property>
@@ -285,7 +335,7 @@
     <YearDropDown id="yearDropDown1"/>
     <CustomDropDown id="ddFoodOrigin">
       <Property name="minHeight">500</Property>
-      <Property name="assignmentMap">foodLocation=name</Property>
+      <Property name="assignmentMap">foodLocation=name,foodLocationId=code</Property>
       <Property name="minWidth">500</Property>
       <Container layout="regionPadding:5">
         <DataSet id="dsFoodOrigin">
@@ -355,10 +405,5 @@
       <Property name="titleName">{&quot;unit&quot;:&quot;KG&quot;,&quot;title&quot;:&quot;浠撳簱淇℃伅鍒楄〃&quot;,&quot;timeDesc&quot;:&quot;now()&quot;}</Property>
       <Property name="showTitle">true</Property>
     </Export2ReportAction>
-    <DataSetDropDown id="dsddDepot">
-      <Property name="dataSet">dsDepot</Property>
-      <Property name="assignmentMap">depotId=id,depotStatus=depotStatus,storeType=storeType,foodType=foodType,foodVariety=foodVariety,foodLevel=foodLevel,foodLocation=foodLocation,depotStatus=depotStatus,foodYear=foodYear,storeDate=storeDate</Property>
-      <Property name="property">name</Property>
-    </DataSetDropDown>
   </View>
 </ViewConfig>
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java b/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java
index 247e658..7bde68b 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java
@@ -5,7 +5,6 @@
 import com.bstek.dorado.annotation.Expose;
 import com.bstek.dorado.data.provider.Page;
 import com.ld.igds.models.DepotStore;
-import com.ld.igds.view.service.HDepotService;
 import com.ld.igds.view.service.HDepotStoreService;
 import org.springframework.stereotype.Component;
 
@@ -30,19 +29,17 @@
 
 
     /**
-     * depotStorePR#pageListDepotStore
+     * depotStorePR#pageList
      *
      * @Desc: 鍒嗛〉鏌ヨ搴撳瓨淇℃伅
      * @author: Andy
      * @update-time: 2022/11/17
      */
     @DataProvider
-    public void pageListDepotStore(Page<DepotStore> page, Map<String, Object> param) throws Exception {
-
+    public void pageList(Page<DepotStore> page, Map<String, Object> param) throws Exception {
         if (null == param) {
             param = new HashMap<>();
         }
-
         depotStoreService.listDepotStore(page, param);
     }
 
@@ -53,10 +50,12 @@
      */
     @DataResolver
     public void saveDepotStore(DepotStore data) {
+    	
+    	//TODO 鏍规嵁椤甸潰璇存槑澧炲姞淇濆瓨鍓嶉獙璇� 2023骞�5鏈�27鏃� 18:53:56
 
         depotStoreService.saveDepotStore(data);
 
-        //鏇存柊搴撳瓨鍜岀姸鎬�
+        //鏍规嵁搴撳瓨淇℃伅鏇存柊鍒颁粨搴撲俊鎭紝浠撳簱鍌ㄧ伯淇℃伅浠ュ綋鍓嶄负鍑�
         depotPR.updateByStore(data);
 
         //杩滅▼鍚屾鐘舵��
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java b/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
index c179f71..4f84db9 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
@@ -45,8 +45,9 @@
         }
 
         String countHql = " select count(*) " + hql;
-        hql += " order by createDate desc";
-
+        
+        hql += " order by updateDate desc";
+        
         this.pagingQuery(page, hql, countHql, args);
     }
 
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index e786bc0..c2e1770 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -188,18 +188,24 @@
     </PropertyDef>
     <PropertyDef name="buildingId">
       <Property></Property>
-      <Property name="label">鎵�灞炲缓绛�</Property>
+      <Property name="label">鎵�灞炰粨鎴�</Property>
       <Property name="mapping">
         <Property name="mapValues">${dorado.getDataProvider(&quot;buildingPR#getCacheBuilding&quot;).getResult()}</Property>
         <Property name="keyProperty">id</Property>
         <Property name="valueProperty">name</Property>
       </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="granaryId">
+      <Property></Property>
+      <Property name="label">鎵�灞炲粧闂�</Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="depotType">
       <Property></Property>
-      <Property name="label">浠撳簱绫诲瀷</Property>
+      <Property name="label">浠撴埧绫诲瀷</Property>
       <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;DEPOT_TYPE&quot;)}</Property>
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerDepotType&quot;).getResult()}</Property>
         <Property name="keyProperty">code</Property>
         <Property name="valueProperty">name</Property>
       </Property>
@@ -209,20 +215,23 @@
       <Property></Property>
       <Property name="label">浠撳簱鐘舵��</Property>
       <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;DEPOT_STATUS&quot;)}</Property>
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerDepotStatus&quot;).getResult()}</Property>
         <Property name="keyProperty">code</Property>
         <Property name="valueProperty">name</Property>
       </Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="storageMax">
       <Property name="dataType">Double</Property>
-      <Property name="label">璁捐浠撳</Property>
+      <Property name="label">璁捐鍌ㄩ噺</Property>
       <Property name="displayFormat">#,##0 KG</Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="storageReal">
       <Property name="dataType">Double</Property>
       <Property name="label">瀹為檯鍌ㄩ噺</Property>
       <Property name="displayFormat">#,##0 KG</Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="storeType">
       <Property></Property>
@@ -233,10 +242,6 @@
         <Property name="valueProperty">name</Property>
       </Property>
       <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="orientation">
-      <Property></Property>
-      <Property name="label">浠撳簱鏈濆悜</Property>
     </PropertyDef>
     <PropertyDef name="foodType">
       <Property></Property>
@@ -260,7 +265,7 @@
       <Property></Property>
       <Property name="label">绮绛夌骇</Property>
       <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerFoodLevel&quot;).getResult()}</Property>
         <Property name="keyProperty">code</Property>
         <Property name="valueProperty">name</Property>
       </Property>
@@ -286,7 +291,7 @@
     </PropertyDef>
     <PropertyDef name="storeKeeper">
       <Property></Property>
-      <Property name="label">淇濈鍛樿处鍙�</Property>
+      <Property name="label">淇濈鍛�</Property>
     </PropertyDef>
     <PropertyDef name="storeKeeperName">
       <Property></Property>
@@ -294,7 +299,7 @@
     </PropertyDef>
     <PropertyDef name="checkDate">
       <Property name="dataType">Date</Property>
-      <Property name="label">璐ㄦ鏃ユ湡</Property>
+      <Property name="label">鏈�鍚庤川妫�鏃ユ湡</Property>
     </PropertyDef>
     <PropertyDef name="storeDate">
       <Property name="dataType">Date</Property>
@@ -308,21 +313,151 @@
       <Property></Property>
       <Property name="label">澶囨敞</Property>
     </PropertyDef>
-    <PropertyDef name="foodVarietyName">
+  </DataType>
+  <DataType name="dtDepotStore">
+    <Property name="creationType">com.ld.igds.models.DepotStore</Property>
+    <PropertyDef name="id">
       <Property></Property>
-      <Property name="label">绮鍝佺</Property>
     </PropertyDef>
-    <PropertyDef name="foodTypeName">
+    <PropertyDef name="companyId">
+      <Property></Property>
+      <Property name="label">缁勭粐缂栫爜</Property>
+    </PropertyDef>
+    <PropertyDef name="deptId">
+      <Property></Property>
+      <Property name="label">鎵�灞炲垎搴�</Property>
+    </PropertyDef>
+    <PropertyDef name="depotId">
+      <Property></Property>
+      <Property name="label">鎵�灞炰粨搴�</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="country">
+      <Property></Property>
+      <Property name="label">鍥藉埆</Property>
+    </PropertyDef>
+    <PropertyDef name="manageType">
+      <Property></Property>
+      <Property name="label">绠＄悊鏂瑰紡</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerManagerType&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="storeType">
+      <Property></Property>
+      <Property name="label">鍌ㄧ伯鏂瑰紡</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStoreType&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="depotStatus">
+      <Property></Property>
+      <Property name="label">璐т綅鐘舵��</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerDepotStatus&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="foodType">
       <Property></Property>
       <Property name="label">绮鎬ц川</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
     </PropertyDef>
-    <PropertyDef name="depotTypeName">
+    <PropertyDef name="foodVariety">
       <Property></Property>
-      <Property name="label">浠撳簱绫诲瀷</Property>
+      <Property name="label">绮鍝佺</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
     </PropertyDef>
-    <PropertyDef name="foodLevelName">
+    <PropertyDef name="foodLevel">
       <Property></Property>
       <Property name="label">绮绛夌骇</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerFoodLevel&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="foodLocationId">
+      <Property></Property>
+      <Property name="label">绮浜у湴</Property>
+    </PropertyDef>
+    <PropertyDef name="foodLocation">
+      <Property></Property>
+      <Property name="label">绮浜у湴</Property>
+    </PropertyDef>
+    <PropertyDef name="foodYear">
+      <Property></Property>
+      <Property name="label">鏀惰揣骞村害</Property>
+    </PropertyDef>
+    <PropertyDef name="storeDate">
+      <Property name="dataType">DateTime</Property>
+      <Property name="label">鍏ヤ粨鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="storageReal">
+      <Property name="dataType">Double</Property>
+      <Property name="label">瀹為檯鍌ㄩ噺</Property>
+      <Property name="displayFormat">#,##0 KG</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="storageSettle">
+      <Property name="dataType">Double</Property>
+      <Property name="label">璁′环鏁伴噺</Property>
+      <Property name="displayFormat">#,##0 KG</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="fullDate">
+      <Property name="dataType">Date</Property>
+      <Property name="label">灏佷粨鏃ユ湡</Property>
+    </PropertyDef>
+    <PropertyDef name="outDate">
+      <Property name="label">鍑轰粨瀹屾垚鏃堕棿</Property>
+      <Property name="dataType">DateTime</Property>
+    </PropertyDef>
+    <PropertyDef name="grainHeight">
+      <Property name="dataType">Double</Property>
+      <Property name="label">瑁呯伯绾块珮</Property>
+      <Property name="displayFormat">0.00 绫�</Property>
+    </PropertyDef>
+    <PropertyDef name="grainVolume">
+      <Property name="dataType">Double</Property>
+      <Property name="label">瑁呯伯浣撶Н</Property>
+      <Property name="displayFormat">0.00 绔嬫柟绫�</Property>
+    </PropertyDef>
+    <PropertyDef name="remark">
+      <Property></Property>
+      <Property name="label">澶囨敞</Property>
+    </PropertyDef>
+    <PropertyDef name="updateUser">
+      <Property></Property>
+      <Property name="label">淇敼浜�</Property>
+    </PropertyDef>
+    <PropertyDef name="updateDate">
+      <Property name="dataType">Date</Property>
+      <Property name="label">淇敼鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="createDate">
+      <Property name="dataType">Date</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtDevice">
@@ -1152,136 +1287,6 @@
     </PropertyDef>
     <PropertyDef name="type">
       <Property name="label">绫诲瀷</Property>
-    </PropertyDef>
-  </DataType>
-  <DataType name="dtDepotStore">
-    <Property name="creationType">com.ld.igds.models.DepotStore</Property>
-    <PropertyDef name="id">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="companyId">
-      <Property></Property>
-      <Property name="label">缁勭粐缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="deptId">
-      <Property></Property>
-      <Property name="label">鎵�灞炲垎搴�</Property>
-    </PropertyDef>
-    <PropertyDef name="depotId">
-      <Property></Property>
-      <Property name="label">鎵�灞炰粨搴�</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="storeType">
-      <Property></Property>
-      <Property name="label">鍌ㄧ伯鏂瑰紡</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStoreType&quot;).getResult()}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="depotStatus">
-      <Property></Property>
-      <Property name="label">浠撳簱鐘舵��</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;DEPOT_STATUS&quot;)}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodType">
-      <Property></Property>
-      <Property name="label">绮鎬ц川</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodVariety">
-      <Property></Property>
-      <Property name="label">绮鍝佺</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodLevel">
-      <Property></Property>
-      <Property name="label">绮绛夌骇</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodLocation">
-      <Property></Property>
-      <Property name="label">绮浜у湴</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodYear">
-      <Property></Property>
-      <Property name="label">鏀惰揣骞村害</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="storeDate">
-      <Property name="dataType">DateTime</Property>
-      <Property name="label">鍏ヤ粨鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="storageReal">
-      <Property name="dataType">Double</Property>
-      <Property name="label">瀹為檯鍌ㄩ噺</Property>
-      <Property name="displayFormat">#,##0 KG</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="fullDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">灏佷粨鏃ユ湡</Property>
-    </PropertyDef>
-    <PropertyDef name="outDate">
-      <Property name="label">鍑轰粨鏃堕棿</Property>
-      <Property name="dataType">DateTime</Property>
-    </PropertyDef>
-    <PropertyDef name="grainHeight">
-      <Property name="dataType">Double</Property>
-      <Property name="label">瑁呯伯绾块珮</Property>
-      <Property name="displayFormat">0.00 绫�</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="grainVolume">
-      <Property name="dataType">Double</Property>
-      <Property name="label">瑁呯伯浣撶Н</Property>
-      <Property name="displayFormat">0.00 绔嬫柟绫�</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞</Property>
-    </PropertyDef>
-    <PropertyDef name="updateUser">
-      <Property></Property>
-      <Property name="label">淇敼浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">淇敼鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="createDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtFileData">
diff --git a/igds-doc/sql/update-v35-to-v40.sql b/igds-doc/sql/update-v35-to-v40.sql
index 49d48fa..8eb63a1 100644
--- a/igds-doc/sql/update-v35-to-v40.sql
+++ b/igds-doc/sql/update-v35-to-v40.sql
@@ -23,4 +23,25 @@
 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
+RENAME TABLE D_CREDIT TO D_INTOU_CREDIT;
+
+
+-- 鍗囩骇浠撴埧鐘舵�� 1=绌轰粨銆�2=鍏ュ簱涓��3=婊′粨銆�4=鍑哄簱涓��9=鍏朵粬 銆�31姘旇皟涓��32鐔忚捀涓��33閫氶涓� 34娓╂帶涓�
+UPDATE D_DEPOT SET DEPOT_STATUS_ = '1' WHERE DEPOT_STATUS_ ='01';
+UPDATE D_DEPOT SET DEPOT_STATUS_ = '2' WHERE DEPOT_STATUS_ ='03';
+UPDATE D_DEPOT SET DEPOT_STATUS_ = '3' WHERE DEPOT_STATUS_ ='02';
+UPDATE D_DEPOT SET DEPOT_STATUS_ = '4' WHERE DEPOT_STATUS_ ='04';
+UPDATE D_DEPOT SET DEPOT_STATUS_ = '31' WHERE DEPOT_STATUS_ ='05';
+UPDATE D_DEPOT SET DEPOT_STATUS_ = '32' WHERE DEPOT_STATUS_ ='06';
+UPDATE D_DEPOT SET DEPOT_STATUS_ = '33' WHERE DEPOT_STATUS_ ='07';
+UPDATE D_DEPOT SET DEPOT_STATUS_ = '34' WHERE DEPOT_STATUS_ ='09';
+
+UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '1' WHERE DEPOT_STATUS_ ='01';
+UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '2' WHERE DEPOT_STATUS_ ='03';
+UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '3' WHERE DEPOT_STATUS_ ='02';
+UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '4' WHERE DEPOT_STATUS_ ='04';
+UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '31' WHERE DEPOT_STATUS_ ='05';
+UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '32' WHERE DEPOT_STATUS_ ='06';
+UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '33' WHERE DEPOT_STATUS_ ='07';
+UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '34' WHERE DEPOT_STATUS_ ='09';
+
diff --git a/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java b/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
index 3e863ea..511c9c9 100644
--- a/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
+++ b/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
@@ -139,8 +139,8 @@
 
 
             //鍙湁鍑哄叆搴撶姸鎬佺殑浠撳簱鎵嶈繘琛岀粺璁★紝鍏朵粬鐘舵�佽〃绀哄嚭鍏ュ簱浣滀笟瀹屾垚锛屼笉鍦ㄦ墽琛岀粺璁�
-            if (DepotStatus.STATUS_03.getCode().equals(lastStore.getDepotStatus()) ||
-                    DepotStatus.STATUS_04.getCode().equals(lastStore.getDepotStatus())) {
+            if (DepotStatus.STATUS_2.getCode().equals(lastStore.getDepotStatus()) ||
+                    DepotStatus.STATUS_4.getCode().equals(lastStore.getDepotStatus())) {
 
                 param = new InoutParam();
                 //param.setStart(lastStore.getCreateDate());
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java
index bae90bd..0c99b58 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java
+++ b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java
@@ -3,7 +3,6 @@
 import com.ld.igds.constant.*;
 import com.ld.igds.io.request.ExeDevice;
 import com.ld.igds.n2.N2ModelTag;
-import com.ld.igds.n2.N2Util;
 import com.ld.igds.util.ContextUtil;
 import com.ld.igds.verb.AreationModel;
 import org.apache.commons.lang3.StringUtils;
@@ -97,15 +96,15 @@
     public static String RESP_9999 = "9999";//	鏈煡閿欒
 
     //浠撳簱鐘舵��
-    static String DEPOT_STATUS_1001 = "1001";
-    static String DEPOT_STATUS_2001 = "2001";
-    static String DEPOT_STATUS_3001 = "3001";
-    static String DEPOT_STATUS_4001 = "4001";
-    static String DEPOT_STATUS_5001 = "5001";
-    static String DEPOT_STATUS_6001 = "6001";
-    static String DEPOT_STATUS_7001 = "7001";
-    static String DEPOT_STATUS_8001 = "8001";
-    static String DEPOT_STATUS_9001 = "9001";
+    static String DEPOT_STATUS_1001 = "1001";//閫氶
+    static String DEPOT_STATUS_2001 = "2001";//姘旇皟
+    static String DEPOT_STATUS_3001 = "3001";//鐔忚捀
+    static String DEPOT_STATUS_4001 = "4001";//娓╂帶
+    static String DEPOT_STATUS_5001 = "5001";//缁翠慨
+    static String DEPOT_STATUS_6001 = "6001";//鍑哄簱
+    static String DEPOT_STATUS_7001 = "7001";//鍏ュ簱
+    static String DEPOT_STATUS_8001 = "8001";//婊′粨
+    static String DEPOT_STATUS_9001 = "9001";//绌轰粨
 
     //璁惧绫诲瀷
     public static String DEVICE_TYPE_1 = "1";// 椋庣獥
@@ -189,65 +188,60 @@
      * @return
      */
     public static String analysisDepotStatus(String status) {
-
         if (null == status) return null;
-
         if (status.equals(DEPOT_STATUS_1001)) {
-            return DepotStatus.STATUS_07.getCode();
+            return DepotStatus.STATUS_33.getCode();
         }
         if (status.equals(DEPOT_STATUS_2001)) {
-            return DepotStatus.STATUS_05.getCode();
+            return DepotStatus.STATUS_31.getCode();
         }
         if (status.equals(DEPOT_STATUS_3001)) {
-            return DepotStatus.STATUS_06.getCode();
+            return DepotStatus.STATUS_32.getCode();
         }
         if (status.equals(DEPOT_STATUS_4001)) {
-            return DepotStatus.STATUS_09.getCode();
+            return DepotStatus.STATUS_34.getCode();
         }
         if (status.equals(DEPOT_STATUS_5001)) {
-            return DepotStatus.STATUS_08.getCode();
+            return DepotStatus.STATUS_9.getCode();
         }
         if (status.equals(DEPOT_STATUS_6001)) {
-            return DepotStatus.STATUS_04.getCode();
+            return DepotStatus.STATUS_4.getCode();
         }
         if (status.equals(DEPOT_STATUS_7001)) {
-            return DepotStatus.STATUS_03.getCode();
+            return DepotStatus.STATUS_2.getCode();
         }
         if (status.equals(DEPOT_STATUS_8001)) {
-            return DepotStatus.STATUS_02.getCode();
+            return DepotStatus.STATUS_3.getCode();
         }
-
-        return DepotStatus.STATUS_01.getCode();
+        return DepotStatus.STATUS_1.getCode();
     }
 
     public static String getDepotSendStatus(String status) {
-
-        if (status.equals(DepotStatus.STATUS_07.getCode())) {
+        if (status.equals(DepotStatus.STATUS_33.getCode())) {
             return DEPOT_STATUS_1001;
         }
-
-        if (status.equals(DepotStatus.STATUS_05.getCode())) {
+        if (status.equals(DepotStatus.STATUS_31.getCode())) {
             return DEPOT_STATUS_2001;
         }
-        if (status.equals(DepotStatus.STATUS_06.getCode())) {
+        if (status.equals(DepotStatus.STATUS_32.getCode())) {
             return DEPOT_STATUS_3001;
         }
-        if (status.equals(DepotStatus.STATUS_09.getCode())) {
+        if (status.equals(DepotStatus.STATUS_34.getCode())) {
             return DEPOT_STATUS_4001;
         }
-        if (status.equals(DepotStatus.STATUS_08.getCode())) {
+        if (status.equals(DepotStatus.STATUS_9.getCode())) {
             return DEPOT_STATUS_5001;
         }
-        if (status.equals(DepotStatus.STATUS_04.getCode())) {
+        if (status.equals(DepotStatus.STATUS_4.getCode())) {
             return DEPOT_STATUS_6001;
         }
-        if (status.equals(DepotStatus.STATUS_03.getCode())) {
+        if (status.equals(DepotStatus.STATUS_2.getCode())) {
             return DEPOT_STATUS_7001;
         }
-        if (status.equals(DepotStatus.STATUS_02.getCode())) {
+        if (status.equals(DepotStatus.STATUS_3.getCode())) {
             return DEPOT_STATUS_8001;
         }
-        return DepotStatus.STATUS_01.getCode();
+        return DepotStatus.STATUS_1.getCode();
     }
 
     /**

--
Gitblit v1.9.3