Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

5 天以前 b7d9f2e23cbda587d814c7d07c1664c053c83dcb

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -2487,6 +2487,7 @@
        cqcjno,//重检方案
        产线称重,
        iqc称重,
        受托入库
    }