From c2e4ed1a6e3a14406db471304360cd45ac8177d1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 18:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/core/utils/Constants.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/core/utils/Constants.java b/server/src/main/java/doumeemes/core/utils/Constants.java
index a373176..f2a7b57 100644
--- a/server/src/main/java/doumeemes/core/utils/Constants.java
+++ b/server/src/main/java/doumeemes/core/utils/Constants.java
@@ -27,6 +27,11 @@
public static final String ACCESS_ID="ACCESS_ID";
public static final String BUCKETNAME = "BUCKETNAME";
public static final String OSS = "OSS";
+ public static final String WX_CONFIG = "WX_CONFIG";
+ public static final String APPID = "APPID";
+ public static final String APPSECRET = "APPSECRET";
+ public static final String WX_TOKEN = "WX_TOKEN";
+
public static final String ACCESS_KEY = "ACCESS_KEY";
public static final String ENDPOINT = "ENDPOINT";
public static final String RESOURCE_PATH = "RESOURCE_PATH";
@@ -265,6 +270,7 @@
public static final int baogong= 4;
public static final int instock = 5;
public static final int cancel = 6;
+ public static final int producing = 7;
static String getTitleByStatus(WorkorderExtListVO p, int status) {
String title = "";
switch (status){
@@ -288,6 +294,9 @@
break;
case cancel:
title="宸ュ崟鍙栨秷";
+ break;
+ case producing:
+ title="宸ュ崟鐢熶骇涓�";
break;
default:
break;
@@ -317,6 +326,9 @@
break;
case cancel:
title="宸ュ崟鍙栨秷";
+ break;
+ case producing:
+ title="宸ュ崟鐢熶骇涓�";
break;
default:
break;
@@ -378,7 +390,7 @@
}
}
/**
- * 宸ュ崟鐘舵�� 0宸插垱寤恒��1宸叉姇鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸叉殏鍋溿��7宸插彇娑堛��8宸插叧闂� 9宸叉仮澶� 10鏇存崲浜哄憳 11 宸插鏂� 12 浜у嚭"
+ * 宸ュ崟鐘舵�� 0宸插垱寤恒��1宸叉姇鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸叉殏鍋溿��7宸插彇娑堛��8宸插叧闂� 9宸叉仮澶� 10鏇存崲浜哄憳 11 宸插鏂� 12 浜у嚭 13鐢熸垚涓�"
*/
public interface WORKORDER_HISTORY_STATUS{
public static final int create = 0;
@@ -394,6 +406,7 @@
public static final int redistribute = 10;
public static final int readyMaterial = 11;
public static final int produce = 12;
+ public static final int producing = 13;
static String getTitleByStatus(WorkorderExtListVO p, int status) {
String title = "";
switch (status){
@@ -435,6 +448,9 @@
break;
case produce:
title="宸ュ崟浜у嚭";
+ break;
+ case producing:
+ title="宸ュ崟鐢熸垚涓浗";
break;
default:
break;
@@ -483,6 +499,9 @@
case produce:
title="宸ュ崟浜у嚭";
break;
+ case producing:
+ title="宸ュ崟鐢熶骇涓�";
+ break;
default:
break;
}
--
Gitblit v1.9.3