Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes

Mr.Shi

2023-08-14 5f5f07db32be63e6112ddff7722c1ada10472da5

 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;
            }