From cfbf7533b8cfc395a110390da23cf6bb641daff9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 08 一月 2025 16:05:17 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 50b0d9d..f5ac3a4 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -52,6 +52,7 @@
public static final String YW_DEVICE ="YW_DEVICE" ;
public static final String YW_PATROL ="YW_PATROL" ;
public static final String YW_CONTRACT_BILL ="YW_CONTRACT_BILL" ;
+ public static final String YW_MATERIAL ="YW_MATERIAL" ;
public static final String RESERVATION_TOTAL_NUM ="RESERVATION_TOTAL_NUM" ;
public static final String SIGN_IN_PLACE_LAT ="SIGN_IN_PLACE_LAT" ;
@@ -514,6 +515,9 @@
public static final long EXPIRE_TIME = 7200;
public static final String INTERNAL_TOKEN ="INTERNAL_TOKEN";
+ public static final String COM_OUTBOUND_OUT_KEY = "obout_";
+ public static final String COM_OUTBOUND_IN_KEY = "obin_";
+ public static final String COM_OUTBOUND_TAKING_KEY = "obtaking_";
public static final String GOODSORDER_KEY = "ordercode_";
public static final String ACTIVITY_SIGN_KEY = "actcode_";
@@ -640,6 +644,91 @@
int otherDeal = 5;//浠栦汉宸插鐞�
int otherUnPass = 6;//浠栦汉鎷掔粷
}
+
+
+
+ //绫诲瀷 0閲囪喘鍏ュ簱 1棰嗙敤閫�鍥� 2搴撳瓨璋冩暣鍏ュ簱 3鍏朵粬鍏ュ簱 4鐩樼泩鍏ュ簱 5棰嗙敤鍑哄簱 6浠撳簱鍑哄簱 7璋冩暣鍑哄簱 8閲囪喘鍑哄簱 9鍏朵粬鍑哄簱 10鐩樹簭鍑哄簱
+ public enum ywOutInType{
+ BUY_IN(0, 0),
+ USE_RETURN_IN(1, 0),
+ STOCK_IN(2, 0),
+ OTHER_IN(3, 0),
+ TAKING_IN(4, 0),
+ USE_OUT(5, 1),
+ HOUSE_OUT(6, 1),
+ STOCK_OUT(7, 1),
+ OTHER_UN_PASS_OUT(8, 1),
+ BUY_OUT(9, 1),
+ TAKING_OUT(10, 1)
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private int inOut;
+
+ // 鏋勯�犳柟娉�
+ ywOutInType(int key, int inOut) {
+ this.inOut = inOut;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static Integer getInOutValue(int index) {
+ for (ywOutInType c : ywOutInType.values()) {
+ if (c.getKey() == index) {
+ return c.getInOut();
+ }
+ }
+ return null;
+ }
+
+
+ // 鏅�氭柟娉�
+ public static ywOutInType getYwOutInType(int index) {
+ for (ywOutInType c : ywOutInType.values()) {
+ if (c.getKey() == index) {
+ return c;
+ }
+ }
+ return null;
+ }
+
+
+ /**
+ * 鏍规嵁鍑哄叆搴撶被鍨嬭幏鍙栨墍鏈夌殑鍏蜂綋绫诲瀷
+ * @param inOutType
+ * @return
+ */
+ public static List<Integer> getAllTypeKey(int inOutType) {
+ List<Integer> list = new ArrayList<>();
+ for (ywOutInType c : ywOutInType.values()) {
+ if (c.getInOut() == inOutType) {
+ list.add(c.getKey());
+ }
+ }
+ return list;
+ }
+
+ // get set 鏂规硶
+ public int getInOut() {
+ return inOut;
+ }
+
+ public void setInOut(int inOut) {
+ this.inOut = inOut;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+
+ }
+
+
/**
* 鑾峰彇杞︾墝绫诲瀷淇℃伅
@@ -1297,6 +1386,8 @@
YW_CONTRACT_FILE(9, "鍚堝悓闄勪欢 ", "鍚堝悓闄勪欢 "),
FN_CONTRACT_REVENUE_FILE(10, "鏀舵敮娴佹按闄勪欢 ", "鍚堝悓璐﹀崟闄勪欢 "),
FN_PATROL_TASK_RECORD_FILE(11, "宸℃浠诲姟鐐瑰鐞嗛檮浠� ", "宸℃浠诲姟鐐瑰鐞嗛檮浠� "),
+ MATERIAL_FILE(12, "璧勪骇闄勪欢 ", "璧勪骇闄勪欢 "),
+ PROBLEM_FILE(13, "闂闄勪欢 ", "闂闄勪欢 "),
;
// 鎴愬憳鍙橀噺
--
Gitblit v1.9.3