From a87eff704037284e46568c7c7b8a60caaae884c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 17 五月 2023 20:22:44 +0800
Subject: [PATCH] 调整计划管理模块
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 12
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml | 2
igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml | 2
igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java | 9
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 40 +-
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java | 8
igds-manager/src/main/java/com/ld/igds/m/view/PlanManageAudit.view.xml | 2
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java | 6
igds-api-inte/src/main/java/com/ld/igds/three/controller/ThreeController.java | 2
igds-inout/src/main/java/com/ld/igds/models/InoutPlan.java | 93 ++++++
igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml | 2
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml | 4
igds-web/src/main/resources/application.yml | 2
igds-core/src/main/java/com/ld/igds/models/InoutRecord.java | 31 +-
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml | 2
igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java | 383 ++++++++++++++------------
igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java | 14
igds-inout/src/main/java/com/ld/igds/models/InoutPlanDetail.java | 71 +++++
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml | 4
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml | 4
igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java | 4
igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java | 33 +-
igds-web/src/main/resources/dorado-home/configure.properties | 4
igds-core/src/main/java/com/ld/igds/constant/TransType.java | 4
igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java | 3
igds-api-inte/src/main/java/com/ld/igds/three/ThreeConstant.java | 0
igds-api-inte/src/main/java/com/ld/igds/three/manager/ThreeManager.java | 1
/dev/null | 70 -----
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml | 2
igds-api-inte/src/main/java/com/ld/igds/three/ThreeCodeEnum.java | 0
igds-doc/sql/update-v35-to-v40.sql | 4
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml | 4
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java | 14
33 files changed, 479 insertions(+), 357 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java
index a638503..211165d 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java
@@ -5,7 +5,7 @@
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MPlan;
+import com.ld.igds.models.InoutPlan;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1501;
import com.ld.igds.sh.param.ApiRequest;
@@ -62,7 +62,7 @@
redisUtil.set(key, param.getEndTime());
//鏌ヨ璁″垝淇℃伅
- List<MPlan> dataList = hApiShServiceImpl.listPlan(companyId,
+ List<InoutPlan> dataList = hApiShServiceImpl.listPlan(companyId,
InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
@@ -75,7 +75,7 @@
InteStatusLog log;
InteStatusLog addLog;
//灏佽鏁版嵁淇℃伅
- for (MPlan plan : dataList) {
+ for (InoutPlan plan : dataList) {
dto1501 = new Dto1501();
dto1501.setJhbm(plan.getId());
dto1501.setJhnd(StringUtils.isEmpty(plan.getYear())?DateFormatUtils.format(plan.getCreateTime(), "yyyy"):plan.getYear());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
index c67efc9..ec87b3c 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
@@ -6,8 +6,8 @@
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MPlan;
-import com.ld.igds.models.MPlanDetail;
+import com.ld.igds.models.InoutPlan;
+import com.ld.igds.models.InoutPlanDetail;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1502;
import com.ld.igds.sh.param.ApiRequest;
@@ -63,16 +63,16 @@
redisUtil.set(key, param.getEndTime());
//鏌ヨ杞崲璁″垝淇℃伅
- List<MPlan> planList = hApiShServiceImpl.listPlan(companyId,
+ List<InoutPlan> planList = hApiShServiceImpl.listPlan(companyId,
InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());
if (planList == null || planList.isEmpty()) {
return RespUtil.error(RespCodeEnum.CODE_2000.getCode(), request);
}
//鏌ヨ杞崲鏄庣粏璁″垝淇℃伅
- List<MPlanDetail> list0 = new ArrayList<>();
- List<MPlanDetail> dataList;
- for (MPlan plan : planList) {
+ List<InoutPlanDetail> list0 = new ArrayList<>();
+ List<InoutPlanDetail> dataList;
+ for (InoutPlan plan : planList) {
dataList = hApiShServiceImpl.getPlanDetail(plan.getId());
if(null != dataList){
list0.addAll(dataList);
@@ -90,7 +90,7 @@
//鏌ヨ搴撳尯淇℃伅
List<DefaultDept> deptList = hApiShServiceImpl.listDept(companyId, companyId);
DefaultDept dept = deptList.get(0);
- for (MPlanDetail planDetail : list0) {
+ for (InoutPlanDetail planDetail : list0) {
dto1502 = new Dto1502();
dto1502.setJhmxbm(planDetail.getId());
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 baeab8f..d5417f8 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
@@ -4,7 +4,6 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.models.*;
-import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
@@ -721,8 +720,8 @@
* @param endTime
* @return
*/
- public List<MPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
- String hql = " from " + MPlan.class.getName() + " where companyId =:companyId";
+ public List<InoutPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
+ String hql = " from " + InoutPlan.class.getName() + " where companyId =:companyId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", companyId);
@@ -751,9 +750,9 @@
* @param planId
* @return
*/
- public List<MPlanDetail> getPlanDetail(String planId) {
+ public List<InoutPlanDetail> getPlanDetail(String planId) {
- String hql = " from " + MPlanDetail.class.getName() + " where planId =:planId";
+ String hql = " from " + InoutPlanDetail.class.getName() + " where planId =:planId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("planId", planId);
diff --git a/igds-api-inte/src/main/java/com/ld/igds/three/constant/ThreeCodeEnum.java b/igds-api-inte/src/main/java/com/ld/igds/three/ThreeCodeEnum.java
similarity index 100%
rename from igds-api-inte/src/main/java/com/ld/igds/three/constant/ThreeCodeEnum.java
rename to igds-api-inte/src/main/java/com/ld/igds/three/ThreeCodeEnum.java
diff --git a/igds-api-inte/src/main/java/com/ld/igds/three/constant/ThreeConstant.java b/igds-api-inte/src/main/java/com/ld/igds/three/ThreeConstant.java
similarity index 100%
rename from igds-api-inte/src/main/java/com/ld/igds/three/constant/ThreeConstant.java
rename to igds-api-inte/src/main/java/com/ld/igds/three/ThreeConstant.java
diff --git a/igds-api-inte/src/main/java/com/ld/igds/three/controller/ThreeController.java b/igds-api-inte/src/main/java/com/ld/igds/three/controller/ThreeController.java
index 2af5261..d8c3eed 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/three/controller/ThreeController.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/three/controller/ThreeController.java
@@ -16,7 +16,9 @@
import com.ld.igds.three.util.ThreeRespUtil;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.FilesUtil;
+
import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/igds-api-inte/src/main/java/com/ld/igds/three/manager/ThreeManager.java b/igds-api-inte/src/main/java/com/ld/igds/three/manager/ThreeManager.java
index 007fd9a..7a39a00 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/three/manager/ThreeManager.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/three/manager/ThreeManager.java
@@ -6,6 +6,7 @@
import com.ld.igds.three.param.ThreeRequest;
import com.ld.igds.three.service.ThreeService;
import com.ld.igds.three.util.ThreeRespUtil;
+
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
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 a362ab4..7f65933 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
@@ -584,8 +584,8 @@
* @param endTime
* @return
*/
- public List<MPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
- String hql = " from " + MPlan.class.getName() + " where companyId =:companyId";
+ public List<InoutPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
+ String hql = " from " + InoutPlan.class.getName() + " where companyId =:companyId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", companyId);
@@ -614,9 +614,9 @@
* @param planId
* @return
*/
- public List<MPlanDetail> getPlanDetail(String planId) {
+ public List<InoutPlanDetail> getPlanDetail(String planId) {
- String hql = " from " + MPlanDetail.class.getName() + " where planId =:planId";
+ String hql = " from " + InoutPlanDetail.class.getName() + " where planId =:planId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("planId", planId);
diff --git a/igds-core/src/main/java/com/ld/igds/constant/TransType.java b/igds-core/src/main/java/com/ld/igds/constant/TransType.java
index d52d62f..f5c4e57 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/TransType.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/TransType.java
@@ -7,8 +7,8 @@
TYPE_1("1", "姹借溅"),
TYPE_2("2", "鐏溅"),
TYPE_3("3", "杞埞"),
- TYPE_9("9", "鍏朵粬"),
- ;
+ TYPE_9("9", "鍏朵粬");
+
private String code;
private String name;
diff --git a/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java b/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
index b04ab37..56819c7 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
@@ -10,207 +10,234 @@
*/
public class InoutConstant {
- /**
- * 榛樿韬唤璇�
- */
- public static final String DEFAULT_ID_CARD = "100000000000000000";
+ /**
+ * 榛樿韬唤璇�
+ */
+ public static final String DEFAULT_ID_CARD = "100000000000000000";
- /**
- * 缂撳瓨-鍏ュ簱ID
- */
- public static final String CACHE_RECORD_ID = "RECORD_ID";
+ /**
+ * 缂撳瓨-鍏ュ簱ID
+ */
+ public static final String CACHE_RECORD_ID = "RECORD_ID";
- /**
- * 缂撳瓨KEY-鍑哄叆搴撻厤缃俊鎭紦瀛�
- */
- public static final String CACHE_INOUT_CONF_LIST = "INOUT_CONF";
+ /**
+ * 缂撳瓨KEY-鍑哄叆搴撻厤缃俊鎭紦瀛�
+ */
+ public static final String CACHE_INOUT_CONF_LIST = "INOUT_CONF";
- /**
- * 缂撳瓨KEY-鍑哄叆搴撴祦绋嬮厤缃俊鎭�
- */
- public static final String CACHE_INOUT_SYS_CONF = "INOUT_SYS_CONF";
+ /**
+ * 缂撳瓨KEY-鍑哄叆搴撴祦绋嬮厤缃俊鎭�
+ */
+ public static final String CACHE_INOUT_SYS_CONF = "INOUT_SYS_CONF";
- /**
- * 涓存椂缂撳瓨锛屽瓨鏀惧綋鍓嶇殑鍑哄叆搴撲俊鎭�
- */
- public static final String KEY_INOUT_LIST = "INOUT_LIST";
+ /**
+ * 涓存椂缂撳瓨锛屽瓨鏀惧綋鍓嶇殑鍑哄叆搴撲俊鎭�
+ */
+ public static final String KEY_INOUT_LIST = "INOUT_LIST";
- /**
- * 涓存椂缂撳瓨锛屽瓨鏀惧綋鍓嶇殑鍑哄叆搴撲俊鎭椂闂达紝鍑哄叆搴撶紦瀛樺彲鑳藉瓨鍦ㄤ袱澶╁畬鎴愮殑鎯呭喌锛屾椂闂磋皟鏁翠负48灏忔椂
- */
- public static final long KEY_INOUT_LIST_TIME = 48 * 60 * 60;
-
-
- /**
- * 涓存椂缂撳瓨锛屽瓨鏀惧綋鏃ュ凡缁忓畬鎴愮殑鍑哄叆搴撲俊鎭�
- */
- public static final String KEY_INOUT_COMPLETE_LIST = "INOUT_COMPLETE";
-
- /**
- * 褰撴棩瀹屾垚鐨勫嚭鍏ュ簱淇℃伅浠诲姟鍒楄〃
- */
- public static final long KEY_INOUT_COMPLETE_LIST_TIME = 8 * 60 * 60;
-
-
-
- // 鎵︽牱-鍖栭獙鐘舵��
- public static final String STATUS_NONE = "NONE";
- // 鎵︽牱-鍖栭獙鐘舵��
- public static final String STATUS_PASS = "PASS";
- // 鎵︽牱-鍖栭獙鐘舵��
- public static final String STATUS_UNPASS = "UNPASS";
-
- /**
- * 鍖栭獙涓嶅悎鏍艰繘琛屾柟寮�
- */
- public static final String CHECK_NOPASS_NORMAL = "0"; //姝ｅ父娴佽浆
- public static final String CHECK_NOPASS_BACK = "1"; //鍑哄簱鏀跺崱
- public static final String CHECK_NOPASS_RECORD = "2"; //娴佺▼缁撴潫
-
- // 瀹屾垚鐘舵��-鏈畬鎴�
- public static final String COMPLETE_STATUS_NONE = "NONE";
- // 瀹屾垚鐘舵��-宸插畬鎴�
- public static final String COMPLETE_STATUS_COMPLETE = "COMPLETE";
-
- /** 璁惧鐘舵��-鏈煡鐘舵�� */
- public static final String MAC_STATUS_NONE = "NONE";
- /** 璁惧鐘舵��-姝ｅ父鐘舵�� */
- public static final String MAC_STATUS_NORMAL = "NORMAL";
- /** 璁惧鐘舵��-鏈繛鎺ャ�佹棤淇″彿 */
- public static final String MAC_STATUS_NO_SIGNAL = "NO_SIGNAL";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷 10 = 杞︾墝璇嗗埆
- */
- public static final String CONF_TYPE_10 = "10";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷 20 = 鎵︽牱鏈哄櫒
- */
- public static final String CONF_TYPE_20 = "20";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷 21 = 鍖栭獙鏈�
- */
- public static final String CONF_TYPE_21 = "21";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷 30 = 鍦扮
- */
- public static final String CONF_TYPE_30 = "30";
-
- /**
- * 鍑哄叆搴撻厤缃殑绫诲瀷40 = LED鏄剧ず灞忓箷
- */
- public static final String CONF_TYPE_40 = "40";
-
- /**
- * 鍖栭獙澶у睆瑙嗛
- */
- public static final String CONF_TYPE_50 = "50";
-
- /**
- * 鍑哄叆搴撴姄鎷嶆憚鍍忓ご
- */
- public static final String CONF_TYPE_60 = "60";
-
- /**
- * 绉伴噸涓绘帶鍒跺櫒
- */
- public static final String CONF_TYPE_70 = "70";
-
- /**
- * 鏅烘収鍗�
- */
- public static final String CONF_TYPE_80 = "80";
-
- // 鍑哄叆搴撶被鍨�-鍏ュ簱
- public static final String TYPE_IN = "IN";
-
- // 鍑哄叆搴撶被鍨�-鍑哄簱
- public static final String TYPE_OUT = "OUT";
-
- public static final String TYPE_NONE = "NONE";
-
- // 鏁版嵁鐘舵��-姝ｅ父
- public static final String RECORD_STATUS_NORMAL = "NORMAL";
- // 鏁版嵁鐘舵��-寮傚父
- public static final String RECORD_STATUS_ERROR = "ERROR";
- // 鏁版嵁鐘舵��-琛ュ綍
- public static final String RECORD_STATUS_ADD = "ADD";
- // 鏁版嵁鐘舵��-宸插垹闄�
- public static final String RECORD_STATUS_DEL = "DEL";
-
- // 娴佺▼-鐧昏
- public static final String PROGRESS_REGISTER = "REGISTER";
- // 娴佺▼-鍏ュ簱璐ㄦ
- public static final String PROGRESS_CHECK = "CHECK";
- // 娴佺▼-鍊间粨
- public static final String PROGRESS_HANDLE = "HANDLE";
- // 娴佺▼-绉伴噸锛屽寘鎷弧杞︾О閲嶆垨鑰呯┖杞︾О閲嶏紝褰撳墠鐘舵�佹瘮杈冪壒娈婏紝涓嶄綔涓烘祦绋嬭妭鐐癸紝鍙綔涓烘爣绛�
- public static final String PROGRESS_WEIGHT_TAG = "WEIGHT_TAG";
- // 娴佺▼-婊¤溅绉伴噸
- public static final String PROGRESS_WEIGHT_FULL = "WEIGHT_FULL";
- // 娴佺▼-绌鸿溅绉伴噸
- public static final String PROGRESS_WEIGHT_EMPTY = "WEIGHT_EMPTY";
- // 娴佺▼-缁撶畻
- public static final String PROGRESS_PAY = "PAY";
- // 娴佺▼-鍗＄墖鍥炴敹
- public static final String PROGRESS_CARD_BACK = "CARD_BACK";
-
- // 娴佺▼-澶囨锛堣〃绀烘祦绋嬫暣浣撳畬鎴愬悗澶囨锛�
- public static final String PROGRESS_RECORD = "RECORD";
+ /**
+ * 涓存椂缂撳瓨锛屽瓨鏀惧綋鍓嶇殑鍑哄叆搴撲俊鎭椂闂达紝鍑哄叆搴撶紦瀛樺彲鑳藉瓨鍦ㄤ袱澶╁畬鎴愮殑鎯呭喌锛屾椂闂磋皟鏁翠负48灏忔椂
+ */
+ public static final long KEY_INOUT_LIST_TIME = 48 * 60 * 60;
+ /**
+ * 涓存椂缂撳瓨锛屽瓨鏀惧綋鏃ュ凡缁忓畬鎴愮殑鍑哄叆搴撲俊鎭�
+ */
+ public static final String KEY_INOUT_COMPLETE_LIST = "INOUT_COMPLETE";
- public static final String CHECK_ITEM_C01 = "C01";//姘村垎
-
- public static final String CHECK_ITEM_C020101 = "020101";//姘村垎
-
- public static final String CHECK_ITEM_C01010301 = "01010301";//鏉傝川
-
- public static final String CHECK_ITEM_C02 = "C02";//鏉傝川
+ /**
+ * 褰撴棩瀹屾垚鐨勫嚭鍏ュ簱淇℃伅浠诲姟鍒楄〃
+ */
+ public static final long KEY_INOUT_COMPLETE_LIST_TIME = 8 * 60 * 60;
+ // 鎵︽牱-鍖栭獙鐘舵��
+ public static final String STATUS_NONE = "NONE";
+ // 鎵︽牱-鍖栭獙鐘舵��
+ public static final String STATUS_PASS = "PASS";
+ // 鎵︽牱-鍖栭獙鐘舵��
+ public static final String STATUS_UNPASS = "UNPASS";
+
+ /**
+ * 鍖栭獙涓嶅悎鏍艰繘琛屾柟寮�
+ */
+ public static final String CHECK_NOPASS_NORMAL = "0"; //姝ｅ父娴佽浆
+ public static final String CHECK_NOPASS_BACK = "1"; //鍑哄簱鏀跺崱
+ public static final String CHECK_NOPASS_RECORD = "2"; //娴佺▼缁撴潫
+
+ // 瀹屾垚鐘舵��-鏈畬鎴�
+ public static final String COMPLETE_STATUS_NONE = "NONE";
+ // 瀹屾垚鐘舵��-宸插畬鎴�
+ public static final String COMPLETE_STATUS_COMPLETE = "COMPLETE";
+
+ /**
+ * 璁惧鐘舵��-鏈煡鐘舵��
+ */
+ public static final String MAC_STATUS_NONE = "NONE";
+ /**
+ * 璁惧鐘舵��-姝ｅ父鐘舵��
+ */
+ public static final String MAC_STATUS_NORMAL = "NORMAL";
+ /**
+ * 璁惧鐘舵��-鏈繛鎺ャ�佹棤淇″彿
+ */
+ public static final String MAC_STATUS_NO_SIGNAL = "NO_SIGNAL";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷 10 = 杞︾墝璇嗗埆
+ */
+ public static final String CONF_TYPE_10 = "10";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷 20 = 鎵︽牱鏈哄櫒
+ */
+ public static final String CONF_TYPE_20 = "20";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷 21 = 鍖栭獙鏈�
+ */
+ public static final String CONF_TYPE_21 = "21";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷 30 = 鍦扮
+ */
+ public static final String CONF_TYPE_30 = "30";
+
+ /**
+ * 鍑哄叆搴撻厤缃殑绫诲瀷40 = LED鏄剧ず灞忓箷
+ */
+ public static final String CONF_TYPE_40 = "40";
+
+ /**
+ * 鍖栭獙澶у睆瑙嗛
+ */
+ public static final String CONF_TYPE_50 = "50";
+
+ /**
+ * 鍑哄叆搴撴姄鎷嶆憚鍍忓ご
+ */
+ public static final String CONF_TYPE_60 = "60";
+
+ /**
+ * 绉伴噸涓绘帶鍒跺櫒
+ */
+ public static final String CONF_TYPE_70 = "70";
+
+ /**
+ * 鏅烘収鍗�
+ */
+ public static final String CONF_TYPE_80 = "80";
+
+ // 鍑哄叆搴撶被鍨�-鍏ュ簱
+ public static final String TYPE_IN = "IN";
+
+ // 鍑哄叆搴撶被鍨�-鍑哄簱
+ public static final String TYPE_OUT = "OUT";
+
+ public static final String TYPE_NONE = "NONE";
+
+ // 鏁版嵁鐘舵��-姝ｅ父
+ public static final String RECORD_STATUS_NORMAL = "NORMAL";
+ // 鏁版嵁鐘舵��-寮傚父
+ public static final String RECORD_STATUS_ERROR = "ERROR";
+ // 鏁版嵁鐘舵��-琛ュ綍
+ public static final String RECORD_STATUS_ADD = "ADD";
+ // 鏁版嵁鐘舵��-宸插垹闄�
+ public static final String RECORD_STATUS_DEL = "DEL";
+
+ // 娴佺▼-鐧昏
+ public static final String PROGRESS_REGISTER = "REGISTER";
+ // 娴佺▼-鍏ュ簱璐ㄦ
+ public static final String PROGRESS_CHECK = "CHECK";
+ // 娴佺▼-鍊间粨
+ public static final String PROGRESS_HANDLE = "HANDLE";
+ // 娴佺▼-绉伴噸锛屽寘鎷弧杞︾О閲嶆垨鑰呯┖杞︾О閲嶏紝褰撳墠鐘舵�佹瘮杈冪壒娈婏紝涓嶄綔涓烘祦绋嬭妭鐐癸紝鍙綔涓烘爣绛�
+ public static final String PROGRESS_WEIGHT_TAG = "WEIGHT_TAG";
+ // 娴佺▼-婊¤溅绉伴噸
+ public static final String PROGRESS_WEIGHT_FULL = "WEIGHT_FULL";
+ // 娴佺▼-绌鸿溅绉伴噸
+ public static final String PROGRESS_WEIGHT_EMPTY = "WEIGHT_EMPTY";
+ // 娴佺▼-缁撶畻
+ public static final String PROGRESS_PAY = "PAY";
+ // 娴佺▼-鍗＄墖鍥炴敹
+ public static final String PROGRESS_CARD_BACK = "CARD_BACK";
+
+ // 娴佺▼-澶囨锛堣〃绀烘祦绋嬫暣浣撳畬鎴愬悗澶囨锛�
+ public static final String PROGRESS_RECORD = "RECORD";
+ public static final String CHECK_ITEM_C01 = "C01";//姘村垎
+
+ public static final String CHECK_ITEM_C020101 = "020101";//姘村垎
+
+ public static final String CHECK_ITEM_C01010301 = "01010301";//鏉傝川
+
+ public static final String CHECK_ITEM_C02 = "C02";//鏉傝川
+ /**
+ * 璁″垝绫诲瀷 -杞崲璁″垝
+ **/
+ public static final String PLAN_TYPE_01 = "01";
+ /**
+ * 璁″垝绫诲瀷 -閲囪喘璁″垝
+ **/
+ public static final String PLAN_TYPE_02 = "02";
+ /**
+ * 璁″垝绫诲瀷 -閿�鍞鍒�
+ **/
+ public static final String PLAN_TYPE_03 = "03";
+ /**
+ * 璁″垝绫诲瀷 -鐢熶骇鍔犲伐璁″垝
+ **/
+ public static final String PLAN_TYPE_04 = "04";
- /**
- * 鏍规嵁涓氬姟绫诲瀷鍜� 褰撳墠鐘舵�佽繑鍥炲綋鍓嶇姸鎬佺殑娴佺▼鍚嶇О
- *
- * @param type
- * @param progress
- * @return
- */
- public static String getProcessName(String type, String progress) {
+ /**
+ * 璁″垝鏄庣粏绫诲瀷 -杞嚭璁″垝
+ **/
+ public static final String PLAN_DETAIL_TYPE_1 = "1";
- if (PROGRESS_REGISTER.equals(progress))
- return "鐧昏";
+ /**
+ * 璁″垝鏄庣粏绫诲瀷 -杞叆璁″垝
+ **/
+ public static final String PLAN_DETAIL_TYPE_2 = "2";
- if (PROGRESS_CHECK.equals(progress))
- return "鍏ュ簱鎵︽牱娴佺▼";
- if (PROGRESS_HANDLE.equals(progress))
- return "鍊间粨娴佺▼";
+ /**
+ * 鏍规嵁涓氬姟绫诲瀷鍜� 褰撳墠鐘舵�佽繑鍥炲綋鍓嶇姸鎬佺殑娴佺▼鍚嶇О
+ *
+ * @param type
+ * @param progress
+ * @return
+ */
+ public static String getProcessName(String type, String progress) {
- if (PROGRESS_WEIGHT_FULL.equals(progress))
- return "婊¤溅绉伴噸娴佺▼";
+ if (PROGRESS_REGISTER.equals(progress))
+ return "鐧昏";
- if (PROGRESS_WEIGHT_EMPTY.equals(progress))
- return "绌鸿溅绉伴噸娴佺▼";
+ if (PROGRESS_CHECK.equals(progress))
+ return "鍏ュ簱鎵︽牱娴佺▼";
- if (PROGRESS_PAY.equals(progress))
- return "缁撶畻娴佺▼";
+ if (PROGRESS_HANDLE.equals(progress))
+ return "鍊间粨娴佺▼";
- if (PROGRESS_CARD_BACK.equals(progress))
- return "鍗＄墖鍥炴敹";
+ if (PROGRESS_WEIGHT_FULL.equals(progress))
+ return "婊¤溅绉伴噸娴佺▼";
- if (PROGRESS_RECORD.equals(progress))
- return "娴佺▼瀹屾垚";
+ if (PROGRESS_WEIGHT_EMPTY.equals(progress))
+ return "绌鸿溅绉伴噸娴佺▼";
- return "";
- }
+ if (PROGRESS_PAY.equals(progress))
+ return "缁撶畻娴佺▼";
+
+ if (PROGRESS_CARD_BACK.equals(progress))
+ return "鍗＄墖鍥炴敹";
+
+ if (PROGRESS_RECORD.equals(progress))
+ return "娴佺▼瀹屾垚";
+
+ return "";
+ }
}
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 d7ffef0..f309ff7 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
@@ -92,16 +92,12 @@
private String intelCard;
@Column(name = "PLATE_NUM_", length = 20)
- @PropertyDef(label = "杞︾墝鍙�")
+ @PropertyDef(label = "杞﹁埞鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
private String plateNum;
- @Column(name = "TRANS_TYPE_", length = 10)
- @PropertyDef(label = "杩愯緭鏂瑰紡", description = "姹借溅锛岀伀杞︺�佽疆鑸广�佸叾浠�")
+ @Column(name = "TRANS_TYPE_", length = 6)
+ @PropertyDef(label = "杩愯緭宸ュ叿")
private String transType = TransType.TYPE_1.getCode();
-
- @Column(name = "SPEC_TYPE_", length = 10)
- @PropertyDef(label = "瑙勬牸", description = "鏁ｇ伯锛�25kg, 50kg")
- private String specType = "鏁ｇ伯";
@Column(name = "CUSTOMER_ID_", length = 40)
@PropertyDef(label = "寰�鏉ュ崟浣�", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
@@ -123,7 +119,6 @@
@Column(name = "FOOD_LEVEL_", length = 40)
@PropertyDef(label = "绮绛夌骇")
private String foodLevel;
-
@Column(name = "FOOD_LOCATION_", length = 40)
@PropertyDef(label = "浜у湴鍚嶇О")
@@ -147,13 +142,13 @@
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 = "IMPURITY_")
+// @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣�")
+// private Double impurity = 0.0;
+//
+// @Column(name = "WET_")
+// @PropertyDef(label = "姘村垎", description = "鐧惧垎姣�")
+// private Double wet = 0.0;
@Column(name = "DE_IMPURITY_")
@PropertyDef(label = "鏉傝川鎵ｉ噸", description = "鍗曚綅KG")
@@ -255,6 +250,10 @@
private String settleTag = Constant.YN_N;
+ @Column(name = "SPEC_TYPE_", length = 10)
+ @PropertyDef(label = "瑙勬牸", description = "鏁ｇ伯锛�25kg, 50kg")
+ private String specType = "鏁ｇ伯";
+
//--------鐗堟湰4.0璋冩暣瀛楁 --------------//
// @Column(name = "jsdh", length = 42)
// @PropertyDef(label = "缁撶畻鍗曞彿")
@@ -279,8 +278,6 @@
// @Column(name = "bzbjs", length = 2)
// @PropertyDef(label = "鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
// private int bzbjs;
-
-
@Override
diff --git a/igds-doc/sql/update-v35-to-v40.sql b/igds-doc/sql/update-v35-to-v40.sql
index 37622de..5e4b783 100644
--- a/igds-doc/sql/update-v35-to-v40.sql
+++ b/igds-doc/sql/update-v35-to-v40.sql
@@ -1 +1,5 @@
-- 鐗堟湰V35鍗囩骇V40鑴氭湰 ---2023骞�5鏈�17鏃�
+
+-- 淇敼璁″垝琛ㄥ悕绉�
+RENAME TABLE D_M_PLAN TO D_INOUT_PLAN
+RENAME TABLE D_M_PLAN_DETAIL TO D_INOUT_PLAN_DETAIL;
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java
index 8726dfa..7dccbeb 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java
@@ -37,8 +37,7 @@
*/
@RequestMapping("/check-exe")
public @ResponseBody
- PageResponse<String> checkExe(
- @RequestBody SampleDto param) {
+ PageResponse<String> checkExe(@RequestBody SampleDto param) {
if (null == param.getIp()) {
return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(),
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 1fd9aa9..b24e026 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -139,12 +139,12 @@
continue;
}
- if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
- result.setWet(Double.valueOf(checkItem.getValue()));
- }
- if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
- result.setImpurity(Double.valueOf(checkItem.getValue()));
- }
+// if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
+// result.setWet(Double.valueOf(checkItem.getValue()));
+// }
+// if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
+// result.setImpurity(Double.valueOf(checkItem.getValue()));
+// }
}
}
}
@@ -392,14 +392,14 @@
progressData.setNoticeId(data.getNoticeId());
}
- // 鍥炲～姘村垎鍜屾潅璐�
- if (checkResult.getWet() > 0) {
- progressData.setWet(checkResult.getWet());
- }
-
- if (checkResult.getImpurity() > 0) {
- progressData.setImpurity(checkResult.getImpurity());
- }
+// // 鍥炲～姘村垎鍜屾潅璐�
+// if (checkResult.getWet() > 0) {
+// progressData.setWet(checkResult.getWet());
+// }
+//
+// if (checkResult.getImpurity() > 0) {
+// progressData.setImpurity(checkResult.getImpurity());
+// }
String msg = inoutService.updateData(progressData);
@@ -817,8 +817,8 @@
// 鍏堟墽琛屽寲楠屼俊鎭繚瀛�
CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(),data.getCheckItems());
if (null != checkResult) {
- if (null == data.getWet())data.setWet(checkResult.getWet());
- if (null == data.getImpurity())data.setImpurity(checkResult.getImpurity());
+// if (null == data.getWet())data.setWet(checkResult.getWet());
+// if (null == data.getImpurity())data.setImpurity(checkResult.getImpurity());
}
} else {
if (null == data.getEmptyWeightTime()) {
@@ -888,10 +888,10 @@
.updateCheckItems(data.getCheckId(), data.getCompanyId(),
data.getCheckItems());
if (null != checkResult) {
- if (null == data.getWet())
- data.setWet(checkResult.getWet());
- if (null == data.getImpurity())
- data.setImpurity(checkResult.getImpurity());
+// if (null == data.getWet())
+// data.setWet(checkResult.getWet());
+// if (null == data.getImpurity())
+// data.setImpurity(checkResult.getImpurity());
}
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 7f8068b..4219d59 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -308,12 +308,12 @@
bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());
bill.setSettleWeight(data.getSettleWeight());
- if(data.getWet() != null && data.getWet() > 0){
- bill.setWet(data.getWet() +"");
- }
- if(data.getImpurity() != null && data.getImpurity() > 0){
- bill.setImpurity(data.getImpurity()+"");
- }
+// if(data.getWet() != null && data.getWet() > 0){
+// bill.setWet(data.getWet() +"");
+// }
+// if(data.getImpurity() != null && data.getImpurity() > 0){
+// bill.setImpurity(data.getImpurity()+"");
+// }
bill.setPrice(data.getPrice()== null ? "" :data.getPrice() + "");
if(data.getSettleMoney() <= 0){
diff --git a/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java b/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
index ea1844f..5049650 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
@@ -1,6 +1,6 @@
package com.ld.igds.m;
-import com.ld.igds.models.MPlan;
+import com.ld.igds.models.InoutPlan;
import com.ld.igds.util.ContextUtil;
import java.util.List;
@@ -79,7 +79,7 @@
*
* @param type
*/
- public static String createPlanId(String type, String year, List<MPlan> list) {
+ public static String createPlanId(String type, String year, List<InoutPlan> list) {
String index = "001";
if(list != null && list.size() > 0){
String[] arr = list.get(0).getId().split("_");
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
index 4f587bc..d7af8ad 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
@@ -3,8 +3,8 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.m.InoutManageUtil;
-import com.ld.igds.models.MPlan;
-import com.ld.igds.models.MPlanDetail;
+import com.ld.igds.models.InoutPlan;
+import com.ld.igds.models.InoutPlanDetail;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
@@ -19,9 +19,9 @@
@Component
public class HPlanManageService extends HibernateDao {
- public void pagePlan(Page<MPlan> page, Map<String, Object> param)
+ public void pagePlan(Page<InoutPlan> page, Map<String, Object> param)
throws Exception {
- String hql = " from " + MPlan.class.getName()
+ String hql = " from " + InoutPlan.class.getName()
+ " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<String, Object>();
@@ -71,9 +71,9 @@
- public List<MPlanDetail> listPlanDetail(String planId) {
+ public List<InoutPlanDetail> listPlanDetail(String planId) {
- String hql = " from " + MPlanDetail.class.getName();
+ String hql = " from " + InoutPlanDetail.class.getName();
if(null != planId){
hql += " where planId=:planId ";
@@ -86,7 +86,7 @@
}
@Transactional
- public String delPlan(MPlan data) {
+ public String delPlan(InoutPlan data) {
Session session = this.getSessionFactory().openSession();
try {
if (null != data.getId()) {
@@ -102,7 +102,7 @@
return null;
}
- public String delPlanDetail(MPlanDetail data) {
+ public String delPlanDetail(InoutPlanDetail data) {
Session session = this.getSessionFactory().openSession();
try {
if (null != data.getId()) {
@@ -118,13 +118,13 @@
}
private void delPlanDetailByPlanId(String id, Session session) {
- String hql = " delete from " + MPlanDetail.class.getName()
+ String hql = " delete from " + InoutPlanDetail.class.getName()
+ " where planId=:planId";
session.createQuery(hql).setString("planId", id).executeUpdate();
}
- public void savePlan(MPlan data) {
+ public void savePlan(InoutPlan data) {
if (null == data.getCompanyId()) {
data.setCompanyId(ContextUtil.getCompanyId());
}
@@ -134,7 +134,7 @@
Session session = this.getSessionFactory().openSession();
try {
if (null == data.getId()) {
- List<MPlan> list = getPlanId(data);
+ List<InoutPlan> list = getPlanId(data);
data.setId(InoutManageUtil.createPlanId(data.getType(), data.getYear(), list));
data.setCreateUser(ContextUtil.getLoginUserCName());
data.setCreateTime(new Date());
@@ -151,15 +151,14 @@
}
}
- private void savePlanDetail(List<MPlanDetail> details, String planId,
- Session session) {
+ private void savePlanDetail(List<InoutPlanDetail> details, String planId,
+ Session session) {
if (null == details || details.isEmpty())
return;
- for (MPlanDetail planDetail : details) {
+ for (InoutPlanDetail planDetail : details) {
if (null == planDetail.getId()) {
planDetail.setPlanId(planId);
planDetail.setId(ContextUtil.getUUID());
- planDetail.setCreateTime(new Date());
session.save(planDetail);
} else {
session.update(planDetail);
@@ -167,8 +166,8 @@
}
}
- public List<MPlan> getPlanId(MPlan plan){
- String hql = " from " + MPlan.class.getName()
+ public List<InoutPlan> getPlanId(InoutPlan plan){
+ String hql = " from " + InoutPlan.class.getName()
+ " where companyId =:companyId and deptId =:deptId and year =:year";
Map<String,Object> args = new HashMap<String,Object>();
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml
index 8fbd35a..a6d22de 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage01.view.xml
@@ -206,7 +206,7 @@
</PropertyDef>
</DataType>
<DataType name="dtPlan">
- <Property name="creationType">com.ld.igds.models.MPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">璁″垝缂栫爜</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml
index e527807..d7cf635 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage02.view.xml
@@ -206,7 +206,7 @@
</PropertyDef>
</DataType>
<DataType name="dtPlan">
- <Property name="creationType">com.ld.igds.models.MPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">璁″垝缂栫爜</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml
index cf493b2..a7ace32 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage03.view.xml
@@ -206,7 +206,7 @@
</PropertyDef>
</DataType>
<DataType name="dtPlan">
- <Property name="creationType">com.ld.igds.models.MPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">璁″垝缂栫爜</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
index bc15816..8f17da5 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
@@ -171,7 +171,7 @@
</PropertyDef>
</DataType>
<DataType name="dtPlan">
- <Property name="creationType">com.ld.igds.models.MPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">璁″垝缂栫爜</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml
index 8e80b7b..494cb28 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml
@@ -214,7 +214,7 @@
</PropertyDef>
</DataType>
<DataType name="dtPlan">
- <Property name="creationType">com.ld.igds.models.MPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">璁″垝缂栫爜</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml
index 9a854b1..54be5e0 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.ld.igds.models.MPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">璁″垝缂栫爜</Property>
@@ -71,7 +71,7 @@
</Reference>
</DataType>
<DataType name="dtDetail">
- <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">ID_</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml
index 4d08ca3..b310801 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.ld.igds.models.MPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">璁″垝缂栫爜</Property>
@@ -71,7 +71,7 @@
</Reference>
</DataType>
<DataType name="dtDetail">
- <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">ID_</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml
index 44c4096..85ba443 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.ld.igds.models.MPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">璁″垝缂栫爜</Property>
@@ -71,7 +71,7 @@
</Reference>
</DataType>
<DataType name="dtDetail">
- <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">ID_</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml
index 1a2ed7e..51362bb 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.ld.igds.models.MPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">璁″垝缂栫爜</Property>
@@ -71,7 +71,7 @@
</Reference>
</DataType>
<DataType name="dtDetail">
- <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">ID_</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
index b0bbda3..c5659fc 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
@@ -8,8 +8,8 @@
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.m.service.HPlanManageService;
import com.ld.igds.models.DicTrigger;
-import com.ld.igds.models.MPlan;
-import com.ld.igds.models.MPlanDetail;
+import com.ld.igds.models.InoutPlan;
+import com.ld.igds.models.InoutPlanDetail;
import com.ld.igds.sys.service.SysDeptService;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
@@ -126,7 +126,7 @@
* @throws Exception
*/
@DataProvider
- public void pagePlan(Page<MPlan> page, Map<String, Object> param) throws Exception {
+ public void pagePlan(Page<InoutPlan> page, Map<String, Object> param) throws Exception {
if (null == param) {
param = new HashMap<String, Object>();
}
@@ -141,7 +141,7 @@
* @return
*/
@DataProvider
- public List<MPlanDetail> listPlanDetail(String planId) {
+ public List<InoutPlanDetail> listPlanDetail(String planId) {
return service.listPlanDetail(planId);
}
@@ -152,7 +152,7 @@
* @param data
*/
@DataResolver
- public void savePlan(MPlan data) {
+ public void savePlan(InoutPlan data) {
service.savePlan(data);
}
@@ -164,7 +164,7 @@
* @return
*/
@Expose
- public String delPlan(MPlan data) {
+ public String delPlan(InoutPlan data) {
return service.delPlan(data);
}
@@ -176,7 +176,7 @@
* @return
*/
@Expose
- public String delPlanDetail(MPlanDetail data){
+ public String delPlanDetail(InoutPlanDetail data){
return service.delPlanDetail(data);
}
}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutPlan.java b/igds-inout/src/main/java/com/ld/igds/models/InoutPlan.java
new file mode 100644
index 0000000..adc4d26
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutPlan.java
@@ -0,0 +1,93 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.ld.igds.inout.InoutConstant;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璁″垝绠＄悊-涓昏〃
+ * <p>
+ * 鍖呮嫭锛氭敹璐鍒掞紝閿�鍞鍒掞紝杞崲璁板綍锛岃鍒掓墽琛�
+ *
+ * @author: andy.jia
+ * @description: 鐗堟湰4.0瀛楁宸插
+ * @version:
+ * @data:2020骞�5鏈�27鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_PLAN")
+public class InoutPlan 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 = "TYPE_", length = 10)
+ @PropertyDef(label = "璁″垝绫诲瀷")
+ private String type = InoutConstant.PLAN_TYPE_01;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String name;
+
+ @Column(name = "REFERENCE_NUMBER_", length = 40)
+ @PropertyDef(label = "璁″垝鏂囧彿")
+ private String referenceNumber;
+
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "骞翠唤")
+ private String year;
+
+ @Column(name = "BEGIN_TIME_")
+ @PropertyDef(label = "寮�濮嬫椂闂�")
+ private Date beginTime;
+
+ @Column(name = "END_TIME_")
+ @PropertyDef(label = "鎴鏃堕棿")
+ private Date endTime;
+
+ @PropertyDef(label = "璁″垝涓嬭揪鍗曚綅")
+ @Column(name = "jhxddw", length = 18)
+ private String jhxddw;
+
+ @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿")
+ @Column(name = "jhxdsj")
+ private Date jhxdsj;
+
+ @Column(name = "CREATE_USER_", length = 30)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createUser;
+
+ @Column(name = "CREATE_TIME_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createTime;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ @Column(name = "REMARK_", length = 250)
+ @PropertyDef(label = "澶囨敞")
+ private String remark;
+
+ @Transient
+ private List<InoutPlanDetail> details;
+
+}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutPlanDetail.java b/igds-inout/src/main/java/com/ld/igds/models/InoutPlanDetail.java
new file mode 100644
index 0000000..18e7769
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutPlanDetail.java
@@ -0,0 +1,71 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.ld.igds.inout.InoutConstant;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璁″垝锛岃鍒掕缁�
+ *
+ * @DESC 鐗堟湰4.0 楠岃瘉
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_PLAN_DETAIL")
+public class InoutPlanDetail implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "璁″垝鏄庣粏鍗曞彿")
+ private String id;
+
+ @Column(name = "PLAN_ID_", length = 40)
+ @PropertyDef(label = "璁″垝缂栫爜")
+ private String planId;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String year;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱")
+ private String depotId;
+
+ @Column(name = "PLAN_NUM_", precision = 16, scale = 2)
+ @PropertyDef(label = "璁″垝鏁伴噺")
+ private Double planNum;
+
+ @Column(name = "TYPE_", length = 4)
+ @PropertyDef(label = "璁″垝绫诲瀷")
+ private String type = InoutConstant.PLAN_DETAIL_TYPE_1;
+
+// @Column(name = "PRICE_", precision = 16, scale = 2)
+// @PropertyDef(label = "鍗曚环")
+// private Double price;
+
+// @Column(name = "TOTAL_", precision = 16, scale = 2)
+// @PropertyDef(label = "鎬讳环")
+// private Double total;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/MPlan.java b/igds-inout/src/main/java/com/ld/igds/models/MPlan.java
deleted file mode 100644
index 2b346f2..0000000
--- a/igds-inout/src/main/java/com/ld/igds/models/MPlan.java
+++ /dev/null
@@ -1,78 +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;
-import java.util.List;
-
-/**
- * 璁″垝绠＄悊-涓昏〃
- *
- * @author: andy.jia
- * @description:
- * @version:
- * @data:2020骞�5鏈�27鏃�
- *
- */
-@Data
-@Entity
-@Table(name = "D_M_PLAN")
-public class MPlan implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "璁″垝缂栫爜")
- private String id;
-
- @Column(name = "REFERENCE_NUMBER_", length = 40)
- @PropertyDef(label = "璁″垝鏂囧彿")
- private String referenceNumber;
-
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
-
- @Column(name = "DEPT_ID_", length = 40)
- @PropertyDef(label = "鎵�灞炲垎搴�")
- private String deptId;
-
- @Column(name = "TYPE_", length = 10)
- @PropertyDef(label = "璁″垝绫诲瀷")
- private String type;
-
- @Column(name = "NAME_", length = 50)
- @PropertyDef(label = "璁″垝鍚嶇О")
- private String name;
-
- @Column(name = "YEAR_", length = 10)
- @PropertyDef(label = "骞翠唤")
- private String year;
-
- @Column(name = "CREATE_USER_", length = 50)
- @PropertyDef(label = "鍒涘缓浜�")
- private String createUser;
-
- @Column(name = "CREATE_TIME_")
- @PropertyDef(label = "鍒涘缓鏃堕棿")
- private Date createTime;
-
- @Column(name = "BEGIN_TIME_")
- @PropertyDef(label = "寮�濮嬫椂闂�")
- private Date beginTime;
-
- @Column(name = "END_TIME_")
- @PropertyDef(label = "鎴鏃堕棿")
- private Date endTime;
-
- @Column(name = "REMARK_", length = 300)
- @PropertyDef(label = "澶囨敞")
- private String remark;
-
- @Transient
- private List<MPlanDetail> details;
-
-}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/MPlanDetail.java b/igds-inout/src/main/java/com/ld/igds/models/MPlanDetail.java
deleted file mode 100644
index 377ab60..0000000
--- a/igds-inout/src/main/java/com/ld/igds/models/MPlanDetail.java
+++ /dev/null
@@ -1,70 +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:
- *
- */
-@Data
-@Entity
-@Table(name = "D_M_PLAN_DETAIL")
-public class MPlanDetail implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID_")
- private String id;
-
- @Column(name = "PLAN_ID_", length = 40)
- @PropertyDef(label = "璁″垝ID")
- private String planId;
-
- @Column(name = "DEPOT_ID_", length = 50)
- @PropertyDef(label = "浠撳簱")
- private String depotId;
-
- @Column(name = "YEAR_", length = 10)
- @PropertyDef(label = "骞翠唤")
- private String year;
-
- @Column(name = "TYPE_", length = 10)
- @PropertyDef(label = "绫诲瀷")
- private String type;
-
- @Column(name = "FOOD_VARIETY_", length = 10)
- @PropertyDef(label = "绮鍝佺")
- private String foodVariety;
-
- @Column(name = "FOOD_TYPE_", length = 10)
- @PropertyDef(label = "绮鎬ц川")
- private String foodType;
-
- @Column(name = "FOOD_LEVEL_", length = 10)
- @PropertyDef(label = "绮绛夌骇")
- private String foodLevel;
-
- @Column(name = "PLAN_NUM_", precision = 16, scale = 2)
- @PropertyDef(label = "鏁伴噺")
- private Double planNum;
-
- @Column(name = "PRICE_", precision = 16, scale = 2)
- @PropertyDef(label = "鍗曚环")
- private Double price;
-
- @Column(name = "TOTAL_", precision = 16, scale = 2)
- @PropertyDef(label = "鎬讳环")
- private Double total;
-
- @Column(name = "CREATE_TIME_")
- @PropertyDef(label = "鍒涘缓鏃堕棿")
- private Date createTime;
-}
diff --git a/igds-manager/src/main/java/com/ld/igds/m/view/PlanManageAudit.view.xml b/igds-manager/src/main/java/com/ld/igds/m/view/PlanManageAudit.view.xml
index 72e5014..0ab1b17 100644
--- a/igds-manager/src/main/java/com/ld/igds/m/view/PlanManageAudit.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/m/view/PlanManageAudit.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtDetail">
- <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">ID_</Property>
diff --git a/igds-web/src/main/resources/application.yml b/igds-web/src/main/resources/application.yml
index 5fe2d63..31a4c91 100644
--- a/igds-web/src/main/resources/application.yml
+++ b/igds-web/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: uat
+ active: dev
application:
name: igds
main:
diff --git a/igds-web/src/main/resources/dorado-home/configure.properties b/igds-web/src/main/resources/dorado-home/configure.properties
index ac84bc1..5d5585b 100644
--- a/igds-web/src/main/resources/dorado-home/configure.properties
+++ b/igds-web/src/main/resources/dorado-home/configure.properties
@@ -1,5 +1,5 @@
-#core.runMode=debug
-core.runMode=
+core.runMode=debug
+#core.runMode=
model.root=classpath*:models
view.root=classpath:
--
Gitblit v1.9.3