From 89d4f6b24ada69fd143830f68a121c339868eca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E6=88=90=E6=97=AD?= <1043274364@qq.com> Date: Tue, 4 Jul 2023 18:30:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B7=A5=E5=8D=95bom=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/BOM/删除单个BOM内容.md | 64 +++++++++++ mes/BOM/删除工单所有BOM信息.md | 62 +++++++++++ mes/BOM/查询工单BOM明细.md | 146 +++++++++++++++++-------- mes/BOM/添加工单BOM信息.md | 10 +- 4 files changed, 229 insertions(+), 53 deletions(-) create mode 100644 mes/BOM/删除单个BOM内容.md create mode 100644 mes/BOM/删除工单所有BOM信息.md diff --git a/mes/BOM/删除单个BOM内容.md b/mes/BOM/删除单个BOM内容.md new file mode 100644 index 0000000..d544b9f --- /dev/null +++ b/mes/BOM/删除单个BOM内容.md @@ -0,0 +1,64 @@ +### 删除单个BOM内容(DeleteBomMfgEntry) + +此接口用于删除单个BOM内容 + +--- + +### 基本信息 + +方法:POST + +URL: http://localhost:8033/open/DeleteBomMfgEntry + +--- + +### 请求 + +请求参数 + +| 参数名 | 类型 | 必填 | 说明 | +| :-- | :-- | :-- | :-- | +| profile | string | 是 | 厂区代码 | +| Workorder | string | 是 | 工单号 | +| ProductCode | string | 是 | 产品编码 | +| MaterialCode | string | 是 | 物料编码 | + + +示例 1:删除指定产品 + +``` +{ + "data": { + "profile": "测试", + "Workorder": "2014568", + "ProductCode": "D020200-00038", + "MaterialCode": "自制" + } +} +``` + +--- + +### 响应 + + +执行成功时,响应如下: + +``` +{ + "clock": "2023-06-25 20:00:00.000", + "status": "ok", + "data": {} +} +``` + +执行报错: + +``` +{ + "clock": "2023-06-25 20:00:00.000", + "status": "exception", + "message": "删除产品失败", + "data": {} +} +``` \ No newline at end of file diff --git a/mes/BOM/删除工单所有BOM信息.md b/mes/BOM/删除工单所有BOM信息.md new file mode 100644 index 0000000..101c9d5 --- /dev/null +++ b/mes/BOM/删除工单所有BOM信息.md @@ -0,0 +1,62 @@ +### 删除工单所有BOM信息(DeleteBomMfgEntry) + +此接口用于删除工单所有BOM信息 + +--- + +### 基本信息 + +方法:POST + +URL: http://localhost:8033/open/DeleteBomMfgEntry + +--- + +### 请求 + +请求参数 + +| 参数名 | 类型 | 必填 | 说明 | +| :-- | :-- | :-- | :-- | +| profile | string | 是 | 厂区代码 | +| Workorder | string | 是 | 工单号 | +| ProductCode | string | 是 | 产品编码 | + + +示例 1:删除指定产品 + +``` +{ + "data": { + "profile": "测试", + "Workorder": "2014568", + "ProductCode": "D020200-00038" + } +} +``` + +--- + +### 响应 + + +执行成功时,响应如下: + +``` +{ + "clock": "2023-06-25 20:00:00.000", + "status": "ok", + "data": {} +} +``` + +执行报错: + +``` +{ + "clock": "2023-06-25 20:00:00.000", + "status": "exception", + "message": "删除产品失败", + "data": {} +} +``` \ No newline at end of file diff --git a/mes/BOM/查询工单BOM明细.md b/mes/BOM/查询工单BOM明细.md index 6682166..a639ccb 100644 --- a/mes/BOM/查询工单BOM明细.md +++ b/mes/BOM/查询工单BOM明细.md @@ -28,8 +28,8 @@ URL: http://localhost:8033/open/getWorkorderBom ``` { "data": { - "profile": "测试厂区", - "workorder": "1407", + "profile": "测试", + "workorder": "workorders" } } ``` @@ -40,57 +40,107 @@ URL: http://localhost:8033/open/getWorkorderBom 响应字段 -| 参数名 | 类型 | 必填 | 说明 | -| :-- | :-- | :-- | :-- | -| workorder | string | 是 | 工单号 | -| productCode | string | 是 | 产品编码 | -| bomId | string | 是 | bomId | -| materialCode | string | 是 | 物料编码 | -| isPrimary | int | 否 | 是否主料 0否,1是| -| primaryPart | string | 否 | 主料物料编码,如果isPrimary=1,则与materialCode相同 | -| ProcessCode | string | 否 | 工序代码 | -| SerialRequirement | double | 否 | 物料单耗 | -| Uom | string | 否 | 单位 | -| PartType | string | 否 | 物料类别编码 | -| PartTypeDesc | string | 否 | 物料类别描述 | -| LostRatio | string | 否 | 物料损耗 | -| OrigBatchNbr | string | 否 | 母批号 | +| 参数名 | 类型 | 说明 | +| :-- | :-- | :-- | +| workorder | string | 工单号 | +| productCode | string | 产品编码 | +| bomId | string | bomId | +| materialCode | string | 物料编码 | +| isPrimary | int | 是否主料 0否,1是| +| primaryPart | string | 主料物料编码,如果isPrimary=1,则与materialCode相同 | +| ProcessCode | string | 工序代码 | +| SerialRequirement | double | 物料单耗 | +| uom | string | 单位 | +| PartType | string | 物料类别编码 | +| partTypeDesc | string | 物料类别描述 | +| lostRatio | string | 物料损耗 | +| origBatchNbr | string | 母批号 | 查询成功时,响应如下: ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - "list": [{ - "workorder": "1407", - "productCode": "PD004", - "bomId": "1231413", - "materialCode": "CELL001", - "isPrimary": 1, - "primaryPart": "CELL001", - "ProcessCode": "M15", - "SerialRequirement": 3.2, - "Uom": "pcs", - "PartType": "CELL", - "LostRatio": 0.01, - "OrigBatchNbr": "" - }, { - "workorder": "1407", - "productCode": "PD004", - "bomId": "1231413", - "materialCode": "CELL002", - "isPrimary": 0, - "primaryPart": "CELL001", - "ProcessCode": "M15", - "SerialRequirement": 3.2, - "Uom": "pcs", - "PartType": "CELL", - "LostRatio": 0.01, - "OrigBatchNbr": "" - }] - } + "clock": "2023-07-04 18:07:52.287", + "status": "ok", + "data": { + "list": [ + { + "workorder": "workorders", + "productCode": "prodect_code", + "bomId": "", + "materialCode": "1002211010018723", + "isPrimary": 1, + "primaryPart": "1002211010018723", + "processCode": "M15", + "serialRequirement": 1.0, + "uom": "m2", + "partType": "EVA", + "partTypeDesc": "EVA", + "lostRatio": 0.0, + "origBatchNbr": "1002211010018723" + }, + { + "workorder": "workorders", + "productCode": "prodect_code", + "bomId": "", + "materialCode": "333", + "isPrimary": 1, + "primaryPart": "333", + "processCode": "M10", + "serialRequirement": 1.0, + "uom": "pcs", + "partType": "CELL", + "partTypeDesc": "电池片", + "lostRatio": 0.0, + "origBatchNbr": "333" + }, + { + "workorder": "workorders", + "productCode": "prodect_code", + "bomId": "", + "materialCode": "boli001", + "isPrimary": 1, + "primaryPart": "boli001", + "processCode": "M10", + "serialRequirement": 1.0, + "uom": "pcs", + "partType": "GLASS", + "partTypeDesc": "玻璃", + "lostRatio": 0.0, + "origBatchNbr": "boli001" + }, + { + "workorder": "workorders", + "productCode": "prodect_code", + "bomId": "", + "materialCode": "flux_materials_class", + "isPrimary": 1, + "primaryPart": "flux_materials_class", + "processCode": "M10", + "serialRequirement": 1.0, + "uom": "桶_describe", + "partType": "Solder", + "partTypeDesc": "助焊剂", + "lostRatio": 0.0, + "origBatchNbr": "flux_materials_class" + }, + { + "workorder": "workorders", + "productCode": "prodect_code", + "bomId": "", + "materialCode": "flux_materials_class_2", + "isPrimary": 1, + "primaryPart": "flux_materials_class_2", + "processCode": "M10", + "serialRequirement": 100.0, + "uom": "桶_describe", + "partType": "Solder", + "partTypeDesc": "助焊剂", + "lostRatio": 0.0, + "origBatchNbr": "flux_materials_class_2" + } + ] + } } ``` diff --git a/mes/BOM/添加工单BOM信息.md b/mes/BOM/添加工单BOM信息.md index ece596a..73fca81 100644 --- a/mes/BOM/添加工单BOM信息.md +++ b/mes/BOM/添加工单BOM信息.md @@ -32,11 +32,11 @@ bom字段 | isPrimary | int | 否 | 是否主料 0否,1是| | primaryPart | string | 否 | 主料物料编码,如果isPrimary=1,则与materialCode相同 | | ProcessCode | string | 否 | 工序代码 | -| SerialRequirement | double | 否 | 物料单耗 | -| Uom | string | 否 | 单位 | -| PartType | string | 否 | 物料类别 | -| LostRatio | string | 否 | 物料损耗 | -| OrigBatchNbr | string | 否 | 母批号 | +| serialRequirement | double | 是 | 物料单耗 | +| uom | string | 否 | 单位 | +| partType | string | 否 | 物料类别 | +| lostRatio | string | 否 | 物料损耗 | +| origBatchNbr | string | 否 | 母批号 | 示例 1:保存工单bom信息 From a8c88b03a813158821d597ec250ad87865849242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E6=88=90=E6=97=AD?= <1043274364@qq.com> Date: Wed, 5 Jul 2023 13:52:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=A7=E5=93=81=E3=80=81=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E6=B5=8B=E8=AF=95=E5=90=8E=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/产品/修改产品.md | 24 ++-- mes/产品/列出产品.md | 165 ++++++++++++++++--------- mes/产品/删除产品.md | 4 +- mes/产品/查询产品详情.md | 160 +++++++++++++++--------- mes/产品/添加产品.md | 24 ++-- mes/供应商/修改供应商.md | 18 +-- mes/供应商/列出供应商.md | 39 +++--- mes/供应商/删除供应商.md | 4 +- mes/供应商/查询供应商详情.md | 20 +-- mes/供应商/添加供应商.md | 17 ++- mes/选项/列出产品标签形式.md | 50 ++++++-- mes/选项/列出产品特征.md | 12 +- 12 files changed, 340 insertions(+), 197 deletions(-) diff --git a/mes/产品/修改产品.md b/mes/产品/修改产品.md index d98619b..499d892 100644 --- a/mes/产品/修改产品.md +++ b/mes/产品/修改产品.md @@ -37,18 +37,18 @@ URL: http://localhost:8033/open/UpdateProduct ``` { "data": { - profile: "测试厂区", - productCode: "088+089ART-MW", - familyCode: "ART550-144MHA", - processGroupId: 34, - crysTypeId: 12, - busbarTypeId: 31, - cellQty: 64, - modSpecId: 345, - processType: 22, - featureCode: 34, - modWeight: "", - fgCode: "", + "profile": "测试厂区", + "productCode": "088+089ART-MW", + "familyCode": "ART550-144MHA", + "processGroupId": 34, + "crysTypeId": 12, + "busbarTypeId": 31, + "cellQty": 64, + "modSpecId": 345, + "processType": 22, + "featureCode": 34, + "modWeight": "", + "fgCode": "", } } ``` diff --git a/mes/产品/列出产品.md b/mes/产品/列出产品.md index 0ffd70e..9a1893a 100644 --- a/mes/产品/列出产品.md +++ b/mes/产品/列出产品.md @@ -27,7 +27,7 @@ URL: http://localhost:8033/open/ListProduct { "data": { profile: "测试厂区", - search: "组件001", + search: "test001", } } ``` @@ -88,62 +88,113 @@ attrs字段 ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - productCode: "088+089ART-MW", - familyCode: "ART550-144MHA", - processGroupId: 0, - crysTypeId: 38, - crysTypeDesc: "单晶", - crysTypeValue: "M", - busbarTypeId: 37, - busbarTypeDesc: "11BB", - busbarTypeValue: "11BB", - cellQty: 144, - cellQtyDesc: "144", - cellQtyValue: "144", - modSpecId: 49, - modSpecDesc: "2279*1134*35", - modSpecValue: "2279*1134*35", - processType: 39, - processTypedesc: "单玻组件", - processTypeValue: "单玻组件", - featureCode: 9, - featureCodeDesc: "P", - featureCodeValue: "P", - modWeight: "", - fgCode: "", - createDate: "2022-01-10 23:10:01.890", - lastUpdate: "2022-01-16 22:24:32.273", - lastUpdateuser: "mesadmin", - serialCodeRule: "DM405M10-54HSW", - palletCodeRule: "DM405M10-54HSW-bz", - attrs: [{ - id: "7add1e54-d99e-4432-8175-c5afd80ae058", - attributeId: "Product_GLASS_TYPE", - attributeDesc: "玻璃类型", - productCode: "088+089ART-MW", - description: "双玻", - code: "双玻", - createTime: "2023-06-07 14:59:06.800", - createUser: "" - }, - { - id: "c671f463-5f66-4b99-9083-44fe9293a83e", - attributeId: "Product_PACK_QTY", - attributeDesc: "包装数量", - productCode: "088+089ART-MW", - description: "31", - code: "31", - createTime: "2023-06-07 14:59:06.800", - createUser: "" - } - ], - }] - - } + "clock": "2023-07-05 10:43:08.773", + "status": "ok", + "data": { + "list": [ + { + "productCode": "test001", + "familyCode": "label_code", + "processGroupId": 0, + "crysTypeId": 38, + "crysTypeDesc": "单晶", + "crysTypeValue": "M", + "busbarTypeId": 132, + "busbarTypeDesc": "grid_describe", + "busbarTypeValue": "grid_code", + "cellQty": 122, + "cellQtyDesc": "122", + "cellQtyValue": "122", + "cellColorId": 0, + "cellColorDesc": "N/A", + "cellColorValue": "N/A", + "modSpecId": 69, + "modSpecDesc": "1722*1134*30", + "modSpecValue": "1722*1134*30", + "modWeight": "N/A", + "fgCode": "N/A", + "createDate": "2023-06-07 09:52:49.030", + "lastUpdate": "2023-06-07 10:12:54.623", + "lastUpdateuser": "mesadmin", + "processType": 8, + "processTypedesc": "双玻组件", + "processTypeValue": "双玻组件", + "featureCode": 9, + "featureCodeDesc": "P", + "featureCodeValue": "P", + "serialCodeRule": "编码N型", + "palletCodeRule": "保密包装", + "attrs": [ + { + "id": "c35d36c0-773b-4e6e-9d77-1f05988694a5", + "attributeId": "Product_1231333", + "attributeDesc": "颜色1", + "productCode": "test001", + "description": "111", + "code": "111", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.777", + "createUser": null + }, + { + "id": "0c682acf-a9a8-4a71-8d05-b3a264ae6137", + "attributeId": "Product_BACK_TYPE", + "attributeDesc": "背板类型", + "productCode": "test001", + "description": "背板", + "code": "背板", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.787", + "createUser": null + }, + { + "id": "714d564f-5380-403d-aba2-5916f0022693", + "attributeId": "Product_CELL_SIZE", + "attributeDesc": "产品电池片尺寸", + "productCode": "test001", + "description": "123", + "code": "123", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.783", + "createUser": null + }, + { + "id": "75847d78-000f-4dda-ad5a-37164ff99a82", + "attributeId": "Product_FRAME_TYPE", + "attributeDesc": "边框类型", + "productCode": "test001", + "description": "无框组件", + "code": "W", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.787", + "createUser": null + }, + { + "id": "7add1e54-d99e-4432-8175-c5afd80ae058", + "attributeId": "Product_GLASS_TYPE", + "attributeDesc": "玻璃类型", + "productCode": "test001", + "description": "双玻", + "code": "双玻", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.800", + "createUser": null + }, + { + "id": "92ebfd31-8e24-4367-a6e1-4335ce69cf32", + "attributeId": "Product_MOD_TYPE", + "attributeDesc": "产品组件类型", + "productCode": "test001", + "description": "123", + "code": "123", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.800", + "createUser": null + } + ] + } + ] + } } ``` diff --git a/mes/产品/删除产品.md b/mes/产品/删除产品.md index e1082f5..504bbc1 100644 --- a/mes/产品/删除产品.md +++ b/mes/产品/删除产品.md @@ -27,8 +27,8 @@ URL: http://localhost:8033/open/DeleteProduct ``` { "data": { - profile: "测试厂区", - productCode: "088+089ART-MW", + "profile": "测试厂区", + "productCode": "088+089ART-MW", } } ``` diff --git a/mes/产品/查询产品详情.md b/mes/产品/查询产品详情.md index 50ab918..29730cc 100644 --- a/mes/产品/查询产品详情.md +++ b/mes/产品/查询产品详情.md @@ -88,61 +88,111 @@ attrs字段 ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - info: { - productCode: "088+089ART-MW", - familyCode: "ART550-144MHA", - processGroupId: 0, - crysTypeId: 38, - crysTypeDesc: "单晶", - crysTypeValue: "M", - busbarTypeId: 37, - busbarTypeDesc: "11BB", - busbarTypeValue: "11BB", - cellQty: 144, - cellQtyDesc: "144", - cellQtyValue: "144", - modSpecId: 49, - modSpecDesc: "2279*1134*35", - modSpecValue: "2279*1134*35", - processType: 39, - processTypedesc: "单玻组件", - processTypeValue: "单玻组件", - featureCode: 9, - featureCodeDesc: "P", - featureCodeValue: "P", - modWeight: "", - fgCode: "", - createDate: "2022-01-10 23:10:01.890", - lastUpdate: "2022-01-16 22:24:32.273", - lastUpdateuser: "mesadmin", - serialCodeRule: "DM405M10-54HSW", - palletCodeRule: "DM405M10-54HSW-bz", - attrs: [{ - id: "7add1e54-d99e-4432-8175-c5afd80ae058", - attributeId: "Product_GLASS_TYPE", - attributeDesc: "玻璃类型", - productCode: "088+089ART-MW", - description: "双玻", - code: "双玻", - createTime: "2023-06-07 14:59:06.800", - createUser: "" - }, - { - id: "c671f463-5f66-4b99-9083-44fe9293a83e", - attributeId: "Product_PACK_QTY", - attributeDesc: "包装数量", - productCode: "088+089ART-MW", - description: "31", - code: "31", - createTime: "2023-06-07 14:59:06.800", - createUser: "" - } - ], - } - } + "clock": "2023-07-05 10:40:59.173", + "status": "ok", + "data": { + "info": { + "productCode": "test001", + "familyCode": "label_code", + "processGroupId": 0, + "crysTypeId": 38, + "crysTypeDesc": "单晶", + "crysTypeValue": "M", + "busbarTypeId": 132, + "busbarTypeDesc": "grid_describe", + "busbarTypeValue": "grid_code", + "cellQty": 122, + "cellQtyDesc": "122", + "cellQtyValue": "122", + "cellColorId": 0, + "cellColorDesc": "N/A", + "cellColorValue": "N/A", + "modSpecId": 69, + "modSpecDesc": "1722*1134*30", + "modSpecValue": "1722*1134*30", + "modWeight": "N/A", + "fgCode": "N/A", + "createDate": "2023-06-07 09:52:49.030", + "lastUpdate": "2023-06-07 10:12:54.623", + "lastUpdateuser": "mesadmin", + "processType": 8, + "processTypedesc": "双玻组件", + "processTypeValue": "双玻组件", + "featureCode": 9, + "featureCodeDesc": "P", + "featureCodeValue": "P", + "serialCodeRule": "编码N型", + "palletCodeRule": "保密包装", + "attrs": [ + { + "id": "c35d36c0-773b-4e6e-9d77-1f05988694a5", + "attributeId": "Product_1231333", + "attributeDesc": "颜色1", + "productCode": "test001", + "description": "111", + "code": "111", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.777", + "createUser": null + }, + { + "id": "0c682acf-a9a8-4a71-8d05-b3a264ae6137", + "attributeId": "Product_BACK_TYPE", + "attributeDesc": "背板类型", + "productCode": "test001", + "description": "背板", + "code": "背板", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.787", + "createUser": null + }, + { + "id": "714d564f-5380-403d-aba2-5916f0022693", + "attributeId": "Product_CELL_SIZE", + "attributeDesc": "产品电池片尺寸", + "productCode": "test001", + "description": "123", + "code": "123", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.783", + "createUser": null + }, + { + "id": "75847d78-000f-4dda-ad5a-37164ff99a82", + "attributeId": "Product_FRAME_TYPE", + "attributeDesc": "边框类型", + "productCode": "test001", + "description": "无框组件", + "code": "W", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.787", + "createUser": null + }, + { + "id": "7add1e54-d99e-4432-8175-c5afd80ae058", + "attributeId": "Product_GLASS_TYPE", + "attributeDesc": "玻璃类型", + "productCode": "test001", + "description": "双玻", + "code": "双玻", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.800", + "createUser": null + }, + { + "id": "92ebfd31-8e24-4367-a6e1-4335ce69cf32", + "attributeId": "Product_MOD_TYPE", + "attributeDesc": "产品组件类型", + "productCode": "test001", + "description": "123", + "code": "123", + "createTime": "2023/6/7 14:59:06", + "createTimeLucid": "2023-06-07 14:59:06.800", + "createUser": null + } + ] + } + } } ``` diff --git a/mes/产品/添加产品.md b/mes/产品/添加产品.md index aad7300..02c1d38 100644 --- a/mes/产品/添加产品.md +++ b/mes/产品/添加产品.md @@ -37,18 +37,18 @@ URL: http://localhost:8033/open/AddProduct ``` { "data": { - profile: "测试厂区", - productCode: "088+089ART-MW", - familyCode: "ART550-144MHA", - processGroupId: 34, - crysTypeId: 12, - busbarTypeId: 31, - cellQty: 64, - modSpecId: 345, - processType: 22, - featureCode: 34, - modWeight: "", - fgCode: "", + "profile": "测试", + "productCode": "088+089ART-MW", + "familyCode": "ART550-144MHA", + "processGroupId": 34, + "crysTypeId": 12, + "busbarTypeId": 31, + "cellQty": 64, + "modSpecId": 345, + "processType": 22, + "featureCode": 34, + "modWeight": "", + "fgCode": "" } } ``` diff --git a/mes/供应商/修改供应商.md b/mes/供应商/修改供应商.md index 873f052..37d9e31 100644 --- a/mes/供应商/修改供应商.md +++ b/mes/供应商/修改供应商.md @@ -27,10 +27,9 @@ URL: http://localhost:8033/open/UpdateSupplier ``` { "data": { - profile: "测试厂区", - supplierCode: "1002210180009192", - descriptions: "无锡市江松科技有限公司", - flag: 1, + "profile": "测试", + "supplierCode": "1045543weee", + "descriptions": "新的公司2" } } ``` @@ -44,9 +43,14 @@ URL: http://localhost:8033/open/UpdateSupplier ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": {} + "clock": "2023-07-05 13:52:01.290", + "status": "ok", + "data": { + "info": { + "supplierCode": "1045543weee", + "descriptions": "新的公司22" + } + } } ``` diff --git a/mes/供应商/列出供应商.md b/mes/供应商/列出供应商.md index e51a4c5..8693e45 100644 --- a/mes/供应商/列出供应商.md +++ b/mes/供应商/列出供应商.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/ListSupplier ``` { "data": { - profile: "测试厂区", - search: "互利", + "profile": "测试", + "search": "互利", } } ``` @@ -47,19 +47,28 @@ URL: http://localhost:8033/open/ListSupplier ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - supplierCode: "1002210180009192", - descriptions: "无锡联晟光伏科技有限公司", - }, - { - supplierCode: "1002210180009206", - descriptions: "无锡梦鼎光电科技有限公司", - } - ] - } + "clock": "2023-07-05 13:43:46.740", + "status": "ok", + "data": { + "list": [ + { + "supplierCode": "1002210180004606", + "descriptions": "国网江苏省电力有限公司宿迁供电分公司" + }, + { + "supplierCode": "1002210180004613", + "descriptions": "国网江苏省电力有限公司徐州供电分公司" + }, + { + "supplierCode": "1002210180004620", + "descriptions": "国网江苏综合能源服务有限公司" + }, + { + "supplierCode": "1002210180012203", + "descriptions": "国网江苏省电力有限公司徐州市铜山区供电分公司" + } + ] + } } ``` diff --git a/mes/供应商/删除供应商.md b/mes/供应商/删除供应商.md index 2a0f893..6144457 100644 --- a/mes/供应商/删除供应商.md +++ b/mes/供应商/删除供应商.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/DeleteSupplier ``` { "data": { - profile: "测试厂区", - supplierCode: "1002210180009192", + "profile": "测试", + "supplierCode": "1002210180004606" } } ``` diff --git a/mes/供应商/查询供应商详情.md b/mes/供应商/查询供应商详情.md index 171d657..09a2801 100644 --- a/mes/供应商/查询供应商详情.md +++ b/mes/供应商/查询供应商详情.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/GetSupplier ``` { "data": { - profile: "测试厂区", - supplierCode: "1002210180009192", + "profile": "测试", + "supplierCode": "1002210180009192" } } ``` @@ -47,14 +47,14 @@ URL: http://localhost:8033/open/GetSupplier ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - info: { - supplierCode: "1002210180009192", - descriptions: "无锡联晟光伏科技有限公司" - } - } + "clock": "2023-07-05 13:39:40.615", + "status": "ok", + "data": { + "info": { + "supplierCode": "1002210180009192", + "descriptions": "无锡联晟光伏科技有限公司" + } + } } ``` diff --git a/mes/供应商/添加供应商.md b/mes/供应商/添加供应商.md index 37c6bf8..613dae6 100644 --- a/mes/供应商/添加供应商.md +++ b/mes/供应商/添加供应商.md @@ -27,9 +27,9 @@ URL: http://localhost:8033/open/AddSupplier ``` { "data": { - profile: "测试厂区", - supplierCode: "1002210180009192", - descriptions: "", + "profile": "测试", + "supplierCode": "1045543weee", + "descriptions": "新的公司" } } ``` @@ -43,9 +43,14 @@ URL: http://localhost:8033/open/AddSupplier ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": {} + "clock": "2023-07-05 13:49:18.396", + "status": "ok", + "data": { + "info": { + "supplierCode": "1045543weee", + "descriptions": "新的公司" + } + } } ``` diff --git a/mes/选项/列出产品标签形式.md b/mes/选项/列出产品标签形式.md index 4e740f2..6c68a7d 100644 --- a/mes/选项/列出产品标签形式.md +++ b/mes/选项/列出产品标签形式.md @@ -26,7 +26,7 @@ URL: http://localhost:8033/open/ListDfFamilys ``` { "data": { - profile: "测试厂区", + profile: "测试", search: "11BB", } } @@ -44,7 +44,6 @@ URL: http://localhost:8033/open/ListDfFamilys | familyCode | string | 标签形式编码 | | descriptions | string | 标签形式描述 | | aliasName | string | 创建者 | -| flag | int | 数据状态:0禁用 1启用 | | createTime | string | 创建时间 | @@ -52,17 +51,42 @@ URL: http://localhost:8033/open/ListDfFamilys ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - familyCode: "AG-HD108N-415", - descriptions: "AG-HD108N-415", - aliasName: "mesadmin", - flag: 1, - createTime: "2022-01-10 23:10:01.890" - }] - } + "clock": "2023-07-05 10:32:51.014", + "status": "ok", + "data": { + "list": [ + { + "familyCode": "JW-HD144-11BB", + "descriptions": "JW-HD144-11BB", + "aliasName": "zcpl", + "createTime": "2021-11-03 10:42:38.283" + }, + { + "familyCode": "JW-HD144N-11BB", + "descriptions": "JW-HD144N-11BB", + "aliasName": "xk", + "createTime": "2022-01-15 20:29:47.693" + }, + { + "familyCode": "JW-HD144P-11BB", + "descriptions": "JW-HD144P-11BB", + "aliasName": "zcpl", + "createTime": "2021-11-03 11:42:33.083" + }, + { + "familyCode": "ZR-144N-11BB", + "descriptions": "ZR-144N-11BB", + "aliasName": "xk", + "createTime": "2022-01-16 19:50:01.930" + }, + { + "familyCode": "ZR-144P-11BB", + "descriptions": "ZR-144P-11BB", + "aliasName": "ZCPL", + "createTime": "2022-04-29 12:35:09.577" + } + ] + } } ``` diff --git a/mes/选项/列出产品特征.md b/mes/选项/列出产品特征.md index 80147a7..37953a5 100644 --- a/mes/选项/列出产品特征.md +++ b/mes/选项/列出产品特征.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/ListFeatureCode ``` { "data": { - profile: "测试厂区", - search: "P", + "profile": "测试厂区", + "search": "P", } } ``` @@ -53,10 +53,10 @@ URL: http://localhost:8033/open/ListFeatureCode "clock": "2023-06-25 20:00:00.000", "status": "ok", "data": { - list: [{ - SourceId: 1, - SourceValue: "P", - SourceDesc: "P" + "list": [{ + "SourceId": 1, + "SourceValue": "P", + "SourceDesc": "P" }] } } From 48f04339c1258241926e9c5c2fa69bd12c67373f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E6=88=90=E6=97=AD?= <1043274364@qq.com> Date: Wed, 5 Jul 2023 13:59:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/产品/修改产品.md | 132 ++++++++++++++++++++++++++++++++++-- mes/产品/添加产品.md | 133 +++++++++++++++++++++++++++++++++++-- 2 files changed, 257 insertions(+), 8 deletions(-) diff --git a/mes/产品/修改产品.md b/mes/产品/修改产品.md index 499d892..ee03f13 100644 --- a/mes/产品/修改产品.md +++ b/mes/产品/修改产品.md @@ -37,7 +37,7 @@ URL: http://localhost:8033/open/UpdateProduct ``` { "data": { - "profile": "测试厂区", + "profile": "测试", "productCode": "088+089ART-MW", "familyCode": "ART550-144MHA", "processGroupId": 34, @@ -62,9 +62,133 @@ URL: http://localhost:8033/open/UpdateProduct ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": {} + "clock": "2023-07-05 13:58:49.886", + "status": "ok", + "data": { + "info": { + "productCode": "088+089ART-MW", + "familyCode": "ART550-144MHA", + "processGroupId": 0, + "crysTypeId": 12, + "crysTypeDesc": "12BB", + "crysTypeValue": "12BB", + "busbarTypeId": 31, + "busbarTypeDesc": "78", + "busbarTypeValue": "78", + "cellQty": 0, + "cellQtyDesc": "D", + "cellQtyValue": "D", + "cellColorId": 0, + "cellColorDesc": "N/A", + "cellColorValue": "N/A", + "modSpecId": 13, + "modSpecDesc": "2465*1134*35", + "modSpecValue": "2465*1134*35", + "modWeight": "", + "fgCode": "", + "createDate": "2022-01-10 23:10:01.890", + "lastUpdate": "2023-07-05 13:58:49.843", + "lastUpdateuser": "", + "processType": 22, + "processTypedesc": "A", + "processTypeValue": "A", + "featureCode": 34, + "featureCodeDesc": "OK", + "featureCodeValue": "OK", + "serialCodeRule": "", + "palletCodeRule": "", + "attrs": [ + { + "id": null, + "attributeId": null, + "attributeDesc": "颜色1", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "背板类型", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "产品电池片尺寸", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "边框类型", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "玻璃类型", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "产品组件类型", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "包装数量", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "仓库属性", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + } + ] + } + } } ``` diff --git a/mes/产品/添加产品.md b/mes/产品/添加产品.md index 02c1d38..a02da90 100644 --- a/mes/产品/添加产品.md +++ b/mes/产品/添加产品.md @@ -38,7 +38,7 @@ URL: http://localhost:8033/open/AddProduct { "data": { "profile": "测试", - "productCode": "088+089ART-MW", + "productCode": "088+089ART-MW-2", "familyCode": "ART550-144MHA", "processGroupId": 34, "crysTypeId": 12, @@ -62,9 +62,134 @@ URL: http://localhost:8033/open/AddProduct ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": {} + "clock": "2023-07-05 13:57:00.077", + "status": "ok", + "data": { + "info": { + "productCode": "088+089ART-MW-2", + "familyCode": "ART550-144MHA", + "processGroupId": 0, + "crysTypeId": 12, + "crysTypeDesc": "12BB", + "crysTypeValue": "12BB", + "busbarTypeId": 31, + "busbarTypeDesc": "78", + "busbarTypeValue": "78", + "cellQty": 0, + "cellQtyDesc": "D", + "cellQtyValue": "D", + "cellColorId": 0, + "cellColorDesc": null, + "cellColorValue": null, + "modSpecId": 13, + "modSpecDesc": "2465*1134*35", + "modSpecValue": "2465*1134*35", + "modWeight": "", + "fgCode": "", + "createDate": "2023-07-05 13:56:59.927", + "lastUpdate": "2023-07-05 13:56:59.927", + "lastUpdateuser": null, + "processType": 22, + "processTypedesc": "A", + "processTypeValue": "A", + "featureCode": 34, + "featureCodeDesc": "OK", + "featureCodeValue": "OK", + "serialCodeRule": null, + "palletCodeRule": null, + "attrs": [ + + { + "id": null, + "attributeId": null, + "attributeDesc": "颜色1", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "背板类型", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "产品电池片尺寸", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "边框类型", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "玻璃类型", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "产品组件类型", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "包装数量", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + }, + { + "id": null, + "attributeId": null, + "attributeDesc": "仓库属性", + "productCode": null, + "description": null, + "code": null, + "createTime": "0001/1/1 0:00:00", + "createTimeLucid": "0001-01-01 00:00:00.000", + "createUser": null + } + ] + } + } } ``` From 7570243007e5e42070f73aab246759a2ec0c8798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E6=88=90=E6=97=AD?= <1043274364@qq.com> Date: Wed, 5 Jul 2023 14:38:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/物料/修改物料.md | 74 ++++++++++++++------- mes/物料/列出物料.md | 111 ++++++++++++++++++------------- mes/物料/列出物料类别.md | 76 +++++++++++++-------- mes/物料/删除物料.md | 4 +- mes/物料/查询物料详情.md | 111 +++++++++++++++++++++---------- mes/物料/添加物料.md | 75 +++++++++++++-------- 6 files changed, 288 insertions(+), 163 deletions(-) diff --git a/mes/物料/修改物料.md b/mes/物料/修改物料.md index fdbd7ef..8c0c3a7 100644 --- a/mes/物料/修改物料.md +++ b/mes/物料/修改物料.md @@ -35,37 +35,33 @@ attrs字段 | attrName | string | 否 | 属性名称 | | attrValue | string | 否 | 物料属性值 | | attrValueCode | string | 否 | 物料属性值代码 | -| flag | int | 否 | 数据状态:0禁用 1启用,默认1 | 示例 1:修改电池片及物料属性值 ``` { "data": { - profile: "测试厂区", - materialCode: "CELL001", - materialTypeCode: "CELL", - descriptions: "电池片描述", - flag: 1, - attrs: [{ - materialCode: "CELL001", - materialTypeCode: "CELL", - attrCode: "crys_type", - attrName: "晶体结构", - attrValue: "单晶", - attrValueCode: "单晶", - flag: 1 + "profile": "测试", + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "descriptions": "电池片描述", + "attrs": [{ + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "attrCode": "crys_type", + "attrName": "晶体结构", + "attrValue": "单晶", + "attrValueCode": "单晶" }, { - materialCode: "CELL001", - materialTypeCode: "CELL", - attrCode: "cell_uop", - attrName: "单片功率", - attrValue: "7.82", - attrValueCode: "7.82", - flag: 1 + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "attrCode": "cell_uop", + "attrName": "单片功率", + "attrValue": "7.88", + "attrValueCode": "7.88" } - ], + ] } } ``` @@ -80,9 +76,37 @@ attrs字段 ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": {} + "clock": "2023-07-05 14:37:28.022", + "status": "ok", + "data": { + "info": { + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "descriptions": "电池片描述", + "createTime": "2023-07-05 14:29:40.007", + "attrs": [ + { + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_uop", + "attrName": "单片功率", + "attrValue": "7.88", + "attrValueCode": "7.88" + }, + { + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "crys_type", + "attrName": "晶体结构", + "attrValue": "单晶", + "attrValueCode": "单晶" + } + ] + } + } } ``` diff --git a/mes/物料/列出物料.md b/mes/物料/列出物料.md index 6752328..6fcd3cd 100644 --- a/mes/物料/列出物料.md +++ b/mes/物料/列出物料.md @@ -27,21 +27,9 @@ URL: http://localhost:8033/open/ListMaterial ``` { "data": { - profile: "测试厂区", - search: "玻璃", - type: "" - } -} -``` - -示例 2:根据物料类别查询玻璃主材 - -``` -{ - "data": { - profile: "测试厂区", - search: "", - type: "GLASS" + "profile": "测试", + "search": "001", + "type": "CELL" } } ``` @@ -79,39 +67,66 @@ attrs字段 ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - materialCode: "CELL001", - materialTypeCode: "CELL", - materialTypeDesc: "电池片", - descriptions: "电池片描述", - flag: 1, - createTime: "2023-04-09 18:10:01", - attrs: [{ - materialCode: "CELL001", - materialTypeCode: "CELL", - materialTypeDesc: "电池片", - attrCode: "crys_type", - attrName: "晶体结构", - attrValue: "单晶", - attrValueCode: "单晶", - flag: 1 - }, - { - materialCode: "CELL001", - materialTypeCode: "CELL", - materialTypeDesc: "电池片", - attrCode: "cell_uop", - attrName: "单片功率", - attrValue: "7.82", - attrValueCode: "7.82", - flag: 1 - } - ], - }] - } + "clock": "2023-07-05 14:12:33.463", + "status": "ok", + "data": { + "list": [ + { + "materialCode": "20230704001", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "descriptions": "测试电池片", + "createTime": "2023-07-04 13:38:41.100", + "attrs": [ + { + "materialCode": "20230704001", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_uop", + "attrName": "单片功率", + "attrValue": "7.24", + "attrValueCode": "" + } + ] + }, + { + "materialCode": "dianchi0001", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "descriptions": "电池01", + "createTime": "2023-06-08 16:00:50.750", + "attrs": [ + { + "materialCode": "dianchi0001", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_eff", + "attrName": "电池效率", + "attrValue": "24", + "attrValueCode": "" + }, + { + "materialCode": "dianchi0001", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_uop", + "attrName": "单片功率", + "attrValue": "23", + "attrValueCode": "" + }, + { + "materialCode": "dianchi0001", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "d", + "attrName": "d", + "attrValue": "123", + "attrValueCode": "123" + } + ] + } + ] + } } ``` diff --git a/mes/物料/列出物料类别.md b/mes/物料/列出物料类别.md index 3c7e913..49feb79 100644 --- a/mes/物料/列出物料类别.md +++ b/mes/物料/列出物料类别.md @@ -21,13 +21,12 @@ URL: http://localhost:8033/open/ListMaterialType | profile | string | 是 | 厂区代码 | | search | string | 否 | 物料类型模糊查询 | -示例 1:模糊查询电池物料类别 +示例 1:查询物料类别 ``` { "data": { - profile: "测试厂区", - search: "电池", + "profile": "测试", } } ``` @@ -43,7 +42,6 @@ URL: http://localhost:8033/open/ListMaterialType | materialTypeCode | string | 物料类别代码 | | materialTypeDesc | string | 物料类别名称 | | unit | string | 单位 | -| flag | int | 数据状态:0禁用 1启用 | | ManagerType | string | 创建时间 | | Sort | int | 序号 | | ErpCode | string | | @@ -53,29 +51,53 @@ URL: http://localhost:8033/open/ListMaterialType ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - materialTypeCode: "CELL", - materialTypeDesc: "电池片", - unit: "pcs", - flag: 1, - ManagerType: "Photovoltaic", - Sort: 1, - ErpCode: "", - }, - { - materialTypeCode: "EVA", - materialTypeDesc: "EVA", - unit: "m2", - flag: 1, - ManagerType: "Photovoltaic", - Sort: 2, - ErpCode: "", - } - ] - } + "clock": "2023-07-05 14:14:46.536", + "status": "ok", + "data": { + "list": [ + + { + "materialTypeCode": "Battery", + "materialTypeDesc": "电池材料", + "unit": "", + "managerType": "", + "sort": 0, + "erpCode": " " + }, + { + "materialTypeCode": "BKSHEET", + "materialTypeDesc": "背板", + "unit": "m2", + "managerType": "Photovoltaic", + "sort": 5, + "erpCode": "#F06#,#F06# " + }, + { + "materialTypeCode": "BOMID", + "materialTypeDesc": "BOMID", + "unit": "", + "managerType": "Photovoltaic", + "sort": 0, + "erpCode": " " + }, + { + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "unit": "pcs", + "managerType": "Photovoltaic", + "sort": 1, + "erpCode": "#D#,#D# " + }, + { + "materialTypeCode": "EVA", + "materialTypeDesc": "EVA", + "unit": "m2", + "managerType": "Photovoltaic", + "sort": 2, + "erpCode": "#H0603#,#H0603# " + } + ] + } } ``` diff --git a/mes/物料/删除物料.md b/mes/物料/删除物料.md index d520512..510d13a 100644 --- a/mes/物料/删除物料.md +++ b/mes/物料/删除物料.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/DeleteMaterial ``` { "data": { - profile: "测试厂区", - materialCode: "CELL001", + "profile": "测试", + "materialCode": "Z测试1" } } ``` diff --git a/mes/物料/查询物料详情.md b/mes/物料/查询物料详情.md index caa2620..98cf6c6 100644 --- a/mes/物料/查询物料详情.md +++ b/mes/物料/查询物料详情.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/GetMaterial ``` { "data": { - profile: "测试厂区", - materialCode: "CELL001", + "profile": "测试", + "materialCode": "M.1.1.N.107" } } ``` @@ -65,39 +65,80 @@ 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: [{ - materialCode: "CELL001", - materialTypeCode: "CELL", - materialTypeDesc: "电池片", - attrCode: "crys_type", - attrName: "晶体结构", - attrValue: "单晶", - attrValueCode: "单晶", - flag: 1 - }, - { - materialCode: "CELL001", - materialTypeCode: "CELL", - materialTypeDesc: "电池片", - attrCode: "cell_uop", - attrName: "单片功率", - attrValue: "7.82", - attrValueCode: "7.82", - flag: 1 - } - ], - } - } + "clock": "2023-07-05 14:04:45.089", + "status": "ok", + "data": { + "info": { + "materialCode": "M.1.1.N.107", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "descriptions": "电池片", + "flag": 1, + "createTime": "2023-04-08 23:43:38.023", + "attrs": [ + { + "materialCode": "M.1.1.N.107", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_uop", + "attrName": "单片功率", + "attrValue": "7.82", + "attrValueCode": "", + "flag": 1 + }, + { + "materialCode": "M.1.1.N.107", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_color", + "attrName": "电池颜色", + "attrValue": "淡蓝", + "attrValueCode": "", + "flag": 1 + }, + { + "materialCode": "M.1.1.N.107", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_grade", + "attrName": "电池等级", + "attrValue": "A", + "attrValueCode": "", + "flag": 1 + }, + { + "materialCode": "M.1.1.N.107", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_size", + "attrName": "电池规格", + "attrValue": "M10", + "attrValueCode": "", + "flag": 1 + }, + { + "materialCode": "M.1.1.N.107", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_eff", + "attrName": "电池效率", + "attrValue": "22.9%", + "attrValueCode": "", + "flag": 1 + }, + { + "materialCode": "M.1.1.N.107", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_type", + "attrName": "电池类型", + "attrValue": "N", + "attrValueCode": "", + "flag": 1 + } + ] + } + } } ``` diff --git a/mes/物料/添加物料.md b/mes/物料/添加物料.md index d07e1af..99db412 100644 --- a/mes/物料/添加物料.md +++ b/mes/物料/添加物料.md @@ -23,7 +23,6 @@ URL: http://localhost:8033/open/AddMaterial | materialTypeCode | string | 是 | 物料类别代码 | | descriptions | string | 否 | 物料描述 | | attrs | Array | 否 | 物料属性 | -| flag | int | 否 | 数据状态:0禁用 1启用,默认1| attrs字段 @@ -35,37 +34,33 @@ attrs字段 | attrName | string | 否 | 属性名称 | | attrValue | string | 否 | 物料属性值 | | attrValueCode | string | 否 | 物料属性值代码 | -| flag | int | 否 | 数据状态:0禁用 1启用,默认1 | 示例 1:添加电池片及物料属性值 ``` { "data": { - profile: "测试厂区", - materialCode: "CELL001", - materialTypeCode: "CELL", - descriptions: "电池片描述", - flag: 1, - attrs: [{ - materialCode: "CELL001", - materialTypeCode: "CELL", - attrCode: "crys_type", - attrName: "晶体结构", - attrValue: "单晶", - attrValueCode: "单晶", - flag: 1 + "profile": "测试", + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "descriptions": "电池片描述", + "attrs": [{ + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "attrCode": "crys_type", + "attrName": "晶体结构", + "attrValue": "单晶", + "attrValueCode": "单晶" }, { - materialCode: "CELL001", - materialTypeCode: "CELL", - attrCode: "cell_uop", - attrName: "单片功率", - attrValue: "7.82", - attrValueCode: "7.82", - flag: 1 + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "attrCode": "cell_uop", + "attrName": "单片功率", + "attrValue": "7.82", + "attrValueCode": "7.82" } - ], + ] } } ``` @@ -79,9 +74,37 @@ attrs字段 ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": {} + "clock": "2023-07-05 14:29:40.122", + "status": "ok", + "data": { + "info": { + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "descriptions": "电池片描述", + "createTime": "2023-07-05 14:29:40.008", + "attrs": [ + { + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "cell_uop", + "attrName": "单片功率", + "attrValue": "7.82", + "attrValueCode": "7.82" + }, + { + "materialCode": "CELL002", + "materialTypeCode": "CELL", + "materialTypeDesc": "电池片", + "attrCode": "crys_type", + "attrName": "晶体结构", + "attrValue": "单晶", + "attrValueCode": "单晶" + } + ] + } + } } ``` From 214a347a1e569a9a87caf0d703a823ac45ec12be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E6=88=90=E6=97=AD?= <1043274364@qq.com> Date: Wed, 5 Jul 2023 15:04:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=90=8E=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/选项/列出产品标签形式.md | 4 ++-- mes/选项/列出产品特征.md | 29 ++++++++++++++++---------- mes/选项/列出工艺类型.md | 28 +++++++++++++++---------- mes/选项/列出晶体类型.md | 28 +++++++++++++++---------- mes/选项/列出栅线类型.md | 28 +++++++++++++++---------- mes/选项/列出电池片数量.md | 28 +++++++++++++++---------- mes/选项/列出组件规格.md | 29 +++++++++++++++----------- 7 files changed, 105 insertions(+), 69 deletions(-) diff --git a/mes/选项/列出产品标签形式.md b/mes/选项/列出产品标签形式.md index 6c68a7d..4877a9c 100644 --- a/mes/选项/列出产品标签形式.md +++ b/mes/选项/列出产品标签形式.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/ListDfFamilys ``` { "data": { - profile: "测试", - search: "11BB", + "profile": "测试", + "search": "11BB" } } ``` diff --git a/mes/选项/列出产品特征.md b/mes/选项/列出产品特征.md index 37953a5..340ee3d 100644 --- a/mes/选项/列出产品特征.md +++ b/mes/选项/列出产品特征.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/ListFeatureCode ``` { "data": { - "profile": "测试厂区", - "search": "P", + "profile": "测试", + "search": "P" } } ``` @@ -42,6 +42,8 @@ URL: http://localhost:8033/open/ListFeatureCode | 字段 | 类型 | 说明 | | :-- | :-- | :-- | | SourceId | string | id | +| sourceGroupName | string | 选项分组值 | +| sourceGroupDesc | string | 选项分组描述 | | SourceValue | string | 选项值 | | SourceDesc | string | 选项描述 | @@ -50,15 +52,20 @@ URL: http://localhost:8033/open/ListFeatureCode ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - "list": [{ - "SourceId": 1, - "SourceValue": "P", - "SourceDesc": "P" - }] - } + "clock": "2023-07-05 14:53:20.166", + "status": "ok", + "data": { + "list": [ + { + "sourceId": 9, + "sourceGroupName": "FEATURE_CODE", + "sourceGroupDesc": "产品特征", + "sourceDesc": "P", + "sourceValue": "P", + "sndGroup": "" + } + ] + } } ``` diff --git a/mes/选项/列出工艺类型.md b/mes/选项/列出工艺类型.md index 71f1a95..ea9a5f2 100644 --- a/mes/选项/列出工艺类型.md +++ b/mes/选项/列出工艺类型.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/ListProcessType ``` { "data": { - profile: "测试厂区", - search: "双玻", + "profile": "测试厂区", + "search": "双玻" } } ``` @@ -42,6 +42,8 @@ URL: http://localhost:8033/open/ListProcessType | 字段 | 类型 | 说明 | | :-- | :-- | :-- | | SourceId | string | id | +| sourceGroupName | string | 选项分组值 | +| sourceGroupDesc | string | 选项分组描述 | | SourceValue | string | 选项值 | | SourceDesc | string | 选项描述 | @@ -50,15 +52,19 @@ URL: http://localhost:8033/open/ListProcessType ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - SourceId: 1, - SourceValue: "双玻组件", - SourceDesc: "双玻组件" - }] - } + "clock": "2023-07-05 15:02:07.720", + "status": "ok", + "data": { + "list": [ + { + "sourceId": 8, + "sourceGroupName": "PROCESS_TYPE", + "sourceGroupDesc": "工艺类型", + "sourceDesc": "双玻组件", + "sourceValue": "双玻组件" + } + ] + } } ``` diff --git a/mes/选项/列出晶体类型.md b/mes/选项/列出晶体类型.md index 0ad641d..aa7c085 100644 --- a/mes/选项/列出晶体类型.md +++ b/mes/选项/列出晶体类型.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/ListCrysType ``` { "data": { - profile: "测试厂区", - search: "单晶", + "profile": "测试", + "search": "单晶" } } ``` @@ -42,6 +42,8 @@ URL: http://localhost:8033/open/ListCrysType | 字段 | 类型 | 说明 | | :-- | :-- | :-- | | SourceId | string | id | +| sourceGroupName | string | 选项分组值 | +| sourceGroupDesc | string | 选项分组描述 | | SourceValue | string | 选项值 | | SourceDesc | string | 选项描述 | @@ -50,15 +52,19 @@ URL: http://localhost:8033/open/ListCrysType ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - SourceId: 1, - SourceValue: "M", - SourceDesc: "单晶" - }] - } + "clock": "2023-07-05 15:02:33.311", + "status": "ok", + "data": { + "list": [ + { + "sourceId": 38, + "sourceGroupName": "CRYS_TYPE", + "sourceGroupDesc": "晶体类型", + "sourceDesc": "单晶", + "sourceValue": "M" + } + ] + } } ``` diff --git a/mes/选项/列出栅线类型.md b/mes/选项/列出栅线类型.md index bb402e1..6236237 100644 --- a/mes/选项/列出栅线类型.md +++ b/mes/选项/列出栅线类型.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/ListBusBar ``` { "data": { - profile: "测试厂区", - search: "11BB", + "profile": "测试", + "search": "11BB" } } ``` @@ -42,6 +42,8 @@ URL: http://localhost:8033/open/ListBusBar | 字段 | 类型 | 说明 | | :-- | :-- | :-- | | SourceId | string | id | +| sourceGroupName | string | 选项分组值 | +| sourceGroupDesc | string | 选项分组描述 | | SourceValue | string | 选项值 | | SourceDesc | string | 选项描述 | @@ -50,15 +52,19 @@ URL: http://localhost:8033/open/ListBusBar ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - SourceId: 1, - SourceValue: "11BB", - SourceDesc: "11BB" - }] - } + "clock": "2023-07-05 15:03:10.748", + "status": "ok", + "data": { + "list": [ + { + "sourceId": 37, + "sourceGroupName": "BUSBAR", + "sourceGroupDesc": "栅线类型", + "sourceDesc": "11BB", + "sourceValue": "11BB" + } + ] + } } ``` diff --git a/mes/选项/列出电池片数量.md b/mes/选项/列出电池片数量.md index 82e1f0e..bccf9e7 100644 --- a/mes/选项/列出电池片数量.md +++ b/mes/选项/列出电池片数量.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/ListCellQty ``` { "data": { - profile: "测试厂区", - search: "108", + "profile": "测试", + "search": "108" } } ``` @@ -42,6 +42,8 @@ URL: http://localhost:8033/open/ListCellQty | 字段 | 类型 | 说明 | | :-- | :-- | :-- | | SourceId | string | id | +| sourceGroupName | string | 选项分组值 | +| sourceGroupDesc | string | 选项分组描述 | | SourceValue | string | 选项值 | | SourceDesc | string | 选项描述 | @@ -50,15 +52,19 @@ URL: http://localhost:8033/open/ListCellQty ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - SourceId: 1, - SourceValue: "108", - SourceDesc: "108" - }] - } + "clock": "2023-07-05 14:58:36.623", + "status": "ok", + "data": { + "list": [ + { + "sourceId": 53, + "sourceGroupName": "CELL_QTY", + "sourceGroupDesc": "电池片数量", + "sourceDesc": "108", + "sourceValue": "108", + } + ] + } } ``` diff --git a/mes/选项/列出组件规格.md b/mes/选项/列出组件规格.md index 24131f1..8bb460d 100644 --- a/mes/选项/列出组件规格.md +++ b/mes/选项/列出组件规格.md @@ -26,8 +26,8 @@ URL: http://localhost:8033/open/ListModSize ``` { "data": { - profile: "测试厂区", - search: "1728", + "profile": "测试", + "search": "1728" } } ``` @@ -42,23 +42,28 @@ URL: http://localhost:8033/open/ListModSize | 字段 | 类型 | 说明 | | :-- | :-- | :-- | | SourceId | string | id | +| sourceGroupName | string | 选项分组值 | +| sourceGroupDesc | string | 选项分组描述 | | SourceValue | string | 选项值 | | SourceDesc | string | 选项描述 | - 查询成功时,响应如下: ``` { - "clock": "2023-06-25 20:00:00.000", - "status": "ok", - "data": { - list: [{ - SourceId: 1, - SourceValue: "1728*1134*30", - SourceDesc: "1728*1134*30" - }] - } + "clock": "2023-07-05 15:03:37.622", + "status": "ok", + "data": { + "list": [ + { + "sourceId": 52, + "sourceGroupName": "MOD_SIZE", + "sourceGroupDesc": "组件规格", + "sourceDesc": "1728*1134*30", + "sourceValue": "1728*1134*30" + } + ] + } } ```