Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

common/http.api.js

@@ -33,6 +33,11 @@ const install = (Vue, vm) => {
 			  vm.$u.get(
 			    config.adminPath + '/md/appconfig/getVersion'
 			  ),
+      quantitywaitsum: (params = {}) =>
+        vm.$u.postJson(
+          config.adminPath + '/mes/pro/workorder/quantitywaitsum',
+          params
+        ),
       /**
        * 系统设置API
        */
@@ -100,11 +105,6 @@ const install = (Vue, vm) => {
           config.adminPath + '/pro/packagePrintRecord/rePackageInfoPrint',
           params
         ),
-      quantitywaitsum: (params = {}) =>
-        vm.$u.postJson(
-          config.adminPath + '/mes/pro/workorder/quantitywaitsum',
-          params
-        ),
       // 生产指令列表
       workOrderSoDirectiveApi: (params = {}) =>
         vm.$u.postJson(
@@ -285,6 +285,14 @@ const install = (Vue, vm) => {
           config.adminPath + '/pro/materialRequest/selectworkorder',
           params
         ),
+		
+	 //补料申请记录
+	 getMaterialRequest: (params = {}) =>	
+	  vm.$u.get(  
+	      config.adminPath + '/pro/materialRequest/recordList',
+          params
+		  ),
+	  
 
       //退料申请
       listMaterialReturn: (params = {}) =>
@@ -311,7 +319,7 @@ const install = (Vue, vm) => {
           '/system/autocode/get/' + ruleCode
       ),
 	  
-	   //获取最后一道工序
+	   //获取最下一道工序
 	  getNextProcess: (params = {}) =>
 	  	    vm.$u.get(config.adminPath + '/mobile/pro/protask/feedBackNextProcess', params),
 

manifest.json

 {
     "name" : "mes-pad",
-    "appid" : "__UNI__EFAA56F",
+    "appid" : "__UNI__EFA4D96",
     "description" : "MES-PAD",
     "versionName" : "1.0.4",
     "versionCode" : "100",