Merge branch 'master' of http://121.37.141.193/open/open-api

mes/产品/列出产品.md

@@ -90,8 +90,8 @@ attrs字段
 {
 	"clock": "2023-06-25 20:00:00.000",
 	"status": "ok",
-  "data": [
-    {
+	"data": {
+		list: [{
 			productCode: "088+089ART-MW",
 			familyCode: "ART550-144MHA",
 			processGroupId: 0,
@@ -120,8 +120,7 @@ attrs字段
 			lastUpdateuser: "mesadmin",
 			serialCodeRule: "DM405M10-54HSW",
 			palletCodeRule: "DM405M10-54HSW-bz",
-        attrs:[
-            {
+			attrs: [{
 					id: "7add1e54-d99e-4432-8175-c5afd80ae058",
 					attributeId: "Product_GLASS_TYPE",
 					attributeDesc: "玻璃类型",
@@ -142,8 +141,9 @@ attrs字段
 					createUser: ""
 				}
 			],
+		}]
+
 	}
-  ]
 }
 ```
 

mes/产品/查询产品详情.md

@@ -1,4 +1,4 @@
-### 查询产品详情（QueryProduct）
+### 查询产品详情（GetProduct）
 
 此接口用于查询产品详情
 
@@ -8,7 +8,7 @@
 
 方法：POST
 
-URL: http://localhost:8033/open/QueryProduct
+URL: http://localhost:8033/open/GetProduct
 
 ---
 
@@ -91,6 +91,7 @@ attrs字段
 	"clock": "2023-06-25 20:00:00.000",
 	"status": "ok",
 	"data": {
+		info: {
 			productCode: "088+089ART-MW",
 			familyCode: "ART550-144MHA",
 			processGroupId: 0,
@@ -119,8 +120,7 @@ attrs字段
 			lastUpdateuser: "mesadmin",
 			serialCodeRule: "DM405M10-54HSW",
 			palletCodeRule: "DM405M10-54HSW-bz",
-        attrs:[
-            {
+			attrs: [{
 					id: "7add1e54-d99e-4432-8175-c5afd80ae058",
 					attributeId: "Product_GLASS_TYPE",
 					attributeDesc: "玻璃类型",
@@ -143,6 +143,7 @@ attrs字段
 			],
 		}
 	}
+}
 ```
 
 查询报错：

mes/供应商/列出供应商.md

@@ -64,8 +64,8 @@ URL: http://localhost:8033/open/ListSupplier
 {
 	"clock": "2023-06-25 20:00:00.000",
 	"status": "ok",
-  "data": [
-    {
+	"data": {
+		list: [{
 				supplierCode: "1002210180009192",
 				descriptions: "无锡联晟光伏科技有限公司",
 				flag: 1,
@@ -105,6 +105,7 @@ URL: http://localhost:8033/open/ListSupplier
 			}
 		]
 	}
+}
 ```
 
 查询报错：

mes/供应商/查询供应商详情.md

@@ -1,4 +1,4 @@
-### 查询供应商详情（QuerySupplier）
+### 查询供应商详情（GetSupplier）
 
 此接口用于查询供应商详情
 
@@ -8,7 +8,7 @@
 
 方法：POST
 
-URL: http://localhost:8033/open/QuerySupplier
+URL: http://localhost:8033/open/GetSupplier
 
 ---
 
@@ -65,6 +65,7 @@ URL: http://localhost:8033/open/QuerySupplier
 	"clock": "2023-06-25 20:00:00.000",
 	"status": "ok",
 	"data": {
+		info: {
 			supplierCode: "1002210180009192",
 			descriptions: "无锡联晟光伏科技有限公司",
 			flag: 1,
@@ -84,6 +85,7 @@ URL: http://localhost:8033/open/QuerySupplier
 			v_flag_isolatingbar: 0,
 		}
 	}
+}
 ```
 
 查询报错：

mes/原材料分批/原材料批次列表.md

@@ -62,7 +62,8 @@ __data:__
 {
   "clock": "2023-06-25 20:00:00.000",
   "status": "ok",
-  "data": [
+  "data": {
+    "batches":[
       {
         "key":"123",
         "workOrder":"123456",
@@ -83,6 +84,7 @@ __data:__
       }
     ]
   }    
+}
 
 ```
 

mes/原材料分批/原材料批次详细信息.md

@@ -85,6 +85,7 @@ __MaterialAttrs:__
   "clock": "2023-06-25 20:00:00.000",
   "status": "ok",
   "data": {
+    "batch":{
       "key":"",
       "workOrder":"123456",
       "batchNumber":"CELL1000",
@@ -123,6 +124,7 @@ __MaterialAttrs:__
       ]
     }
   }
+}
 
 ```
 

mes/物料/修改物料.md

@@ -47,8 +47,7 @@ attrs字段
 		materialTypeCode: "CELL",
 		descriptions: "电池片描述",
 		flag: 1,
-        attrs:[
-            {
+		attrs: [{
 				materialCode: "CELL001",
 				materialTypeCode: "CELL",
 				attrCode: "crys_type",

mes/物料/列出物料.md

@@ -81,16 +81,15 @@ attrs字段
 {
 	"clock": "2023-06-25 20:00:00.000",
 	"status": "ok",
-  "data": [
-    {
+	"data": {
+		list: [{
 			materialCode: "CELL001",
 			materialTypeCode: "CELL",
 			materialTypeDesc: "电池片",
 			descriptions: "电池片描述",
 			flag: 1,
 			createTime: "2023-04-09 18:10:01",
-        attrs:[
-            {
+			attrs: [{
 					materialCode: "CELL001",
 					materialTypeCode: "CELL",
 					materialTypeDesc: "电池片",
@@ -111,8 +110,8 @@ attrs字段
 					flag: 1
 				}
 			],
+		}]
 	}
-  ]
 }
 ```
 

mes/物料/列出物料类别.md

@@ -1,6 +1,6 @@
 ### 列出物料类别（ListMaterialType）
 
-此接口用于获取物料列表，搜索物料
+此接口用于列出物料类别列表
 
 ---
 
@@ -55,8 +55,8 @@ URL: http://localhost:8033/open/ListMaterialType
 {
 	"clock": "2023-06-25 20:00:00.000",
 	"status": "ok",
-  "data": [
-    {
+	"data": {
+		list: [{
 				materialTypeCode: "CELL",
 				materialTypeDesc: "电池片",
 				unit: "pcs",
@@ -76,6 +76,7 @@ URL: http://localhost:8033/open/ListMaterialType
 			}
 		]
 	}
+}
 ```
 
 查询报错：

mes/物料/查询物料详情.md

@@ -1,4 +1,4 @@
-### 查询物料详情（QueryMaterial）
+### 查询物料详情（GetMaterial）
 
 此接口用于查询物料详情
 
@@ -8,7 +8,7 @@
 
 方法：POST
 
-URL: http://localhost:8033/open/QueryMaterial
+URL: http://localhost:8033/open/GetMaterial
 
 ---
 
@@ -68,14 +68,14 @@ attrs字段
 	"clock": "2023-06-25 20:00:00.000",
 	"status": "ok",
 	"data": {
+		info: {
 			materialCode: "CELL001",
 			materialTypeCode: "CELL",
 			materialTypeDesc: "电池片",
 			descriptions: "电池片描述",
 			flag: 1,
 			createTime: "2023-04-09 18:10:01",
-        attrs:[
-            {
+			attrs: [{
 					materialCode: "CELL001",
 					materialTypeCode: "CELL",
 					materialTypeDesc: "电池片",
@@ -98,6 +98,7 @@ attrs字段
 			],
 		}
 	}
+}
 ```
 
 查询报错：

mes/物料/添加物料.md

@@ -47,8 +47,7 @@ attrs字段
 		materialTypeCode: "CELL",
 		descriptions: "电池片描述",
 		flag: 1,
-        attrs:[
-            {
+		attrs: [{
 				materialCode: "CELL001",
 				materialTypeCode: "CELL",
 				attrCode: "crys_type",

mes/选项/列出产品标签形式.md

@@ -54,15 +54,15 @@ URL: http://localhost:8033/open/ListDfFamilys
 {
 	"clock": "2023-06-25 20:00:00.000",
 	"status": "ok",
-  "data": [
-    {
+	"data": {
+		list: [{
 			familyCode: "AG-HD108N-415",
 			descriptions: "AG-HD108N-415",
 			aliasName: "mesadmin",
 			flag: 1,
 			createTime: "2022-01-10 23:10:01.890"
+		}]
 	}
-  ]
 }
 ```