feat(mes): 新增数据采集设备接入、记录、看板与统计(需求6系统侧)
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | # MES æ°æ®ééï¼é¸¡çªè®¡æ°è®¾å¤ï¼å端èè°æ¹æ¡ |
| | | |
| | | > éæ±6ï¼é¸¡çªèªå¨è®¡æ°/ç§°éè®¾å¤æ¥å
¥ MOMã第ä¸é¶æ®µåªåãéé â å±ç¤º â ç»è®¡ãï¼ä¸èªå¨ååç产æ¥å·¥æå
è£
ã |
| | | > ç°åºè®¾å¤æ¥çº¿ä¸ç½å
³ç±ç°åºåäºè´è´£ï¼ç³»ç»ä¾§æä¾ HTTP JSON 䏿¥æ¥å£ + 管ç端页é¢ã |
| | | |
| | | ## æ¶åé¡µé¢ |
| | | |
| | | - çäº§ç®¡æ§ â æ°æ®éé â 设å¤ç®¡çï¼`/mes/dc/device`ï¼ |
| | | - çäº§ç®¡æ§ â æ°æ®éé â 宿¶çæ¿ï¼`/mes/dc/dashboard`ï¼ |
| | | - çäº§ç®¡æ§ â æ°æ®éé â ééè®°å½ï¼`/mes/dc/record`ï¼ |
| | | - çäº§ç®¡æ§ â æ°æ®éé â ç»è®¡åæï¼`/mes/dc/statistics`ï¼ |
| | | |
| | | ## 设å¤ç«¯æ¥å
¥ï¼ç°åºç½å
³/åäºå¯¹æ¥ç¨ï¼ |
| | | |
| | | ### 1. æ¥å
¥åå¤ |
| | | |
| | | 1. å¨ã设å¤ç®¡çãæ°å¢éé设å¤ï¼å¡«å设å¤ç¼å·ï¼å¦ `DC001`ï¼ãåç§°ã设å¤ç±»åï¼ |
| | | 2. å建æååå¼¹çªä¸æ¬¡æ§æ¾ç¤º 40 ä½éé令çï¼é
ç½®å°è®¾å¤ç«¯ï¼ |
| | | 3. 令çä»
å¨å建/éç½®æ¶è¿åï¼é失åªè½éç½®ï¼æ§ä»¤çç«å³å¤±æï¼ï¼ |
| | | 4. 设å¤ç«¯æ¯æ¬¡è¯·æ±æºå¸¦è¯·æ±å¤´ `X-Device-Token: <令ç>`ï¼ä¹æ¯æ URL åæ° `token`ï¼è¯·æ±å¤´ä¼å
ï¼ã |
| | | |
| | | ### 2. 䏿¥æ¥å£ |
| | | |
| | | | æ¹æ³ | è·¯å¾ | 说æ | |
| | | |------|------|------| |
| | | | POST | `/admin-api/mes/data-collection/open/ingest` | 䏿¥ä¸æ¬¡ééæ°æ® | |
| | | | POST | `/admin-api/mes/data-collection/open/heartbeat` | 䏿¥å¿è·³ï¼å»ºè®®æ¯ 1 åé䏿¬¡ï¼ | |
| | | |
| | | **䏿¥è¯·æ±åæ°ï¼** |
| | | |
| | | | åæ° | ç±»å | å¿
å¡« | 说æ | |
| | | |------|------|------|------| |
| | | | deviceCode | String | æ¯ | 设å¤ç¼å·ï¼é¡»ä¸è®¾å¤å°è´¦ä¸è´ | |
| | | | bizId | String | 建议 | 设å¤ä¾§å¯ä¸é®ï¼éå¤ä¸æ¥æå¹çå¤çï¼è¿å `duplicate=true`ï¼ä¸æ°å¢è®°å½ï¼ | |
| | | | recordNo | String | å¦ | 设å¤ä¾§è®°å½åºå·ï¼ä»
å±ç¤º | |
| | | | recordTime | String | å¦ | 设å¤ééæ¶é´ï¼æ ¼å¼ `yyyy-MM-dd HH:mm:ss`ï¼ä¸ä¼ åæå¡å¨æ¶é´ | |
| | | | count | Integer | äºéä¸ | æ¬æ¬¡è®¡æ°ï¼ä¸ `totalCount` é½ä¼ æ¶ä»¥ `count` 为å | |
| | | | totalCount | Integer | äºéä¸ | 设å¤ç´¯è®¡è®¡æ°ï¼åªä¼ ç´¯è®¡å¼æ¶ï¼ç³»ç»ç¨ãæ¬æ¬¡ç´¯è®¡ - 䏿¬¡ç´¯è®¡ãè®¡ç®æ¬æ¬¡æ°é | |
| | | | weight | BigDecimal | å¦ | æ¬æ¬¡ééï¼gï¼ | |
| | | | totalWeight | BigDecimal | å¦ | 设å¤ç´¯è®¡ééï¼gï¼ï¼ä»
çå | |
| | | | online | Boolean | å¦ | æ¯å¦å¨çº¿å®æ¶ä¸æ¥ï¼ç¦»çº¿è¡¥æ¥ä¼ `false`ï¼é»è®¤ `true` | |
| | | | firmwareVersion | String | å¦ | åºä»¶çæ¬ï¼ä¸æ¥åæ´æ°å°è®¾å¤å°è´¦ | |
| | | |
| | | **䏿¥ååºç¤ºä¾ï¼** |
| | | |
| | | ```json |
| | | { |
| | | "code": 0, |
| | | "msg": "", |
| | | "data": { |
| | | "recordId": 1024, |
| | | "duplicate": false, |
| | | "quantity": 12, |
| | | "todayQuantity": 120, |
| | | "todayWeight": 3600.50, |
| | | "serverTime": "2026-11-10 14:23:05" |
| | | } |
| | | } |
| | | ``` |
| | | |
| | | **å¿è·³è¯·æ±åæ°ï¼** |
| | | |
| | | | åæ° | ç±»å | å¿
å¡« | 说æ | |
| | | |------|------|------|------| |
| | | | deviceCode | String | æ¯ | 设å¤ç¼å· | |
| | | | firmwareVersion | String | å¦ | åºä»¶çæ¬ | |
| | | | ip | String | å¦ | è®¾å¤ IP | |
| | | |
| | | **å¿è·³ååºï¼** `{ "code": 0, "data": { "serverTime": "...", "deviceName": "...", "enabled": true, "workOrderId": 2048, "workOrderCode": "WO202611100001" } }` |
| | | |
| | | ### 3. 设å¤ç«¯æ³¨æäºé¡¹ |
| | | |
| | | - 设å¤ç¼å·ä¸ä»¤çå¿
须忶æ£ç¡®ï¼å¦åè¿åä¸å¡é误ç ï¼æªæºå¸¦ä»¤ç / ä»¤çæ æ / 设å¤ä¸åå¨ï¼ï¼ |
| | | - 设å¤ç¶æä¸ºãç¦ç¨ãæ¶æç»ä¸æ¥ï¼éå
å¨è®¾å¤ç®¡çå¯ç¨ï¼ |
| | | - 计æ°ä¸ç´¯è®¡å¼ä¸è½ä¸ºè´ï¼ééä¸è½ä¸ºè´ï¼ |
| | | - åä¸ `bizId` éå¤ä¸æ¥è¿å馿¬¡è®°å½ç `recordId` ä¸ `duplicate=true`ï¼ç½å
³å¯å®å
¨éè¯ï¼ |
| | | - åªæ¥ `totalCount` ä¸ä¸ä¸æ¬¡ç´¯è®¡å¼ç¸åï¼è®¾å¤éè¯æªå¸¦ bizIdï¼æ¶æéå¤ä¸æ¥å¤çï¼ä¸æ°å¢è®°å½ï¼ |
| | | - 设å¤è®¡æ°å¨æ¸
é¶ï¼æ¬æ¬¡ç´¯è®¡å°äºä¸æ¬¡ç´¯è®¡ï¼æ¶ï¼ç³»ç»ç´æ¥ææ¬æ¬¡ç´¯è®¡å¼å½ä½æ¬æ¬¡æ°éï¼ |
| | | - æ¶é´ç»ä¸ææå¡å¨æ¬å°æ¶åºï¼`recordTime` ä¸ä¼ å³è®°å½æ¥æ¶æ¶é´ã |
| | | |
| | | ## 管ç端 API |
| | | |
| | | | æ¹æ³ | è·¯å¾ | æé | 说æ | |
| | | |------|------|------|------| |
| | | | POST | `/mes/data-collection/device/create` | `mes:dc-device:create` | æ°å¢è®¾å¤ï¼è¿å `id` + 䏿¬¡æ§ `token` | |
| | | | PUT | `/mes/data-collection/device/update` | `mes:dc-device:update` | ä¿®æ¹è®¾å¤ï¼ä¸ä¼ä¿®æ¹ä»¤çï¼ | |
| | | | DELETE | `/mes/data-collection/device/delete?id=` | `mes:dc-device:delete` | å é¤è®¾å¤ | |
| | | | GET | `/mes/data-collection/device/get?id=` | `mes:dc-device:query` | 设å¤è¯¦æ
| |
| | | | GET | `/mes/data-collection/device/page` | `mes:dc-device:query` | 设å¤å页ï¼code/name/deviceType/status/workOrderCodeï¼ | |
| | | | GET | `/mes/data-collection/device/simple-list` | `mes:dc-device:query` | 设å¤ç²¾ç®å表ï¼ä¸æç¨ï¼ | |
| | | | PUT | `/mes/data-collection/device/reset-token?id=` | `mes:dc-device:reset-token` | é置令çï¼è¿åæ°ä»¤ç | |
| | | | PUT | `/mes/data-collection/device/bind-work-order` | `mes:dc-device:bind` | ç»å®ç产工åï¼bodyï¼`{ id, workOrderId }` | |
| | | | PUT | `/mes/data-collection/device/unbind-work-order?id=` | `mes:dc-device:bind` | è§£ç»ç产工å | |
| | | | GET | `/mes/data-collection/record/page` | `mes:dc-record:query` | è®°å½å页ï¼deviceId/deviceCode/workOrderCode/productId/batchCode/status/recordTime èå´ï¼ | |
| | | | GET | `/mes/data-collection/record/get?id=` | `mes:dc-record:query` | è®°å½è¯¦æ
| |
| | | | PUT | `/mes/data-collection/record/correct` | `mes:dc-record:correct` | æ´æ£è®°å½ï¼bodyï¼`{ id, quantity, reason }` | |
| | | | PUT | `/mes/data-collection/record/cancel` | `mes:dc-record:cancel` | ä½åºè®°å½ï¼bodyï¼`{ id, reason }` | |
| | | | GET | `/mes/data-collection/record/export-excel` | `mes:dc-record:export` | å¯¼åº Excelï¼æå½åç鿡件ï¼ä¸åé¡µï¼ | |
| | | | GET | `/mes/data-collection/statistics/summary` | `mes:dc-statistics:query` | ç»è®¡æ±æ» | |
| | | | GET | `/mes/data-collection/statistics/trend` | `mes:dc-statistics:query` | ééè¶å¿ | |
| | | | GET | `/mes/data-collection/statistics/device-overview` | `mes:dc-statistics:query` | 设å¤å®æ¶æ¦è§ï¼çæ¿ï¼ | |
| | | |
| | | **ç»è®¡æ¥è¯¢åæ°ï¼** `beginTime`ã`endTime`ï¼`yyyy-MM-dd HH:mm:ss`ï¼ã`deviceId`ã`workOrderId`ã`granularity`ï¼`day` æå¤© / `hour` æå°æ¶ï¼é»è®¤ `day`ï¼ã |
| | | |
| | | **ç»è®¡ååºï¼** |
| | | |
| | | ```json |
| | | { |
| | | "code": 0, |
| | | "data": { |
| | | "totalQuantity": 1234, |
| | | "totalWeight": 370200.50, |
| | | "recordCount": 56, |
| | | "deviceCount": 2, |
| | | "devices": [ |
| | | { "deviceId": 1, "deviceCode": "DC001", "deviceName": "ä¸å·çº¿é¸¡çªè®¡æ°", "totalQuantity": 800, "totalWeight": 240000.00, "recordCount": 36 } |
| | | ] |
| | | } |
| | | } |
| | | ``` |
| | | |
| | | è¶å¿é¡¹ï¼`{ "period": "2026-11-10", "totalQuantity": 120, "totalWeight": 36000.00 }`ï¼æå°æ¶æ¶ period å½¢å¦ `2026-11-10 14:00`ï¼ã |
| | | |
| | | ## ä¸å¡æµç¨ä¸æ°æ®å¸¦å
¥ |
| | | |
| | | 1. 设å¤ç®¡çæ°å¢è®¾å¤ â 䏿¬¡æ§ä»¤ç â 设å¤ç«¯é
ç½®ï¼ |
| | | 2. 设å¤ç«¯å¿è·³ â 设å¤å表ãå¨çº¿ç¶æãææåå¿è·³æ¶é´å¤å®ï¼è¶
è¿ 5 åéæ å¿è·³è§ä¸ºç¦»çº¿ï¼ï¼ |
| | | 3. 设å¤ç«¯ä¸æ¥ â çæééè®°å½ï¼æ£å¸¸ç¶æ 0ï¼ï¼ä¸æ¥æ¶è¥è®¾å¤å·²ç»å®å·¥åï¼è®°å½èªå¨å¸¦å
¥ï¼ |
| | | - ç产工å ID / å·¥åç¼å·ï¼ |
| | | - 产å ID / 产åç¼ç / 产ååç§°ï¼ |
| | | - çäº§æ¹æ¬¡å·ã |
| | | 4. ç»å®ç产工ååï¼åªå½±å**åç»æ°ä¸æ¥**çè®°å½ï¼åå²è®°å½ä¸å溯æ¹ç»ï¼ |
| | | 5. è§£ç»åï¼åç»æ°è®°å½ä¸å带工åä¿¡æ¯ï¼åå²è®°å½ä¿çç»å®æ¶çå·¥åä¿¡æ¯ï¼ |
| | | 6. ééè®°å½å¯æ´æ£ï¼æ°éæ¹ä¸ºå®é
å¼ï¼ç¶æ 1 å·²æ´æ£ï¼ä¿çæ´æ£ååå§æ°éä¸åå ï¼æä½åºï¼ç¶æ 2ï¼ä»ä¿çå¨å表å¯è¿½æº¯ï¼ï¼ |
| | | 7. 宿¶çæ¿å±ç¤ºè®¾å¤å¨çº¿ç¶æä¸ä»æ¥äº§éï¼ç»è®¡åæææ¶é´èå´/设å¤ç»åºæ°éãééãè®°å½æ°ãè®¾å¤æ°ä¸æ¥/å°æ¶è¶å¿ï¼ |
| | | 8. ç»è®¡ä¸çæ¿**æé¤å·²ä½åºè®°å½**ï¼å·²æ´æ£è®°å½ææ´æ£åæ°éåä¸ç»è®¡ã |
| | | |
| | | ## åæ®µå±ç¤ºè§å |
| | | |
| | | | åæ®µ | å±ç¤ºä½ç½® | 说æ | |
| | | |------|----------|------| |
| | | | 设å¤ç¼å·/åç§°/ç±»å/åå·/å®è£
ä½ç½® | 设å¤å表ãè®°å½å表ãçæ¿ | ç±»åèµ°åå
¸ `mes_dc_device_type` | |
| | | | 设å¤ç¶æ | 设å¤å表 | åå
¸ `mes_dc_device_status`ï¼0 å¯ç¨ / 1 ç¦ç¨ | |
| | | | å¨çº¿ç¶æ | 设å¤å表ãçæ¿ | æåå¿è·³æ¶é´å¨ 5 åéå
为å¨çº¿ | |
| | | | å½åç»å®å·¥å | 设å¤å表 | æ¾ç¤ºå·¥åç¼å·ï¼æä½ææ¯å¦å·²ç»å®æ¾ç¤ºãç»å®å·¥å/è§£ç»å·¥åã | |
| | | | æåå¿è·³/æå䏿¥æ¶é´ | 设å¤å表 | 精确å°ç§ | |
| | | | åºä»¶çæ¬ | 设å¤å表 | å¿è·³æä¸æ¥æ¶æ´æ° | |
| | | | ééæ°é/设å¤ç´¯è®¡æ°é/éé | ééè®°å½ | ééä¿ç 2 ä½å°æ° | |
| | | | è®°å½ç¶æ | ééè®°å½ | åå
¸ `mes_dc_record_status`ï¼0 æ£å¸¸ / 1 å·²æ´æ£ / 2 å·²ä½åº | |
| | | | 䏿¥æ¹å¼ | ééè®°å½ | å¨çº¿ / ç¦»çº¿è¡¥æ¥ | |
| | | | ç产工åç¼å·/产å/æ¹æ¬¡ | ééè®°å½ | 䏿¥æ¶ç±ç»å®å·¥å带å
¥ï¼å¯è½ä¸ºç©º | |
| | | | ç»è®¡æ±æ»/è¶å¿/æè®¾å¤æ±æ» | ç»è®¡åæ | æé¤ä½åºè®°å½ | |
| | | |
| | | ## ä¸å¡è§å说æ |
| | | |
| | | | åºæ¯ | è§å | |
| | | |------|------| |
| | | | 令çå建/éç½® | ä»
æ¬æ¬¡æ¥å£è¿åï¼å表ä¸è¯¦æ
ä¸è¿å令ç | |
| | | | å¹ç | åä¸è®¾å¤ + ç¸å bizId åªè½ä¸æ¡è®°å½ï¼éå¤è¯·æ±è¿å馿¬¡è®°å½å¹¶æ è®° `duplicate=true` | |
| | | | åªæ¥ç´¯è®¡å¼ | æãæ¬æ¬¡ç´¯è®¡ - 䏿¬¡ç´¯è®¡ã计ç®ï¼é¦æ¬¡æè®¡æ°å¨æ¸
é¶ææ¬æ¬¡ç´¯è®¡ | |
| | | | åç¨è®¾å¤ | æç»ä¸æ¥ä¸å¿è·³ä»¥å¤çééæä½ï¼éå
å¯ç¨ | |
| | | | æ´æ£ | ä»
ãæ£å¸¸ãç¶æå¯æ´æ£ï¼æ´æ£åä¸å¯åæ¬¡æ´æ£ï¼è®°å½ä¿çåå§æ°é | |
| | | | ä½åº | å·²ä½åºä¸å¯éå¤ä½åºï¼ä½åºè®°å½ä¸åä¸ç»è®¡ä¸çæ¿ | |
| | | | ç»è®¡èå´ | é»è®¤å
¨é¨æ¶é´ï¼å¯æè®¾å¤/å·¥å/æ¶é´èå´çé | |
| | | | 第ä¸é¶æ®µè¾¹ç | ééæ°éåªåå±ç¤ºä¸ç»è®¡ï¼**ä¸èªå¨ååç产æ¥å·¥ãå
è£
æåºå**ï¼ååé»è¾å¾
åç»éæ±ç¡®è®¤ | |
| | | |
| | | ## 注æäºé¡¹ |
| | | |
| | | - 设å¤ç«¯ä¸æ¥å°å为ç½å
³å¯è®¿é®çå端å°åï¼å¼åç¯å¢ç»å端代ç `/admin-api`ï¼ç产ç¯å¢ç´æ¥ç¨å端åå + `/admin-api`ï¼ï¼ |
| | | - ä»¤çæ¯è®¾å¤èº«ä»½åè¯ï¼åªé
ç½®å¨ç½å
³ï¼ä¸åå
¥æ¥å¿/æªå¾/ææ¡£ï¼ |
| | | - ä¸ä¸ªè®¾å¤å䏿¶é´åªç»å®ä¸å¼ ç产工åï¼æ¢åéå
è§£ç»åç»å®ï¼ |
| | | - ç»å®æ¶åªå
è®¸éæ©æªå®å·¥ãæªåæ¶çç产工åï¼ |
| | | - 设å¤å·²æééè®°å½æ¶ç¦æ¢å é¤ï¼æç¤ºå
å¤çè®°å½ï¼ï¼é¿å
å岿°æ®å¤±å»è®¾å¤ä¸»ä½ï¼ |
| | | - ééè®°å½å¯¼åºä½¿ç¨å½åç鿡件ï¼å¯¼åºå
¨é¨å¹é
è¡ï¼ä¸å页ï¼ï¼ |
| | | - ç°åºè®¾å¤è¥åªè¾åºç´¯è®¡å¼ï¼å»ºè®®åæ¶ä¸æ¥ `bizId`ï¼é¿å
ç½ç»éè¯é æéå¤è®¡æ°ã |
| | |
| | | ```text |
| | | docs/project-business/ |
| | | âââ index.html # å¯è§å页é¢ï¼åå»ç´æ¥æå¼ï¼file:// å³å¯ï¼æ é任使å¡ï¼ |
| | | âââ mermaid/ # 11 å¼ Mermaid ä¸å¡å¾ï¼æå¨æºï¼æ¹è¿éï¼ |
| | | âââ mermaid/ # 12 å¼ Mermaid ä¸å¡å¾ï¼æå¨æºï¼æ¹è¿éï¼ |
| | | âââ data/ # ä¸å¡æ°æ®ï¼æå¨æºï¼æ¹è¿éï¼ |
| | | â âââ business.json # 项ç®å
ä¿¡æ¯/ä¸å¡åé®/AIè½å/å¾
确认äºé¡¹ |
| | | â âââ modules.json # 12 个ä¸å¡æ¨¡åå®ä¹ |
| | | â âââ modules.json # 14 个ä¸å¡æ¨¡åå®ä¹ |
| | | â âââ objects.json # æ ¸å¿ä¸å¡å¯¹è±¡ï¼ä½ç¨/䏿¸¸/䏿¸¸/表åï¼ |
| | | â âââ flows.json # 7 æ¡æµç¨ï¼æè¦+æ¥éª¤+è§è²ï¼ |
| | | â âââ flows.json # 8 æ¡æµç¨ï¼æè¦+æ¥éª¤+è§è²ï¼ |
| | | â âââ roles.json # è§è²æé |
| | | âââ README.md |
| | | ``` |
| | |
| | | | 09-data-flow | è·¨æ¨¡åæ°æ®æµï¼åæ®çæãåæ®µå¸¦å
¥ãæ°éååãäºä»¶ï¼ | |
| | | | 10-business-object | æ ¸å¿ä¸å¡å¯¹è±¡ ERï¼åªå«ä¸å¡å¯¹è±¡ï¼éå
¨åºè¡¨ï¼ | |
| | | | 11-ai-business-flow | AI ä¸å¡é¾è·¯ï¼OCR/è´¨æ£å¤å®/åç±»é¢æµ/RAGï¼å« API ä¾èµï¼ | |
| | | | 12-data-collection-flow | æ°æ®ééï¼è®¾å¤å»ºæ¡£ä»¤çâå¿è·³/䏿¥(å¹ç·累计差å¼)âç»å®å·¥å带å
¥äº§åæ¹æ¬¡âæ´æ£ä½åºâçæ¿ç»è®¡ï¼ç¬¬ä¸é¶æ®µä¸åå | |
| | | |
| | | å¾ä¸ç¶ææ°åå为æºç æä¸¾çå®å¼ï¼å¦å·¥å 0è稿/1已确认/2宿/3åæ¶ï¼ERP å®¡æ¹ 15审æ¹ä¸/20å·²å®¡æ ¸ï¼ã |
| | | |
| | |
| | | - æ¬ç®å½ç±é¡¹ç®æè½ **project-business-analysis** 管çï¼`.claude/skills/project-business-analysis/`ï¼ï¼å¹¶æè§å `.claude/rules/business-visualization-maintenance.md` 强å¶ï¼ä¸å¡æ¨¡å/æµç¨/ç¶æ/对象/è§è²/AI åæ´åéåæ¥ç»´æ¤æ¬ç®å½ã |
| | | - å¢éç»´æ¤ï¼æ¹å¯¹åºç `mermaid/*.mmd` + `data/*.json` â è¿è¡ä¸é¢ç sync èæ¬ â æµè§å¨éªè¯åå½±åå¾ã |
| | | - å
¨ééåï¼åå·®è¿å¤§æ¶ï¼ï¼å¯¹ Claude 说ãéæ°çæä¸å¡å
¨æ¯ãï¼æè½ä¼éæ°èµ°è¯»æºç å¹¶æçææ¨¡å¼é建ã |
| | | - çæåºçº¿ï¼dev_business @ 87bf4a99ï¼2026-09-10ã |
| | | - çæåºçº¿ï¼dev_business @ 87bf4a99ï¼2026-09-10ï¼æ°æ®ééï¼MES-DCï¼å¢éç»´æ¤äº 2026-11-10ã |
| | | |
| | | ## 7. å·²ç¥å¾
确认ä¸å¡ |
| | | |
| | |
| | | "type": "æ··åç³»ç»", |
| | | "mainSystem": "MOM å¶é è¿è¥ç®¡çç³»ç»", |
| | | "subSystems": [ |
| | | "MESï¼ç产·ä»å¨Â·è´¨é·设å¤ï¼", |
| | | "MESï¼ç产·ä»å¨Â·è´¨é·设å¤Â·æ°æ®ééï¼", |
| | | "ERPï¼è¿éå·财å¡ï¼", |
| | | "CRMï¼å®¢æ·å
³ç³»ï¼", |
| | | "SRMï¼ä¾åºåå
³ç³»ï¼", |
| | |
| | | "frontend": "mom-pro2-beforeï¼Vue3 管çåå°ï¼åä»åºåæ¾ï¼åªè¯»åèï¼" |
| | | }, |
| | | "stats": { |
| | | "businessModules": 13, |
| | | "coreObjects": 48, |
| | | "documentFlows": 6, |
| | | "businessModules": 14, |
| | | "coreObjects": 50, |
| | | "documentFlows": 7, |
| | | "approvalListeners": 13, |
| | | "aiCapabilities": 9, |
| | | "wmBillTypes": 15 |
| | |
| | | "MesWmSnDO æ°å¢ç uuid åæ®µçæ/æ¶è´¹é»è¾æªå¨æ ¸å¿ Service ä¸ç¡®è®¤", |
| | | "转æ£ç³è¯·(hrm_regularize_application)ãå¹è®è¯ä¹¦çä»
æ SQL ä¸èååå§åï¼Java ä¾§ Service/Controller æªå®ç°", |
| | | "NCR å¤ç½®ç»æï¼è¿å·¥/éè´§ï¼æªååè§¦åæºåæ®ï¼ä»
å°è´¦è®°å½", |
| | | "MPS ç¶ææä¸¾ç¬ç«ç¼å·(0/1/2/3)ï¼ä¸éç¨åæ®å¸¸é(0/1/4/5)ä¸ä¸è´" |
| | | "MPS ç¶ææä¸¾ç¬ç«ç¼å·(0/1/2/3)ï¼ä¸éç¨åæ®å¸¸é(0/1/4/5)ä¸ä¸è´", |
| | | "æ°æ®ééï¼é¸¡çªè®¡æ°/ç§°é设å¤ï¼ç¬¬ä¸é¶æ®µåªåééâå±ç¤ºâç»è®¡ï¼ä¸èªå¨ååç产æ¥å·¥ãå
è£
æåºåï¼ç°åºè®¾å¤æ¥çº¿ä¸ç½å
³ç±ç°åºåäºå¯¹æ¥å¾
èè°ã第ä¸é¶æ®µè¾¹çã" |
| | | ], |
| | | "generatedAt": "2026-09-10", |
| | | "generatedAt": "2026-11-10", |
| | | "analysisBasis": "åºäº dev_business 忝 87bf4a99 æºç ï¼6 ç»å¹¶è¡æºç 走读ï¼MES ç产质é / MES ä»å¨ / ERP / CRM+SRM / å®å+HRM / AI+BI+MDM+BPM+åºåº§ï¼" |
| | | } |
| | |
| | | {"stage": "è¾
å©å¤å®", "action": "è´¨æ£å+ææ +ç¼ºé· â å»ºè®®åæ ¼/ç¹é/éè´§/æ¥åº+çç±", "roles": ["è´¨æ£å"]}, |
| | | {"stage": "å³ç颿µ", "action": "缺æ/ç产æ¶é¿/ç产é£é©/交ä»åç±»é¢æµä¾è®¡åæäº§åè", "roles": ["计åå"]}, |
| | | {"stage": "模æ¿è¯å«", "action": "ä¸ä¼ æ¢ææ£éªæ¥åæä»¶(æ«æä»¶/ç
§çãçµåç PDFãWord/Excel) â åééæ½å(æææ¬å±èµ°ææ¬ãæ«æçé页转å¾) â 大模åæå端ä¸ä¼ çç»ä»¶æ¸
åäº§åºæå¹³ç»ä»¶è稿 â 人工å¨è®¾è®¡å¨ç¡®è®¤åä¿å为模æ¿çæ¬", "roles": ["è´¨æ£å", "è´¨éå·¥ç¨å¸"]}, |
| | | {"stage": "ç¥è¯æ£ç´¢", "action": "ææ¡£âåçâMilvus åéâæ£ç´¢æ¥å£(é¢ç)", "roles": ["â"]}]} |
| | | {"stage": "ç¥è¯æ£ç´¢", "action": "ææ¡£âåçâMilvus åéâæ£ç´¢æ¥å£(é¢ç)", "roles": ["â"]}]}, |
| | | {"id": "datacollection", "name": "æ°æ®ééæµç¨", "mermaid": "mermaid/12-data-collection-flow.mmd", "color": "#3fa9a0", |
| | | "summary": "设å¤å»ºæ¡£åæ¾ä¸æ¬¡æ§ä»¤ç â ç°åºç½å
³å¿è·³ä¸ä¸æ¥(å¹çÂ·æ¯æåªæ¥ç´¯è®¡å¼) â ç»å®ç产工ååæ°è®°å½å¸¦å
¥å·¥å/产å/æ¹æ¬¡ â è®°å½æ´æ£/ä½åºçç â 宿¶çæ¿ä¸ç»è®¡åæï¼ç¬¬ä¸é¶æ®µåªééå±ç¤ºç»è®¡ï¼ä¸èªå¨ååç产æ¥å·¥ä¸å
è£
ã", |
| | | "steps": [ |
| | | {"stage": "æ¥å
¥", "action": "æ°å¢éé设å¤(ç¼å·/åç§°/ç±»å)ï¼å建æ¶ä¸æ¬¡æ§æ¾ç¤º 40 ä½ä»¤çå¹¶é
ç½®å°ç°åºç½å
³ï¼è®¾å¤ç«¯è¯·æ±æºå¸¦ X-Device-Token(乿¯æ URL åæ° tokenï¼è¯·æ±å¤´ä¼å
)ï¼é失åªè½éç½®ä¸æ§ä»¤çç«å³å¤±æ", "roles": ["设å¤ç®¡çå", "ç°åºåäº"]}, |
| | | {"stage": "å¿è·³", "action": "设å¤å»ºè®®æ¯ 1 åé䏿¥å¿è·³ï¼æ´æ°æåå¿è·³æ¶é´ä¸åºä»¶çæ¬ï¼æåå¿è·³ 5 åéå
为å¨çº¿ï¼è¶
æ¶è§ä¸ºç¦»çº¿ï¼ç¦ç¨è®¾å¤æç»ä¸æ¥", "roles": ["ç°åºç½å
³"]}, |
| | | {"stage": "䏿¥", "action": "䏿¥ count æ totalCount(é½ä¼ 以 count 为å)ï¼åä¸è®¾å¤+åä¸ bizId åªè½ä¸æ¡ï¼éå¤è¯·æ±è¿å馿¬¡è®°å½å¹¶æ è®° duplicate=trueï¼åªæ¥ç´¯è®¡å¼æ¶ææ¬æ¬¡ç´¯è®¡-䏿¬¡ç´¯è®¡è®¡ç®ï¼é¦æ¬¡æè®¡æ°å¨æ¸
é¶ææ¬æ¬¡ç´¯è®¡ï¼ç¦»çº¿è¡¥æ¥ä¼ online=false", "roles": ["ç°åºç½å
³"]}, |
| | | {"stage": "ç»å®", "action": "设å¤ç»å®æªå®å·¥ãæªåæ¶çç产工å(å䏿¶é´ä¸å¼ ï¼æ¢åå
è§£ç»)ï¼ä»
åç»æ°ä¸æ¥è®°å½èªå¨å¸¦å
¥å·¥åç¼å·ã产åç¼ç åç§°ä¸çäº§æ¹æ¬¡ï¼åå²è®°å½ä¸å溯ï¼è§£ç»åæ°è®°å½ä¸å带工åä¿¡æ¯", "roles": ["设å¤ç®¡çå"]}, |
| | | {"stage": "追溯", "action": "æ£å¸¸è®°å½å¯æ´æ£(æ°éæ¹ä¸ºå®é
å¼å¹¶å¡«åå ï¼ä¿çåå§æ°éï¼ç¶æ1)æä½åº(ç¶æ2ï¼ä»å¯æ¥è¯¢)ï¼ä»
æ£å¸¸ç¶æå¯æ´æ£ä¸æ´æ£åä¸å¯åæ¹ï¼å·²ä½åºä¸å¯éå¤ä½åº", "roles": ["ç产ç»è®¡å"]}, |
| | | {"stage": "ç»è®¡", "action": "宿¶çæ¿å±ç¤ºè®¾å¤å¨çº¿ä¸ä»æ¥äº§éï¼ç»è®¡åæææ¶é´èå´/设å¤/å·¥åç»åºæ°éãééãè®°å½æ°ãè®¾å¤æ°ä¸æ¥/å°æ¶è¶å¿ï¼æé¤ä½åºè®°å½ãå·²æ´æ£ææ´æ£åæ°éåä¸ï¼å¯æçéæ¡ä»¶å¯¼åº Excel", "roles": ["ç产ç»è®¡å", "管çå±"]}, |
| | | {"stage": "è¾¹ç", "action": "第ä¸é¶æ®µééæ°éåªåå±ç¤ºä¸ç»è®¡ï¼ä¸èªå¨ååç产æ¥å·¥ãå
è£
æåºåï¼ååé»è¾å¾
åç»éæ±ç¡®è®¤", "roles": ["ç³»ç»(䏿§è¡)"]}]} |
| | | ] |
| | | } |
| | |
| | | "roles": ["计åå", "车é´ä¸»ä»»", "æä½å·¥", "å·¥èºå"], |
| | | "upstream": ["è¿éå(éå®è®¢å)"], "downstream": ["ä»å¨(颿/å
¥åº)", "è´¨é(IPQC)"], |
| | | "coreTables": ["mes_pro_mps", "mes_pro_work_order", "mes_pro_task", "mes_pro_feedback", "mes_pro_route", "mes_pro_process", "mes_pro_work_order_bom", "mes_pd_project"]}, |
| | | {"key": "dc", "name": "æ°æ®éé", "color": "#3fa9a0", "tag": "MES-DC", "flow": "datacollection", |
| | | "positioning": "ç产ç°åºè®¡æ°/ç§°é设å¤çæ¥å
¥ä¸äº§ééé", |
| | | "problem": "鸡çªè®¡æ°/ç§°éè®¾å¤æ°æ®é 人工æå½ï¼è®¾å¤äº§éä¸ç产工åãæ¹æ¬¡è±è", |
| | | "features": ["éé设å¤å°è´¦ä¸40ä½ä¸æ¬¡æ§ä»¤ç", "设å¤ç«¯ HTTP 䏿¥ä¸å¿è·³ï¼X-Device-Tokenï¼", "bizId å¹çä¸åªæ¥ç´¯è®¡å¼çå·®å¼è®¡ç®", "设å¤ç»å®ç产工åï¼ä»
åç»æ°è®°å½å¸¦å
¥å·¥å/产å/æ¹æ¬¡", "ééè®°å½æ´æ£ä¸ä½åºçç", "宿¶çæ¿ï¼å¨çº¿ç¶æ+仿¥äº§éï¼", "ç»è®¡åæï¼æ±æ»/è¶å¿/æè®¾å¤ï¼", "第ä¸é¶æ®µåªééãå±ç¤ºãç»è®¡ï¼ä¸èªå¨ååç产æ¥å·¥ä¸å
è£
"], |
| | | "objects": ["éé设å¤", "ééè®°å½"], |
| | | "roles": ["设å¤ç®¡çå", "ç产ç»è®¡å"], |
| | | "upstream": ["ç产(ç»å®å·¥å带å
¥äº§åæ¹æ¬¡)"], "downstream": ["BI(产éç»è®¡)"], |
| | | "coreTables": ["mes_dc_device", "mes_dc_record"]}, |
| | | {"key": "wm", "name": "ä»å¨ç®¡ç", "color": "#7e6bd6", "tag": "MES-WM", "flow": "warehouse", |
| | | "positioning": "åå
WMSï¼åæ®é©±å¨çåºåè´¦å®ä¸è´", |
| | | "problem": "夿¥æºåºå
¥åºãæ¹æ¬¡/SN 追溯ãåºå精确å°åºä½", |
| | |
| | | {"name": "离è交æ¥", "module": "人å", "table": "hrm_user_handover", "doc": "fromâto æ å°ï¼å·²å®æ20 å expandUserIds æ©å±äº¤æ¥äººå¯è§æ°æ®ï¼å½ååä¸å¡æ¨¡åå°æªå®é
æ¥å
¥è°ç¨ï¼", "upstream": ["离èç³è¯·"], "downstream": ["忍¡åæçæ°æ®æ¥è¯¢"], "keywords": "äº¤æ¥ ç¦»è handover expandUserIds"}, |
| | | {"name": "æç计å", "module": "设å¤", "table": "mes_cal_plan", "doc": "çç»Ãçæ¬¡Ãæ¥ææçï¼ä¾ç产ä¸èå¤å¼ç¨", "upstream": [], "downstream": ["ç产任å¡", "èå¤"], "keywords": "æç çç» çæ¬¡ æ¥å"}, |
| | | {"name": "æ¥å模æ¿", "module": "è´¨æ£æ¥å", "table": "qc_report_template", "doc": "æºè½è´¨æ£æ¥å模æ¿ï¼å¯ç¨0/åç¨1ï¼ç»å¸å
容åå¨ qc_report_template_versionï¼è稿0/å·²åå¸1/å·²åç¨2ï¼å·²åå¸ä¸å¯è¦çï¼ï¼currentVersion æåå½åå·²åå¸çæ¬ï¼æºæä»¶ç» AI 导å
¥è¯å«æè稿åç±äººå·¥ç¡®è®¤ææä¸ºçæ¬ï¼å䏿¨¡æ¿éå¤å¯¼å
¥æãæ¿æ¢ãå¤çââå
å æ§éä»¶ï¼è¿å¸¦ blob è¡ä¸ç£çæä»¶ï¼åç»æ°çï¼ä¸çå¤å¿æä»¶ï¼å 餿¨¡æ¿ä¼è¿å¸¦æ¸
éä»¶", "upstream": ["人工设计(GrapesJS 设计å¨)", "AI 导å
¥è稿(qc-report/ai-import/draft)"], "downstream": ["模æ¿çæ¬", "æ¥åå®ä¾"], "keywords": "æ¥åæ¨¡æ¿ è´¨æ£æ¥å template è®¾è®¡å¨ çæ¬ AI导å
¥ è¯å« è稿 æºæä»¶æ¿æ¢"}, |
| | | {"name": "æ¥åå®ä¾", "module": "è´¨æ£æ¥å", "table": "qc_report_instance", "doc": "åºä»¶äº§ç©ï¼ç¼å· QR+yyyyMMdd+4使µæ°´æå¤©ç¬ç«ä¸ä¸å¡å¯ä¸ï¼å¯æ¾å¼æå®è¦çï¼æ³¨æ uk_report_no ä¸åºå软å é¤ï¼å æçå·ä¸åæ¶ï¼ï¼ä¸¤æ¡åºä»¶å
¥å£ï¼éç¨ generateï¼è°ç¨æ¹èªå¸¦ contextï¼ä¸ generate-from-qcï¼æ°æ®ä» MES è´¨æ£ååï¼æéç qc-report:instance:generate å·²å
¥ system_menu id=1075416ï¼äºéæ ¡éªæä¸å¡ä¼å
çº§åªæ¥ç¬¬ä¸å¤ï¼105_000 ç±»åéæ³ / 105_001 åæ®ä¸åå¨ / 105_002 æªå®æ / 105_003 æªå¤å® / 105_005 模æ¿ç±»åä¸ç¬¦ / 105_006 æ å¯ç¨æ£éªé¡¹ï¼åå¼ è´¨æ£åå表çè¡æä½ãåºæ¥åãä»
å¨ status=已宿æ¶å¯è§ï¼å¼¹çªåªå reportType ä¸è´ã模æ¿å¯ç¨ãä¸ currentVersion æåççæ¬å·²åå¸ç模æ¿ï¼å端 /qc-report/template/selectable å¤å®ââåç¨çæ¬ä¸æ¸
空 currentVersionï¼å端æ¿åé¡µç»æèªå·±æ¨å¯¼ä¼æ¼ï¼ï¼ç»æå°±å°å±ç¤ºå¹¶è·³æ¬é¡µå表ï¼ï¼å»ç» data_snapshotï¼å¤å®åæ°æ®ï¼å«å端ç®å¥½ç PASS/FAIL ä¸åæ ¼çï¼ä¸ render_htmlï¼regenerate åªé渲æçãæ°æ®ä¸ç¼å·ä¸åï¼business_id/business_type å MES 表åï¼mes_qc_iqc çï¼ä¸åæ® IDï¼å¯åæ¥ãä¸åå¯åºå¤ä»½ï¼æ¥å头å¦å¸¦åæ®åå¤å® qcResult(æ°)/qcResultText(䏿ï¼åæ ¼/ç¹é/ä¸åæ ¼éè´§/ä¸åæ ¼æ¥åº)ï¼ä¸å¼æä¸æå¤å®å¹¶åäºä¸è¦çï¼ååºå¸¦ undecidableCount=å¿«ç
§ä¸ result 为空串ç项æ°ä¸ warningsï¼åç»æ é¢è·³è¿/ææ å·²å /æªå½å®æµå¼/æ ·åè¶
3ï¼ï¼ä¸¤è
é½ä¸è½åºãäºåçä¸å°", "upstream": ["æ¥å模æ¿çæ¬", "è´¨æ£åä¸ä¸æ(éç¨ generate ç±è°ç¨æ¹ä¼ å
¥)", "MES è´¨æ£å IQC/IPQC/OQC/RQC(generate-from-qc ç» MesQcReportApi åæ°)"], "downstream": ["å端å®ä¾é¡µ /qc/report-instance(å表·iframeé¢è§Â·å¿«ç
§é¡µç¾Â·å¯¼åºPDF)", "PDF彿¡£(system_storage_attachment recordType=qc_report_instance)"], "keywords": "æ¥åå®ä¾ åºä»¶ QRç¼å· å¿«ç
§ å¤ç° regenerate PDF彿¡£ æ¥åå®ä¾é¡µ 导åºPDF generate-from-qc è´¨æ£ååºæ¥å åºæ¥åå¼¹çª qcResult undecidableCount warnings å¾
å¤å® 忥 ä¸å¡åæ®çé"} |
| | | {"name": "æ¥åå®ä¾", "module": "è´¨æ£æ¥å", "table": "qc_report_instance", "doc": "åºä»¶äº§ç©ï¼ç¼å· QR+yyyyMMdd+4使µæ°´æå¤©ç¬ç«ä¸ä¸å¡å¯ä¸ï¼å¯æ¾å¼æå®è¦çï¼æ³¨æ uk_report_no ä¸åºå软å é¤ï¼å æçå·ä¸åæ¶ï¼ï¼ä¸¤æ¡åºä»¶å
¥å£ï¼éç¨ generateï¼è°ç¨æ¹èªå¸¦ contextï¼ä¸ generate-from-qcï¼æ°æ®ä» MES è´¨æ£ååï¼æéç qc-report:instance:generate å·²å
¥ system_menu id=1075416ï¼äºéæ ¡éªæä¸å¡ä¼å
çº§åªæ¥ç¬¬ä¸å¤ï¼105_000 ç±»åéæ³ / 105_001 åæ®ä¸åå¨ / 105_002 æªå®æ / 105_003 æªå¤å® / 105_005 模æ¿ç±»åä¸ç¬¦ / 105_006 æ å¯ç¨æ£éªé¡¹ï¼åå¼ è´¨æ£åå表çè¡æä½ãåºæ¥åãä»
å¨ status=已宿æ¶å¯è§ï¼å¼¹çªåªå reportType ä¸è´ã模æ¿å¯ç¨ãä¸ currentVersion æåççæ¬å·²åå¸ç模æ¿ï¼å端 /qc-report/template/selectable å¤å®ââåç¨çæ¬ä¸æ¸
空 currentVersionï¼å端æ¿åé¡µç»æèªå·±æ¨å¯¼ä¼æ¼ï¼ï¼ç»æå°±å°å±ç¤ºå¹¶è·³æ¬é¡µå表ï¼ï¼å»ç» data_snapshotï¼å¤å®åæ°æ®ï¼å«å端ç®å¥½ç PASS/FAIL ä¸åæ ¼çï¼ä¸ render_htmlï¼regenerate åªé渲æçãæ°æ®ä¸ç¼å·ä¸åï¼business_id/business_type å MES 表åï¼mes_qc_iqc çï¼ä¸åæ® IDï¼å¯åæ¥ãä¸åå¯åºå¤ä»½ï¼æ¥å头å¦å¸¦åæ®åå¤å® qcResult(æ°)/qcResultText(䏿ï¼åæ ¼/ç¹é/ä¸åæ ¼éè´§/ä¸åæ ¼æ¥åº)ï¼ä¸å¼æä¸æå¤å®å¹¶åäºä¸è¦çï¼ååºå¸¦ undecidableCount=å¿«ç
§ä¸ result 为空串ç项æ°ä¸ warningsï¼åç»æ é¢è·³è¿/ææ å·²å /æªå½å®æµå¼/æ ·åè¶
3ï¼ï¼ä¸¤è
é½ä¸è½åºãäºåçä¸å°", "upstream": ["æ¥å模æ¿çæ¬", "è´¨æ£åä¸ä¸æ(éç¨ generate ç±è°ç¨æ¹ä¼ å
¥)", "MES è´¨æ£å IQC/IPQC/OQC/RQC(generate-from-qc ç» MesQcReportApi åæ°)"], "downstream": ["å端å®ä¾é¡µ /qc/report-instance(å表·iframeé¢è§Â·å¿«ç
§é¡µç¾Â·å¯¼åºPDF)", "PDF彿¡£(system_storage_attachment recordType=qc_report_instance)"], "keywords": "æ¥åå®ä¾ åºä»¶ QRç¼å· å¿«ç
§ å¤ç° regenerate PDF彿¡£ æ¥åå®ä¾é¡µ 导åºPDF generate-from-qc è´¨æ£ååºæ¥å åºæ¥åå¼¹çª qcResult undecidableCount warnings å¾
å¤å® 忥 ä¸å¡åæ®çé"}, |
| | | {"name": "éé设å¤", "module": "æ°æ®éé", "table": "mes_dc_device", "doc": "鸡çªè®¡æ°/ç§°é设å¤å°è´¦ï¼ç¼å·å¯ä¸ï¼40 ä½éé令çä»
å建ä¸éç½®æ¶è¿åãåºå
åå¸åå¨ï¼æåå¿è·³/䏿¥æ¶é´ä¸åºä»¶çæ¬ç±è®¾å¤è¯·æ±æ´æ°ï¼æåå¿è·³ 5 åéå
è§ä¸ºå¨çº¿ï¼å䏿¶é´åªç»å®ä¸å¼ æªå®å·¥ãæªåæ¶çç产工åï¼å·²æééè®°å½ç设å¤ç¦æ¢å é¤ï¼è®¾å¤ç¦ç¨æ¶æç»ä¸æ¥ä¸å¿è·³ä»¥å¤çééæä½", "upstream": ["ç产工å(ç»å®)"], "downstream": ["ééè®°å½", "宿¶çæ¿"], "keywords": "ééè®¾å¤ æ°é 鸡çªè®¡æ° ç§°é 令ç token å¿è·³ å¨çº¿ device"}, |
| | | {"name": "ééè®°å½", "module": "æ°æ®éé", "table": "mes_dc_record", "doc": "设å¤ä¸æ¥äº§çï¼æ£å¸¸0/å·²æ´æ£1/å·²ä½åº2ï¼åä¸è®¾å¤+bizId å¹çåªè½ä¸æ¡ï¼éå¤ä¸æ¥è¿å馿¬¡è®°å½å¹¶æ è®° duplicate=trueï¼åªæ¥ totalCount æ¶ææ¬æ¬¡ç´¯è®¡-䏿¬¡ç´¯è®¡è®¡ç®æ¬æ¬¡æ°éï¼é¦æ¬¡æè®¡æ°å¨æ¸
é¶ææ¬æ¬¡ç´¯è®¡ï¼ä¸æ¥æ¶è®¾å¤å·²ç»å®å·¥ååèªå¨å¸¦å
¥ç产工åã产åç¼ç åç§°ä¸æ¹æ¬¡ï¼åå²è®°å½ä¸å溯æ¹ç»ï¼ä»
æ£å¸¸ç¶æå¯æ´æ£ä¸ä¿çåå§æ°éä¸åå ï¼å·²ä½åºä¸å¯éå¤ä½åºï¼ç»è®¡ä¸çæ¿æé¤ä½åºè®°å½ãå·²æ´æ£ææ´æ£åæ°éåä¸", "upstream": ["éé设å¤", "ç产工å(ç»å®å¸¦å
¥)", "设å¤ç«¯ä¸æ¥"], "downstream": ["宿¶çæ¿", "ç»è®¡åæ", "Excel导åº"], "keywords": "ééè®°å½ ä¸æ¥ ingest å¹ç bizId 累计 æ´æ£ ä½åº 产é record"} |
| | | ] |
| | | } |
| | |
| | | {"role": "ä»ç®¡å", "modules": ["MES-WM"], "operations": ["15 ç±»åºå
¥åºåæ®æ§è¡", "è°æ¨", "çç¹", "æ¡ç è£
ç®±"], "data": ["mes_wm_*"], "scope": "ä»åºç»´åº¦ï¼WMS 坿ä»åºé
ç½®åºå
¥åº/è°æ¨/çç¹æ¯å¦èµ° BPM"}, |
| | | {"role": "è´¨æ£å", "modules": ["MES-QC"], "operations": ["IQC/IPQC/OQC/RQC æ£éª", "NCR è¯å®¡å¤ç½®"], "data": ["mes_qc_*"], "scope": "inspectorUserId å½å±"}, |
| | | {"role": "设å¤å/维修工", "modules": ["MES-DV"], "operations": ["ç¹æ£ä¿å
»", "维修工å", "å·¥è£
é¢ç¨"], "data": ["mes_dv_*", "mes_tm_*"], "scope": "chargeUserId å½å±"}, |
| | | {"role": "设å¤ç®¡çå/ç产ç»è®¡å", "modules": ["MES-DC"], "operations": ["éé设å¤å°è´¦ä¸ä»¤çéç½®", "ç»å®/è§£ç»ç产工å", "ééè®°å½æ´æ£ä¸ä½åº", "宿¶çæ¿ä¸ç»è®¡åæ"], "data": ["mes_dc_device", "mes_dc_record"], "scope": "èåæéæ§å¶ï¼mes:dc-device:* / mes:dc-record:* / mes:dc-statistics:query"}, |
| | | {"role": "客æ/å®åå·¥ç¨å¸", "modules": ["å®å"], "operations": ["å·¥ååçæ´¾å·¥", "ç»´ä¿®", "éè´§ç³è¯·"], "data": ["after_sale_*"], "scope": "è¡çº§æ°æ®æéåè§å¾ï¼æè´è´£/æåä¸/ä¸å±è´è´£/å
¨é¨(aftersales:view-all)"}, |
| | | {"role": "è´¢å¡", "modules": ["ERP", "CRM"], "operations": ["æ¶æ¬¾å", "仿¬¾å", "å¼ç¥¨å®¡æ ¸", "ç»ç®è´¦æ·"], "data": ["erp_finance_*", "crm_invoice", "crm_receivable"], "scope": "financeUserId å½å±"}, |
| | | {"role": "HR", "modules": ["HRM"], "operations": ["å工档æ¡å
¥è½¬è°ç¦»", "èå¤è§åæç(æ¬äººæå¡å
¨åå¯ç¨ï¼ä¸è®¾æéç¹)", "èªé
¬æ ¸ç®åæ¾", "离è交æ¥"], "data": ["hrm_*"], "scope": "é¨é¨èå´ dataScope"}, |
| | |
| | | --bg:#0b1220; --bg2:#101a2e; --panel:#131f36; --panel2:#182742; |
| | | --line:#24344f; --text:#dbe4f0; --muted:#8fa1b8; |
| | | --c-base:#8a94a6; --c-sale:#4f9cff; --c-sup:#c9a86a; --c-erp:#5fc79e; |
| | | --c-prod:#e0b34f; --c-wm:#7e6bd6; --c-qc:#e06c6c; --c-dv:#59a8b8; |
| | | --c-prod:#e0b34f; --c-dc:#3fa9a0; --c-wm:#7e6bd6; --c-qc:#e06c6c; --c-dv:#59a8b8; |
| | | --c-as:#c78bd6; --c-hrm:#9db85a; --c-bpm:#e6a23c; --c-ai:#56c8d8; --c-fin:#3ec9a7; |
| | | } |
| | | *{box-sizing:border-box;margin:0;padding:0} |
| | |
| | | <a data-t="flow-sales"><span class="dot" style="background:var(--c-sale)"></span>é宿µç¨</a> |
| | | <a data-t="flow-purchase"><span class="dot" style="background:var(--c-erp)"></span>éè´æµç¨</a> |
| | | <a data-t="flow-production"><span class="dot" style="background:var(--c-prod)"></span>ç产æµç¨</a> |
| | | <a data-t="flow-datacollection"><span class="dot" style="background:var(--c-dc)"></span>æ°æ®ééæµç¨</a> |
| | | <a data-t="flow-quality"><span class="dot" style="background:var(--c-qc)"></span>è´¨éæµç¨</a> |
| | | <a data-t="flow-warehouse"><span class="dot" style="background:var(--c-wm)"></span>ä»å¨æµç¨</a> |
| | | <a data-t="flow-aftersales"><span class="dot" style="background:var(--c-as)"></span>å®åæµç¨</a> |
| | |
| | | <section class="page" id="flow-sales"></section> |
| | | <section class="page" id="flow-purchase"></section> |
| | | <section class="page" id="flow-production"></section> |
| | | <section class="page" id="flow-datacollection"></section> |
| | | <section class="page" id="flow-quality"></section> |
| | | <section class="page" id="flow-warehouse"></section> |
| | | <section class="page" id="flow-aftersales"></section> |
| | |
| | | "type": "æ··åç³»ç»", |
| | | "mainSystem": "MOM å¶é è¿è¥ç®¡çç³»ç»", |
| | | "subSystems": [ |
| | | "MESï¼ç产·ä»å¨Â·è´¨é·设å¤ï¼", |
| | | "MESï¼ç产·ä»å¨Â·è´¨é·设å¤Â·æ°æ®ééï¼", |
| | | "ERPï¼è¿éå·财å¡ï¼", |
| | | "CRMï¼å®¢æ·å
³ç³»ï¼", |
| | | "SRMï¼ä¾åºåå
³ç³»ï¼", |
| | |
| | | "frontend": "mom-pro2-beforeï¼Vue3 管çåå°ï¼åä»åºåæ¾ï¼åªè¯»åèï¼" |
| | | }, |
| | | "stats": { |
| | | "businessModules": 13, |
| | | "coreObjects": 48, |
| | | "documentFlows": 6, |
| | | "businessModules": 14, |
| | | "coreObjects": 50, |
| | | "documentFlows": 7, |
| | | "approvalListeners": 13, |
| | | "aiCapabilities": 9, |
| | | "wmBillTypes": 15 |
| | |
| | | "MesWmSnDO æ°å¢ç uuid åæ®µçæ/æ¶è´¹é»è¾æªå¨æ ¸å¿ Service ä¸ç¡®è®¤", |
| | | "转æ£ç³è¯·(hrm_regularize_application)ãå¹è®è¯ä¹¦çä»
æ SQL ä¸èååå§åï¼Java ä¾§ Service/Controller æªå®ç°", |
| | | "NCR å¤ç½®ç»æï¼è¿å·¥/éè´§ï¼æªååè§¦åæºåæ®ï¼ä»
å°è´¦è®°å½", |
| | | "MPS ç¶ææä¸¾ç¬ç«ç¼å·(0/1/2/3)ï¼ä¸éç¨åæ®å¸¸é(0/1/4/5)ä¸ä¸è´" |
| | | "MPS ç¶ææä¸¾ç¬ç«ç¼å·(0/1/2/3)ï¼ä¸éç¨åæ®å¸¸é(0/1/4/5)ä¸ä¸è´", |
| | | "æ°æ®ééï¼é¸¡çªè®¡æ°/ç§°é设å¤ï¼ç¬¬ä¸é¶æ®µåªåééâå±ç¤ºâç»è®¡ï¼ä¸èªå¨ååç产æ¥å·¥ãå
è£
æåºåï¼ç°åºè®¾å¤æ¥çº¿ä¸ç½å
³ç±ç°åºåäºå¯¹æ¥å¾
èè°ã第ä¸é¶æ®µè¾¹çã" |
| | | ], |
| | | "generatedAt": "2026-09-10", |
| | | "generatedAt": "2026-11-10", |
| | | "analysisBasis": "åºäº dev_business 忝 87bf4a99 æºç ï¼6 ç»å¹¶è¡æºç 走读ï¼MES ç产质é / MES ä»å¨ / ERP / CRM+SRM / å®å+HRM / AI+BI+MDM+BPM+åºåº§ï¼" |
| | | }</script> |
| | | <script type="application/json" id="data-modules">{ |
| | |
| | | "roles": ["计åå", "车é´ä¸»ä»»", "æä½å·¥", "å·¥èºå"], |
| | | "upstream": ["è¿éå(éå®è®¢å)"], "downstream": ["ä»å¨(颿/å
¥åº)", "è´¨é(IPQC)"], |
| | | "coreTables": ["mes_pro_mps", "mes_pro_work_order", "mes_pro_task", "mes_pro_feedback", "mes_pro_route", "mes_pro_process", "mes_pro_work_order_bom", "mes_pd_project"]}, |
| | | {"key": "dc", "name": "æ°æ®éé", "color": "#3fa9a0", "tag": "MES-DC", "flow": "datacollection", |
| | | "positioning": "ç产ç°åºè®¡æ°/ç§°é设å¤çæ¥å
¥ä¸äº§ééé", |
| | | "problem": "鸡çªè®¡æ°/ç§°éè®¾å¤æ°æ®é 人工æå½ï¼è®¾å¤äº§éä¸ç产工åãæ¹æ¬¡è±è", |
| | | "features": ["éé设å¤å°è´¦ä¸40ä½ä¸æ¬¡æ§ä»¤ç", "设å¤ç«¯ HTTP 䏿¥ä¸å¿è·³ï¼X-Device-Tokenï¼", "bizId å¹çä¸åªæ¥ç´¯è®¡å¼çå·®å¼è®¡ç®", "设å¤ç»å®ç产工åï¼ä»
åç»æ°è®°å½å¸¦å
¥å·¥å/产å/æ¹æ¬¡", "ééè®°å½æ´æ£ä¸ä½åºçç", "宿¶çæ¿ï¼å¨çº¿ç¶æ+仿¥äº§éï¼", "ç»è®¡åæï¼æ±æ»/è¶å¿/æè®¾å¤ï¼", "第ä¸é¶æ®µåªééãå±ç¤ºãç»è®¡ï¼ä¸èªå¨ååç产æ¥å·¥ä¸å
è£
"], |
| | | "objects": ["éé设å¤", "ééè®°å½"], |
| | | "roles": ["设å¤ç®¡çå", "ç产ç»è®¡å"], |
| | | "upstream": ["ç产(ç»å®å·¥å带å
¥äº§åæ¹æ¬¡)"], "downstream": ["BI(产éç»è®¡)"], |
| | | "coreTables": ["mes_dc_device", "mes_dc_record"]}, |
| | | {"key": "wm", "name": "ä»å¨ç®¡ç", "color": "#7e6bd6", "tag": "MES-WM", "flow": "warehouse", |
| | | "positioning": "åå
WMSï¼åæ®é©±å¨çåºåè´¦å®ä¸è´", |
| | | "problem": "夿¥æºåºå
¥åºãæ¹æ¬¡/SN 追溯ãåºå精确å°åºä½", |
| | |
| | | {"name": "离è交æ¥", "module": "人å", "table": "hrm_user_handover", "doc": "fromâto æ å°ï¼å·²å®æ20 å expandUserIds æ©å±äº¤æ¥äººå¯è§æ°æ®ï¼å½ååä¸å¡æ¨¡åå°æªå®é
æ¥å
¥è°ç¨ï¼", "upstream": ["离èç³è¯·"], "downstream": ["忍¡åæçæ°æ®æ¥è¯¢"], "keywords": "äº¤æ¥ ç¦»è handover expandUserIds"}, |
| | | {"name": "æç计å", "module": "设å¤", "table": "mes_cal_plan", "doc": "çç»Ãçæ¬¡Ãæ¥ææçï¼ä¾ç产ä¸èå¤å¼ç¨", "upstream": [], "downstream": ["ç产任å¡", "èå¤"], "keywords": "æç çç» çæ¬¡ æ¥å"}, |
| | | {"name": "æ¥å模æ¿", "module": "è´¨æ£æ¥å", "table": "qc_report_template", "doc": "æºè½è´¨æ£æ¥å模æ¿ï¼å¯ç¨0/åç¨1ï¼ç»å¸å
容åå¨ qc_report_template_versionï¼è稿0/å·²åå¸1/å·²åç¨2ï¼å·²åå¸ä¸å¯è¦çï¼ï¼currentVersion æåå½åå·²åå¸çæ¬ï¼æºæä»¶ç» AI 导å
¥è¯å«æè稿åç±äººå·¥ç¡®è®¤ææä¸ºçæ¬ï¼å䏿¨¡æ¿éå¤å¯¼å
¥æãæ¿æ¢ãå¤çââå
å æ§éä»¶ï¼è¿å¸¦ blob è¡ä¸ç£çæä»¶ï¼åç»æ°çï¼ä¸çå¤å¿æä»¶ï¼å 餿¨¡æ¿ä¼è¿å¸¦æ¸
éä»¶", "upstream": ["人工设计(GrapesJS 设计å¨)", "AI 导å
¥è稿(qc-report/ai-import/draft)"], "downstream": ["模æ¿çæ¬", "æ¥åå®ä¾"], "keywords": "æ¥åæ¨¡æ¿ è´¨æ£æ¥å template è®¾è®¡å¨ çæ¬ AI导å
¥ è¯å« è稿 æºæä»¶æ¿æ¢"}, |
| | | {"name": "æ¥åå®ä¾", "module": "è´¨æ£æ¥å", "table": "qc_report_instance", "doc": "åºä»¶äº§ç©ï¼ç¼å· QR+yyyyMMdd+4使µæ°´æå¤©ç¬ç«ä¸ä¸å¡å¯ä¸ï¼å¯æ¾å¼æå®è¦çï¼æ³¨æ uk_report_no ä¸åºå软å é¤ï¼å æçå·ä¸åæ¶ï¼ï¼ä¸¤æ¡åºä»¶å
¥å£ï¼éç¨ generateï¼è°ç¨æ¹èªå¸¦ contextï¼ä¸ generate-from-qcï¼æ°æ®ä» MES è´¨æ£ååï¼æéç qc-report:instance:generate å·²å
¥ system_menu id=1075416ï¼äºéæ ¡éªæä¸å¡ä¼å
çº§åªæ¥ç¬¬ä¸å¤ï¼105_000 ç±»åéæ³ / 105_001 åæ®ä¸åå¨ / 105_002 æªå®æ / 105_003 æªå¤å® / 105_005 模æ¿ç±»åä¸ç¬¦ / 105_006 æ å¯ç¨æ£éªé¡¹ï¼åå¼ è´¨æ£åå表çè¡æä½ãåºæ¥åãä»
å¨ status=已宿æ¶å¯è§ï¼å¼¹çªåªå reportType ä¸è´ã模æ¿å¯ç¨ãä¸ currentVersion æåççæ¬å·²åå¸ç模æ¿ï¼å端 /qc-report/template/selectable å¤å®ââåç¨çæ¬ä¸æ¸
空 currentVersionï¼å端æ¿åé¡µç»æèªå·±æ¨å¯¼ä¼æ¼ï¼ï¼ç»æå°±å°å±ç¤ºå¹¶è·³æ¬é¡µå表ï¼ï¼å»ç» data_snapshotï¼å¤å®åæ°æ®ï¼å«å端ç®å¥½ç PASS/FAIL ä¸åæ ¼çï¼ä¸ render_htmlï¼regenerate åªé渲æçãæ°æ®ä¸ç¼å·ä¸åï¼business_id/business_type å MES 表åï¼mes_qc_iqc çï¼ä¸åæ® IDï¼å¯åæ¥ãä¸åå¯åºå¤ä»½ï¼æ¥å头å¦å¸¦åæ®åå¤å® qcResult(æ°)/qcResultText(䏿ï¼åæ ¼/ç¹é/ä¸åæ ¼éè´§/ä¸åæ ¼æ¥åº)ï¼ä¸å¼æä¸æå¤å®å¹¶åäºä¸è¦çï¼ååºå¸¦ undecidableCount=å¿«ç
§ä¸ result 为空串ç项æ°ä¸ warningsï¼åç»æ é¢è·³è¿/ææ å·²å /æªå½å®æµå¼/æ ·åè¶
3ï¼ï¼ä¸¤è
é½ä¸è½åºãäºåçä¸å°", "upstream": ["æ¥å模æ¿çæ¬", "è´¨æ£åä¸ä¸æ(éç¨ generate ç±è°ç¨æ¹ä¼ å
¥)", "MES è´¨æ£å IQC/IPQC/OQC/RQC(generate-from-qc ç» MesQcReportApi åæ°)"], "downstream": ["å端å®ä¾é¡µ /qc/report-instance(å表·iframeé¢è§Â·å¿«ç
§é¡µç¾Â·å¯¼åºPDF)", "PDF彿¡£(system_storage_attachment recordType=qc_report_instance)"], "keywords": "æ¥åå®ä¾ åºä»¶ QRç¼å· å¿«ç
§ å¤ç° regenerate PDF彿¡£ æ¥åå®ä¾é¡µ 导åºPDF generate-from-qc è´¨æ£ååºæ¥å åºæ¥åå¼¹çª qcResult undecidableCount warnings å¾
å¤å® 忥 ä¸å¡åæ®çé"} |
| | | {"name": "æ¥åå®ä¾", "module": "è´¨æ£æ¥å", "table": "qc_report_instance", "doc": "åºä»¶äº§ç©ï¼ç¼å· QR+yyyyMMdd+4使µæ°´æå¤©ç¬ç«ä¸ä¸å¡å¯ä¸ï¼å¯æ¾å¼æå®è¦çï¼æ³¨æ uk_report_no ä¸åºå软å é¤ï¼å æçå·ä¸åæ¶ï¼ï¼ä¸¤æ¡åºä»¶å
¥å£ï¼éç¨ generateï¼è°ç¨æ¹èªå¸¦ contextï¼ä¸ generate-from-qcï¼æ°æ®ä» MES è´¨æ£ååï¼æéç qc-report:instance:generate å·²å
¥ system_menu id=1075416ï¼äºéæ ¡éªæä¸å¡ä¼å
çº§åªæ¥ç¬¬ä¸å¤ï¼105_000 ç±»åéæ³ / 105_001 åæ®ä¸åå¨ / 105_002 æªå®æ / 105_003 æªå¤å® / 105_005 模æ¿ç±»åä¸ç¬¦ / 105_006 æ å¯ç¨æ£éªé¡¹ï¼åå¼ è´¨æ£åå表çè¡æä½ãåºæ¥åãä»
å¨ status=已宿æ¶å¯è§ï¼å¼¹çªåªå reportType ä¸è´ã模æ¿å¯ç¨ãä¸ currentVersion æåççæ¬å·²åå¸ç模æ¿ï¼å端 /qc-report/template/selectable å¤å®ââåç¨çæ¬ä¸æ¸
空 currentVersionï¼å端æ¿åé¡µç»æèªå·±æ¨å¯¼ä¼æ¼ï¼ï¼ç»æå°±å°å±ç¤ºå¹¶è·³æ¬é¡µå表ï¼ï¼å»ç» data_snapshotï¼å¤å®åæ°æ®ï¼å«å端ç®å¥½ç PASS/FAIL ä¸åæ ¼çï¼ä¸ render_htmlï¼regenerate åªé渲æçãæ°æ®ä¸ç¼å·ä¸åï¼business_id/business_type å MES 表åï¼mes_qc_iqc çï¼ä¸åæ® IDï¼å¯åæ¥ãä¸åå¯åºå¤ä»½ï¼æ¥å头å¦å¸¦åæ®åå¤å® qcResult(æ°)/qcResultText(䏿ï¼åæ ¼/ç¹é/ä¸åæ ¼éè´§/ä¸åæ ¼æ¥åº)ï¼ä¸å¼æä¸æå¤å®å¹¶åäºä¸è¦çï¼ååºå¸¦ undecidableCount=å¿«ç
§ä¸ result 为空串ç项æ°ä¸ warningsï¼åç»æ é¢è·³è¿/ææ å·²å /æªå½å®æµå¼/æ ·åè¶
3ï¼ï¼ä¸¤è
é½ä¸è½åºãäºåçä¸å°", "upstream": ["æ¥å模æ¿çæ¬", "è´¨æ£åä¸ä¸æ(éç¨ generate ç±è°ç¨æ¹ä¼ å
¥)", "MES è´¨æ£å IQC/IPQC/OQC/RQC(generate-from-qc ç» MesQcReportApi åæ°)"], "downstream": ["å端å®ä¾é¡µ /qc/report-instance(å表·iframeé¢è§Â·å¿«ç
§é¡µç¾Â·å¯¼åºPDF)", "PDF彿¡£(system_storage_attachment recordType=qc_report_instance)"], "keywords": "æ¥åå®ä¾ åºä»¶ QRç¼å· å¿«ç
§ å¤ç° regenerate PDF彿¡£ æ¥åå®ä¾é¡µ 导åºPDF generate-from-qc è´¨æ£ååºæ¥å åºæ¥åå¼¹çª qcResult undecidableCount warnings å¾
å¤å® 忥 ä¸å¡åæ®çé"}, |
| | | {"name": "éé设å¤", "module": "æ°æ®éé", "table": "mes_dc_device", "doc": "鸡çªè®¡æ°/ç§°é设å¤å°è´¦ï¼ç¼å·å¯ä¸ï¼40 ä½éé令çä»
å建ä¸éç½®æ¶è¿åãåºå
åå¸åå¨ï¼æåå¿è·³/䏿¥æ¶é´ä¸åºä»¶çæ¬ç±è®¾å¤è¯·æ±æ´æ°ï¼æåå¿è·³ 5 åéå
è§ä¸ºå¨çº¿ï¼å䏿¶é´åªç»å®ä¸å¼ æªå®å·¥ãæªåæ¶çç产工åï¼å·²æééè®°å½ç设å¤ç¦æ¢å é¤ï¼è®¾å¤ç¦ç¨æ¶æç»ä¸æ¥ä¸å¿è·³ä»¥å¤çééæä½", "upstream": ["ç产工å(ç»å®)"], "downstream": ["ééè®°å½", "宿¶çæ¿"], "keywords": "ééè®¾å¤ æ°é 鸡çªè®¡æ° ç§°é 令ç token å¿è·³ å¨çº¿ device"}, |
| | | {"name": "ééè®°å½", "module": "æ°æ®éé", "table": "mes_dc_record", "doc": "设å¤ä¸æ¥äº§çï¼æ£å¸¸0/å·²æ´æ£1/å·²ä½åº2ï¼åä¸è®¾å¤+bizId å¹çåªè½ä¸æ¡ï¼éå¤ä¸æ¥è¿å馿¬¡è®°å½å¹¶æ è®° duplicate=trueï¼åªæ¥ totalCount æ¶ææ¬æ¬¡ç´¯è®¡-䏿¬¡ç´¯è®¡è®¡ç®æ¬æ¬¡æ°éï¼é¦æ¬¡æè®¡æ°å¨æ¸
é¶ææ¬æ¬¡ç´¯è®¡ï¼ä¸æ¥æ¶è®¾å¤å·²ç»å®å·¥ååèªå¨å¸¦å
¥ç产工åã产åç¼ç åç§°ä¸æ¹æ¬¡ï¼åå²è®°å½ä¸å溯æ¹ç»ï¼ä»
æ£å¸¸ç¶æå¯æ´æ£ä¸ä¿çåå§æ°éä¸åå ï¼å·²ä½åºä¸å¯éå¤ä½åºï¼ç»è®¡ä¸çæ¿æé¤ä½åºè®°å½ãå·²æ´æ£ææ´æ£åæ°éåä¸", "upstream": ["éé设å¤", "ç产工å(ç»å®å¸¦å
¥)", "设å¤ç«¯ä¸æ¥"], "downstream": ["宿¶çæ¿", "ç»è®¡åæ", "Excel导åº"], "keywords": "ééè®°å½ ä¸æ¥ ingest å¹ç bizId 累计 æ´æ£ ä½åº 产é record"} |
| | | ] |
| | | }</script> |
| | | <script type="application/json" id="data-flows">{ |
| | |
| | | {"stage": "è¾
å©å¤å®", "action": "è´¨æ£å+ææ +ç¼ºé· â å»ºè®®åæ ¼/ç¹é/éè´§/æ¥åº+çç±", "roles": ["è´¨æ£å"]}, |
| | | {"stage": "å³ç颿µ", "action": "缺æ/ç产æ¶é¿/ç产é£é©/交ä»åç±»é¢æµä¾è®¡åæäº§åè", "roles": ["计åå"]}, |
| | | {"stage": "模æ¿è¯å«", "action": "ä¸ä¼ æ¢ææ£éªæ¥åæä»¶(æ«æä»¶/ç
§çãçµåç PDFãWord/Excel) â åééæ½å(æææ¬å±èµ°ææ¬ãæ«æçé页转å¾) â 大模åæå端ä¸ä¼ çç»ä»¶æ¸
åäº§åºæå¹³ç»ä»¶è稿 â 人工å¨è®¾è®¡å¨ç¡®è®¤åä¿å为模æ¿çæ¬", "roles": ["è´¨æ£å", "è´¨éå·¥ç¨å¸"]}, |
| | | {"stage": "ç¥è¯æ£ç´¢", "action": "ææ¡£âåçâMilvus åéâæ£ç´¢æ¥å£(é¢ç)", "roles": ["â"]}]} |
| | | {"stage": "ç¥è¯æ£ç´¢", "action": "ææ¡£âåçâMilvus åéâæ£ç´¢æ¥å£(é¢ç)", "roles": ["â"]}]}, |
| | | {"id": "datacollection", "name": "æ°æ®ééæµç¨", "mermaid": "mermaid/12-data-collection-flow.mmd", "color": "#3fa9a0", |
| | | "summary": "设å¤å»ºæ¡£åæ¾ä¸æ¬¡æ§ä»¤ç â ç°åºç½å
³å¿è·³ä¸ä¸æ¥(å¹çÂ·æ¯æåªæ¥ç´¯è®¡å¼) â ç»å®ç产工ååæ°è®°å½å¸¦å
¥å·¥å/产å/æ¹æ¬¡ â è®°å½æ´æ£/ä½åºçç â 宿¶çæ¿ä¸ç»è®¡åæï¼ç¬¬ä¸é¶æ®µåªééå±ç¤ºç»è®¡ï¼ä¸èªå¨ååç产æ¥å·¥ä¸å
è£
ã", |
| | | "steps": [ |
| | | {"stage": "æ¥å
¥", "action": "æ°å¢éé设å¤(ç¼å·/åç§°/ç±»å)ï¼å建æ¶ä¸æ¬¡æ§æ¾ç¤º 40 ä½ä»¤çå¹¶é
ç½®å°ç°åºç½å
³ï¼è®¾å¤ç«¯è¯·æ±æºå¸¦ X-Device-Token(乿¯æ URL åæ° tokenï¼è¯·æ±å¤´ä¼å
)ï¼é失åªè½éç½®ä¸æ§ä»¤çç«å³å¤±æ", "roles": ["设å¤ç®¡çå", "ç°åºåäº"]}, |
| | | {"stage": "å¿è·³", "action": "设å¤å»ºè®®æ¯ 1 åé䏿¥å¿è·³ï¼æ´æ°æåå¿è·³æ¶é´ä¸åºä»¶çæ¬ï¼æåå¿è·³ 5 åéå
为å¨çº¿ï¼è¶
æ¶è§ä¸ºç¦»çº¿ï¼ç¦ç¨è®¾å¤æç»ä¸æ¥", "roles": ["ç°åºç½å
³"]}, |
| | | {"stage": "䏿¥", "action": "䏿¥ count æ totalCount(é½ä¼ 以 count 为å)ï¼åä¸è®¾å¤+åä¸ bizId åªè½ä¸æ¡ï¼éå¤è¯·æ±è¿å馿¬¡è®°å½å¹¶æ è®° duplicate=trueï¼åªæ¥ç´¯è®¡å¼æ¶ææ¬æ¬¡ç´¯è®¡-䏿¬¡ç´¯è®¡è®¡ç®ï¼é¦æ¬¡æè®¡æ°å¨æ¸
é¶ææ¬æ¬¡ç´¯è®¡ï¼ç¦»çº¿è¡¥æ¥ä¼ online=false", "roles": ["ç°åºç½å
³"]}, |
| | | {"stage": "ç»å®", "action": "设å¤ç»å®æªå®å·¥ãæªåæ¶çç产工å(å䏿¶é´ä¸å¼ ï¼æ¢åå
è§£ç»)ï¼ä»
åç»æ°ä¸æ¥è®°å½èªå¨å¸¦å
¥å·¥åç¼å·ã产åç¼ç åç§°ä¸çäº§æ¹æ¬¡ï¼åå²è®°å½ä¸å溯ï¼è§£ç»åæ°è®°å½ä¸å带工åä¿¡æ¯", "roles": ["设å¤ç®¡çå"]}, |
| | | {"stage": "追溯", "action": "æ£å¸¸è®°å½å¯æ´æ£(æ°éæ¹ä¸ºå®é
å¼å¹¶å¡«åå ï¼ä¿çåå§æ°éï¼ç¶æ1)æä½åº(ç¶æ2ï¼ä»å¯æ¥è¯¢)ï¼ä»
æ£å¸¸ç¶æå¯æ´æ£ä¸æ´æ£åä¸å¯åæ¹ï¼å·²ä½åºä¸å¯éå¤ä½åº", "roles": ["ç产ç»è®¡å"]}, |
| | | {"stage": "ç»è®¡", "action": "宿¶çæ¿å±ç¤ºè®¾å¤å¨çº¿ä¸ä»æ¥äº§éï¼ç»è®¡åæææ¶é´èå´/设å¤/å·¥åç»åºæ°éãééãè®°å½æ°ãè®¾å¤æ°ä¸æ¥/å°æ¶è¶å¿ï¼æé¤ä½åºè®°å½ãå·²æ´æ£ææ´æ£åæ°éåä¸ï¼å¯æçéæ¡ä»¶å¯¼åº Excel", "roles": ["ç产ç»è®¡å", "管çå±"]}, |
| | | {"stage": "è¾¹ç", "action": "第ä¸é¶æ®µééæ°éåªåå±ç¤ºä¸ç»è®¡ï¼ä¸èªå¨ååç产æ¥å·¥ãå
è£
æåºåï¼ååé»è¾å¾
åç»éæ±ç¡®è®¤", "roles": ["ç³»ç»(䏿§è¡)"]}]} |
| | | ] |
| | | }</script> |
| | | <script type="application/json" id="data-roles">{ |
| | |
| | | {"role": "ä»ç®¡å", "modules": ["MES-WM"], "operations": ["15 ç±»åºå
¥åºåæ®æ§è¡", "è°æ¨", "çç¹", "æ¡ç è£
ç®±"], "data": ["mes_wm_*"], "scope": "ä»åºç»´åº¦ï¼WMS 坿ä»åºé
ç½®åºå
¥åº/è°æ¨/çç¹æ¯å¦èµ° BPM"}, |
| | | {"role": "è´¨æ£å", "modules": ["MES-QC"], "operations": ["IQC/IPQC/OQC/RQC æ£éª", "NCR è¯å®¡å¤ç½®"], "data": ["mes_qc_*"], "scope": "inspectorUserId å½å±"}, |
| | | {"role": "设å¤å/维修工", "modules": ["MES-DV"], "operations": ["ç¹æ£ä¿å
»", "维修工å", "å·¥è£
é¢ç¨"], "data": ["mes_dv_*", "mes_tm_*"], "scope": "chargeUserId å½å±"}, |
| | | {"role": "设å¤ç®¡çå/ç产ç»è®¡å", "modules": ["MES-DC"], "operations": ["éé设å¤å°è´¦ä¸ä»¤çéç½®", "ç»å®/è§£ç»ç产工å", "ééè®°å½æ´æ£ä¸ä½åº", "宿¶çæ¿ä¸ç»è®¡åæ"], "data": ["mes_dc_device", "mes_dc_record"], "scope": "èåæéæ§å¶ï¼mes:dc-device:* / mes:dc-record:* / mes:dc-statistics:query"}, |
| | | {"role": "客æ/å®åå·¥ç¨å¸", "modules": ["å®å"], "operations": ["å·¥ååçæ´¾å·¥", "ç»´ä¿®", "éè´§ç³è¯·"], "data": ["after_sale_*"], "scope": "è¡çº§æ°æ®æéåè§å¾ï¼æè´è´£/æåä¸/ä¸å±è´è´£/å
¨é¨(aftersales:view-all)"}, |
| | | {"role": "è´¢å¡", "modules": ["ERP", "CRM"], "operations": ["æ¶æ¬¾å", "仿¬¾å", "å¼ç¥¨å®¡æ ¸", "ç»ç®è´¦æ·"], "data": ["erp_finance_*", "crm_invoice", "crm_receivable"], "scope": "financeUserId å½å±"}, |
| | | {"role": "HR", "modules": ["HRM"], "operations": ["å工档æ¡å
¥è½¬è°ç¦»", "èå¤è§åæç(æ¬äººæå¡å
¨åå¯ç¨ï¼ä¸è®¾æéç¹)", "èªé
¬æ ¸ç®åæ¾", "离è交æ¥"], "data": ["hrm_*"], "scope": "é¨é¨èå´ dataScope"}, |
| | |
| | | å·¥åBOM |
| | | ç åè®¾è®¡é¡¹ç® |
| | | å®ç¯ |
| | | æ°æ®éé MES-DC |
| | | éé设å¤å°è´¦ä¸ä»¤ç |
| | | 设å¤ä¸æ¥ä¸å¿è·³ |
| | | å·¥åç»å®ä¸æ°æ®å¸¦å
¥ |
| | | ééè®°å½æ´æ£ä½åº |
| | | 宿¶çæ¿ä¸ç»è®¡åæ |
| | | ä»å¨ç®¡ç MES-WM |
| | | ä»åºåºåºåºä½ |
| | | å°è´§éç¥ |
| | |
| | | AI -.->|è´¨æ£å¤å®ä¸çäº§é¢æµ| MES |
| | | MES -.->|è´¨æ£åä¸ä¸æÂ·æ¬è½®ç±è°ç¨æ¹ä¼ å
¥ å¾
MesQcReportApi æé| QCR[æºè½è´¨æ£æ¥å qcreport 模æ¿çæ¬å®ä¾å¿«ç
§] |
| | | QCR -.->|PDF 彿¡£Â·åç»è½®æ¬¡| STG |
| | | MES -.->|ç»å®å·¥å带å
¥äº§å䏿¹æ¬¡| DC[æ°æ®éé MES-DC 设å¤å°è´¦Â·ééè®°å½] |
| | | DC -->|éé产éä¸è¶å¿| BI |
| | | DC -.->|第ä¸é¶æ®µä¸å忥工ä¸å
è£
| MES |
| | | MES --> BI[BI 管çé©¾é©¶è± SQLé
置大å±] |
| | | ERP --> BI |
| | | CRM --> BI |
| | |
| | | UIREP -.->|ç»æå°±å°å±ç¤º reportNo itemCount ä¸ undecidableCount åè¦| QCFE |
| | | QCFE -.->|è¿å
¥æ¶å¸¦ businessType+businessId è·¯ç± query·é¢å¡«æç´¢è¡¨åçãä¸å¡åæ®ãåæ®µ| UIREP |
| | | RPT -.->|æéç qc-report:template:ai-import å·²å
¥ system_menu| SYS1 |
| | | subgraph S5 [æ°æ®éé MES-DC] |
| | | DCD[éé设å¤å°è´¦Â·40ä½ä¸æ¬¡æ§ä»¤ç] -->|å建æé置令çé
ç½®å°ç½å
³| DCG[ç°åºç½å
³Â·é¸¡çªè®¡æ°ç§°é设å¤] |
| | | DCG -->|X-Device-Token å¿è·³Â·çº¦1åé䏿¬¡| DCG2[æåå¿è·³/åºä»¶çæ¬æ´æ°] |
| | | DCG -->|X-Device-Token 䏿¥ count æ totalCount·bizIdå¹ç| DCR[ééè®°å½Â·æ£å¸¸0] |
| | | DCR --> DCC[å·²æ´æ£1·çåå§æ°éä¸åå ] |
| | | DCR --> DCX[å·²ä½åº2·ä»å¯æ¥è¯¢] |
| | | DCR --> DCS[宿¶çæ¿Â·ä»æ¥äº§éä¸å¨çº¿ç¶æ] |
| | | DCR --> DCT[ç»è®¡åæÂ·æ±æ»/è¶å¿/æè®¾å¤] |
| | | end |
| | | WO -->|设å¤ç»å®æªå®å·¥æªåæ¶å·¥å·ä»
åç»æ°è®°å½å¸¦å
¥å·¥åäº§åæ¹æ¬¡| DCR |
| | | DCS -.->|产éè¶å¿è¿å¤§å±| BI[BI 管ç驾驶è±] |
| | | DCT -.->|第ä¸é¶æ®µä¸å忥工ä¸å
è£
| WO |
| | | </pre> |
| | | <pre style="display:none" class="mmd-src" data-mmd="10-business-object"> |
| | | erDiagram |
| | |
| | | hrm_employee ||--o{ hrm_employee_contract : "ç¾è®¢åå(èªå¨çæååææ¡£)" |
| | | qc_report_template ||--o{ qc_report_template_version : "å¤çæ¬" |
| | | qc_report_template_version ||--o{ qc_report_instance : "å»ç»åºä»¶çæ¬" |
| | | mes_dc_device ||--o{ mes_dc_record : "产çééè®°å½" |
| | | mes_pro_work_order ||--o{ mes_dc_device : "设å¤ç»å®å·¥å" |
| | | mes_pro_work_order ||--o{ mes_dc_record : "è®°å½å¸¦å
¥å·¥åäº§åæ¹æ¬¡" |
| | | mdm_item ||--o{ mes_dc_record : "éé产å" |
| | | </pre> |
| | | <pre style="display:none" class="mmd-src" data-mmd="11-ai-business-flow"> |
| | | flowchart TD |
| | |
| | | AHIDE -.-> R2 |
| | | </pre> |
| | | |
| | | <pre style="display:none" class="mmd-src" data-mmd="12-data-collection-flow"> |
| | | flowchart LR |
| | | DEV[ç°åºè®¡æ°ç§°éè®¾å¤ é¸¡çªèªå¨è®¡æ°] -->|HTTP JSON| GW[ç°åºç½å
³] |
| | | DEVADMIN[éé设å¤å°è´¦] -->|æ°å¢è®¾å¤Â·ä¸æ¬¡æ§æ¾ç¤º40ä½ä»¤ç| TOKEN[éé令ç X-Device-Token] |
| | | TOKEN -->|é
ç½®å°ç½å
³Â·é失åªè½éç½®| GW |
| | | GW -->|å¿è·³ 建议æ¯1åé æºå¸¦åºä»¶çæ¬IP| HB[å¿è·³æ¥å£] |
| | | HB -->|æ´æ°æåå¿è·³æ¶é´ä¸åºä»¶çæ¬| DEVADMIN |
| | | DEVADMIN -->|æåå¿è·³5åéå
=å¨çº¿ è¶
æ¶=离线| DASH[宿¶çæ¿] |
| | | GW -->|䏿¥ count æ totalCount å¯å¸¦bizId| ING[䏿¥æ¥å£] |
| | | ING -->|åä¸è®¾å¤+bizId éå¤è¿å馿¬¡è®°å½ duplicate=true| ING |
| | | ING -->|åªæ¥ç´¯è®¡å¼ææ¬æ¬¡ç´¯è®¡-䏿¬¡ç´¯è®¡ 馿¬¡ææ¸
é¶ææ¬æ¬¡ç´¯è®¡| ING |
| | | ING -->|ç¦ç¨è®¾å¤æç»ä¸æ¥| ERR[ä¸å¡é误ç ] |
| | | ING --> REC[ééè®°å½ æ£å¸¸0] |
| | | WO[çäº§å·¥å æªå®å·¥æªåæ¶] -->|设å¤ç»å®å·¥å å䏿¶é´ä¸å¼ | DEVADMIN |
| | | WO -->|ä»
åç»æ°è®°å½å¸¦å
¥ å·¥åç¼å· 产åç¼ç åç§° çäº§æ¹æ¬¡| REC |
| | | REC -->|æ´æ£ ä»
æ£å¸¸æ çåå§æ°éä¸åå | COR[å·²æ´æ£1] |
| | | REC -->|ä½åº ä¸å¯éå¤ä½åº| CAN[å·²ä½åº2] |
| | | REC --> DASH |
| | | REC --> STAT[ç»è®¡åæ æ°é éé è®°å½æ° è®¾å¤æ° æ¥æå°æ¶è¶å¿] |
| | | COR -->|ææ´æ£åæ°éåä¸| STAT |
| | | CAN -.->|ä½åºä¸åä¸ç»è®¡ä¸çæ¿| STAT |
| | | STAT -->|æç鿡件坼åºå
¨é¨å¹é
è¡| XLS[Excel导åº] |
| | | STAT -.->|第ä¸é¶æ®µä¸åå ç产æ¥å·¥ å
è£
åºå| WO |
| | | GW -.->|ç¦»çº¿è¡¥æ¥ online=false| ING |
| | | </pre> |
| | | |
| | | <script type="module"> |
| | | const DATA = {}; |
| | | async function loadJson(key){ |
| | |
| | | const mmdSrc = {}; |
| | | document.querySelectorAll('pre.mmd-src').forEach(p=>{ mmdSrc[p.dataset.mmd]=p.textContent.trim(); }); |
| | | |
| | | const flowColor = {sales:'var(--c-sale)',purchase:'var(--c-erp)',production:'var(--c-prod)',quality:'var(--c-qc)',warehouse:'var(--c-wm)',aftersales:'var(--c-as)',ai:'var(--c-ai)'}; |
| | | const flowColor = {sales:'var(--c-sale)',purchase:'var(--c-erp)',production:'var(--c-prod)',datacollection:'var(--c-dc)',quality:'var(--c-qc)',warehouse:'var(--c-wm)',aftersales:'var(--c-as)',ai:'var(--c-ai)'}; |
| | | |
| | | async function boot(){ |
| | | DATA.business = await loadJson('business'); |
| | |
| | | </div> |
| | | <h3 class="sec">ä¸å¡æ¨¡å</h3> |
| | | <div class="grid cards">`; |
| | | const targets = {crm:'flow-sales',erp:'flow-purchase',pro:'flow-production',wm:'flow-warehouse',qc:'flow-quality',aftersales:'flow-aftersales',ai:'ai',srm:'flow-purchase',mdm:'objects',dv:'objects',hrm:'objects',bpm:'relation'}; |
| | | const accs = {mdm:'var(--c-base)',crm:'var(--c-sale)',srm:'var(--c-sup)',erp:'var(--c-erp)',pro:'var(--c-prod)',wm:'var(--c-wm)',qc:'var(--c-qc)',dv:'var(--c-dv)',aftersales:'var(--c-as)',hrm:'var(--c-hrm)',bpm:'var(--c-bpm)',ai:'var(--c-ai)'}; |
| | | const targets = {crm:'flow-sales',erp:'flow-purchase',pro:'flow-production',dc:'flow-datacollection',wm:'flow-warehouse',qc:'flow-quality',aftersales:'flow-aftersales',ai:'ai',srm:'flow-purchase',mdm:'objects',dv:'objects',hrm:'objects',bpm:'relation'}; |
| | | const accs = {mdm:'var(--c-base)',crm:'var(--c-sale)',srm:'var(--c-sup)',erp:'var(--c-erp)',pro:'var(--c-prod)',dc:'var(--c-dc)',wm:'var(--c-wm)',qc:'var(--c-qc)',dv:'var(--c-dv)',aftersales:'var(--c-as)',hrm:'var(--c-hrm)',bpm:'var(--c-bpm)',ai:'var(--c-ai)'}; |
| | | DATA.modules.modules.forEach(m=>{ |
| | | html += `<div class="card" style="--acc:${accs[m.key]||'#2c5cff'}" data-goto="${targets[m.key]||'panorama'}"> |
| | | <h3>${esc(m.name)}<span class="tag">${esc(m.tag)}</span></h3> |
| | |
| | | å·¥åBOM |
| | | ç åè®¾è®¡é¡¹ç® |
| | | å®ç¯ |
| | | æ°æ®éé MES-DC |
| | | éé设å¤å°è´¦ä¸ä»¤ç |
| | | 设å¤ä¸æ¥ä¸å¿è·³ |
| | | å·¥åç»å®ä¸æ°æ®å¸¦å
¥ |
| | | ééè®°å½æ´æ£ä½åº |
| | | 宿¶çæ¿ä¸ç»è®¡åæ |
| | | ä»å¨ç®¡ç MES-WM |
| | | ä»åºåºåºåºä½ |
| | | å°è´§éç¥ |
| | |
| | | AI -.->|è´¨æ£å¤å®ä¸çäº§é¢æµ| MES |
| | | MES -.->|è´¨æ£åä¸ä¸æÂ·æ¬è½®ç±è°ç¨æ¹ä¼ å
¥ å¾
MesQcReportApi æé| QCR[æºè½è´¨æ£æ¥å qcreport 模æ¿çæ¬å®ä¾å¿«ç
§] |
| | | QCR -.->|PDF 彿¡£Â·åç»è½®æ¬¡| STG |
| | | MES -.->|ç»å®å·¥å带å
¥äº§å䏿¹æ¬¡| DC[æ°æ®éé MES-DC 设å¤å°è´¦Â·ééè®°å½] |
| | | DC -->|éé产éä¸è¶å¿| BI |
| | | DC -.->|第ä¸é¶æ®µä¸å忥工ä¸å
è£
| MES |
| | | MES --> BI[BI 管çé©¾é©¶è± SQLé
置大å±] |
| | | ERP --> BI |
| | | CRM --> BI |
| | |
| | | UIREP -.->|ç»æå°±å°å±ç¤º reportNo itemCount ä¸ undecidableCount åè¦| QCFE |
| | | QCFE -.->|è¿å
¥æ¶å¸¦ businessType+businessId è·¯ç± query·é¢å¡«æç´¢è¡¨åçãä¸å¡åæ®ãåæ®µ| UIREP |
| | | RPT -.->|æéç qc-report:template:ai-import å·²å
¥ system_menu| SYS1 |
| | | subgraph S5 [æ°æ®éé MES-DC] |
| | | DCD[éé设å¤å°è´¦Â·40ä½ä¸æ¬¡æ§ä»¤ç] -->|å建æé置令çé
ç½®å°ç½å
³| DCG[ç°åºç½å
³Â·é¸¡çªè®¡æ°ç§°é设å¤] |
| | | DCG -->|X-Device-Token å¿è·³Â·çº¦1åé䏿¬¡| DCG2[æåå¿è·³/åºä»¶çæ¬æ´æ°] |
| | | DCG -->|X-Device-Token 䏿¥ count æ totalCount·bizIdå¹ç| DCR[ééè®°å½Â·æ£å¸¸0] |
| | | DCR --> DCC[å·²æ´æ£1·çåå§æ°éä¸åå ] |
| | | DCR --> DCX[å·²ä½åº2·ä»å¯æ¥è¯¢] |
| | | DCR --> DCS[宿¶çæ¿Â·ä»æ¥äº§éä¸å¨çº¿ç¶æ] |
| | | DCR --> DCT[ç»è®¡åæÂ·æ±æ»/è¶å¿/æè®¾å¤] |
| | | end |
| | | WO -->|设å¤ç»å®æªå®å·¥æªåæ¶å·¥å·ä»
åç»æ°è®°å½å¸¦å
¥å·¥åäº§åæ¹æ¬¡| DCR |
| | | DCS -.->|产éè¶å¿è¿å¤§å±| BI[BI 管ç驾驶è±] |
| | | DCT -.->|第ä¸é¶æ®µä¸å忥工ä¸å
è£
| WO |
| | |
| | | hrm_employee ||--o{ hrm_employee_contract : "ç¾è®¢åå(èªå¨çæååææ¡£)" |
| | | qc_report_template ||--o{ qc_report_template_version : "å¤çæ¬" |
| | | qc_report_template_version ||--o{ qc_report_instance : "å»ç»åºä»¶çæ¬" |
| | | mes_dc_device ||--o{ mes_dc_record : "产çééè®°å½" |
| | | mes_pro_work_order ||--o{ mes_dc_device : "设å¤ç»å®å·¥å" |
| | | mes_pro_work_order ||--o{ mes_dc_record : "è®°å½å¸¦å
¥å·¥åäº§åæ¹æ¬¡" |
| | | mdm_item ||--o{ mes_dc_record : "éé产å" |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | -- ============================================ |
| | | -- MES æ°æ®ééï¼éæ±6 é¸¡çªæ°é对æ¥ï¼åå§åèæ¬ |
| | | -- å¯é夿§è¡ |
| | | -- ============================================ |
| | | |
| | | -- 1. éé设å¤è¡¨ |
| | | CREATE TABLE IF NOT EXISTS `mes_dc_device` ( |
| | | `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主é®ID', |
| | | `code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设å¤ç¼å·ï¼è®¾å¤ç«¯ä¸æ¥æ¶ä½¿ç¨ï¼', |
| | | `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设å¤åç§°', |
| | | `device_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'CHICKEN_FEET_COUNTER' COMMENT '设å¤ç±»å', |
| | | `model` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '设å¤åå·', |
| | | `serial_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '设å¤åºåå·', |
| | | `location` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'å®è£
ä½ç½®', |
| | | `status` tinyint NOT NULL DEFAULT 0 COMMENT '设å¤ç¶æï¼0 å¯ç¨ / 1 ç¦ç¨', |
| | | `token` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'éé令çï¼è®¾å¤ç«¯ X-Device-Tokenï¼', |
| | | `work_order_id` bigint NULL DEFAULT NULL COMMENT 'å½åç»å®ç产工åID', |
| | | `work_order_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'å½åç»å®ç产工åç¼å·ï¼åä½ï¼', |
| | | `bind_time` datetime NULL DEFAULT NULL COMMENT 'ç»å®å·¥åæ¶é´', |
| | | `last_heartbeat_time` datetime NULL DEFAULT NULL COMMENT 'æåå¿è·³æ¶é´', |
| | | `last_ingest_time` datetime NULL DEFAULT NULL COMMENT 'æåæ°æ®ä¸æ¥æ¶é´', |
| | | `firmware_version` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'åºä»¶çæ¬', |
| | | `device_ip` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '设å¤IP', |
| | | `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '夿³¨', |
| | | |
| | | `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT 'å建è
', |
| | | `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'å建æ¶é´', |
| | | `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT 'æ´æ°è
', |
| | | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ´æ°æ¶é´', |
| | | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ¯å¦å é¤', |
| | | PRIMARY KEY (`id`) USING BTREE, |
| | | UNIQUE INDEX `uk_code` (`code`) USING BTREE, |
| | | INDEX `idx_work_order_id` (`work_order_id`) USING BTREE |
| | | ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'MES æ°æ®éé设å¤' ROW_FORMAT = Dynamic; |
| | | |
| | | -- 2. ééè®°å½è¡¨ |
| | | CREATE TABLE IF NOT EXISTS `mes_dc_record` ( |
| | | `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主é®ID', |
| | | `device_id` bigint NOT NULL COMMENT 'éé设å¤ID', |
| | | `device_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设å¤ç¼å·ï¼åä½ï¼', |
| | | `device_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '设å¤åç§°ï¼åä½ï¼', |
| | | `work_order_id` bigint NULL DEFAULT NULL COMMENT 'ééæ¶ç»å®çç产工åID', |
| | | `work_order_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'ç产工åç¼å·ï¼åä½ï¼', |
| | | `product_id` bigint NULL DEFAULT NULL COMMENT '产åID', |
| | | `product_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '产åç¼ç ï¼åä½ï¼', |
| | | `product_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '产ååç§°ï¼åä½ï¼', |
| | | `batch_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'çäº§æ¹æ¬¡å·', |
| | | `record_no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '设å¤ä¾§è®°å½åºå·', |
| | | `biz_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '设å¤ä¾§å¯ä¸é®ï¼ç¨äºå¹çï¼', |
| | | `quantity` int NOT NULL COMMENT 'æ¬æ¬¡ééæ°é', |
| | | `total_quantity` int NULL DEFAULT NULL COMMENT '设å¤ç´¯è®¡æ°éï¼è®¾å¤åªæ¥ç´¯è®¡å¼æ¶ç¨äºè®¡ç®å·®å¼ï¼', |
| | | `weight` decimal(12, 2) NULL DEFAULT NULL COMMENT 'æ¬æ¬¡ééï¼gï¼', |
| | | `total_weight` decimal(12, 2) NULL DEFAULT NULL COMMENT '设å¤ç´¯è®¡ééï¼gï¼', |
| | | `record_time` datetime NOT NULL COMMENT '设å¤ééæ¶é´', |
| | | `receive_time` datetime NOT NULL COMMENT 'æå¡å¨æ¥æ¶æ¶é´', |
| | | `online` bit(1) NOT NULL DEFAULT b'1' COMMENT 'æ¯å¦å¨çº¿å®æ¶ä¸æ¥ï¼ç¦»çº¿è¡¥æ¥ä¸º 0ï¼', |
| | | `raw_data` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT 'åå§ä¸æ¥æ¥æ', |
| | | `status` tinyint NOT NULL DEFAULT 0 COMMENT 'è®°å½ç¶æï¼0 æ£å¸¸ / 1 å·²æ´æ£ / 2 å·²ä½åº', |
| | | `original_quantity` int NULL DEFAULT NULL COMMENT 'æ´æ£åçåå§æ°éï¼é¦æ¬¡æ´æ£æ¶ççï¼', |
| | | `correct_reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'æ´æ£/ä½åºåå ', |
| | | `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '夿³¨', |
| | | |
| | | `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT 'å建è
', |
| | | `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'å建æ¶é´', |
| | | `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT 'æ´æ°è
', |
| | | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ´æ°æ¶é´', |
| | | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ¯å¦å é¤', |
| | | PRIMARY KEY (`id`) USING BTREE, |
| | | UNIQUE INDEX `uk_device_biz` (`device_id`, `biz_id`) USING BTREE, |
| | | INDEX `idx_device_time` (`device_id`, `record_time`) USING BTREE, |
| | | INDEX `idx_work_order_id` (`work_order_id`) USING BTREE, |
| | | INDEX `idx_record_time` (`record_time`) USING BTREE |
| | | ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'MES æ°æ®ééè®°å½' ROW_FORMAT = Dynamic; |
| | | |
| | | -- 3. åå
¸ç±»å |
| | | INSERT INTO `system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 'MES æ°æ®éé设å¤ç±»å', 'mes_dc_device_type', 0, 'MES æ°æ®éé设å¤ç±»å', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_dict_type` WHERE `type` = 'mes_dc_device_type' AND `deleted` = b'0'); |
| | | |
| | | INSERT INTO `system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 'MES æ°æ®éé设å¤ç¶æ', 'mes_dc_device_status', 0, 'MES æ°æ®éé设å¤ç¶æ', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_dict_type` WHERE `type` = 'mes_dc_device_status' AND `deleted` = b'0'); |
| | | |
| | | INSERT INTO `system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 'MES æ°æ®ééè®°å½ç¶æ', 'mes_dc_record_status', 0, 'MES æ°æ®ééè®°å½ç¶æ', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_dict_type` WHERE `type` = 'mes_dc_record_status' AND `deleted` = b'0'); |
| | | |
| | | -- 4. åå
¸æ°æ® |
| | | INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1, '鸡çªè®¡æ°ç§°é设å¤', 'CHICKEN_FEET_COUNTER', 'mes_dc_device_type', 0, 'primary', '', '鸡çªèªå¨è®¡æ°/ç§°é设å¤', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_dict_data` WHERE `dict_type` = 'mes_dc_device_type' AND `value` = 'CHICKEN_FEET_COUNTER' AND `deleted` = b'0'); |
| | | |
| | | INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1, 'å¯ç¨', '0', 'mes_dc_device_status', 0, 'success', '', '', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_dict_data` WHERE `dict_type` = 'mes_dc_device_status' AND `value` = '0' AND `deleted` = b'0'); |
| | | |
| | | INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 2, 'ç¦ç¨', '1', 'mes_dc_device_status', 0, 'danger', '', '', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_dict_data` WHERE `dict_type` = 'mes_dc_device_status' AND `value` = '1' AND `deleted` = b'0'); |
| | | |
| | | INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1, 'æ£å¸¸', '0', 'mes_dc_record_status', 0, 'success', '', '', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_dict_data` WHERE `dict_type` = 'mes_dc_record_status' AND `value` = '0' AND `deleted` = b'0'); |
| | | |
| | | INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 2, 'å·²æ´æ£', '1', 'mes_dc_record_status', 0, 'warning', '', '', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_dict_data` WHERE `dict_type` = 'mes_dc_record_status' AND `value` = '1' AND `deleted` = b'0'); |
| | | |
| | | INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 3, 'å·²ä½åº', '2', 'mes_dc_record_status', 0, 'danger', '', '', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_dict_data` WHERE `dict_type` = 'mes_dc_record_status' AND `value` = '2' AND `deleted` = b'0'); |
| | | |
| | | -- 5. èåï¼çäº§ç®¡æ§ â æ°æ®éé |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080085, 'æ°æ®éé', '', 1, 60, 5100, 'dc', 'ep:data-line', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080085); |
| | | |
| | | -- 5.1 设å¤ç®¡ç |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080086, '设å¤ç®¡ç', '', 2, 1, 1080085, 'device', 'ep:monitor', 'mes/dc/device/index', 'MesDcDevice', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080086); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080087, 'è®¾å¤æ¥è¯¢', 'mes:dc-device:query', 3, 1, 1080086, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080087); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080088, 'è®¾å¤æ°å¢', 'mes:dc-device:create', 3, 2, 1080086, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080088); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080089, '设å¤ä¿®æ¹', 'mes:dc-device:update', 3, 3, 1080086, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080089); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080090, '设å¤å é¤', 'mes:dc-device:delete', 3, 4, 1080086, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080090); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080091, 'é置令ç', 'mes:dc-device:reset-token', 3, 5, 1080086, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080091); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080092, 'ç»å®å·¥å', 'mes:dc-device:bind', 3, 6, 1080086, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080092); |
| | | |
| | | -- 5.2 宿¶çæ¿ |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080093, '宿¶çæ¿', '', 2, 2, 1080085, 'dashboard', 'ep:data-board', 'mes/dc/dashboard/index', 'MesDcDashboard', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080093); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080094, 'çæ¿æ¥è¯¢', 'mes:dc-statistics:query', 3, 1, 1080093, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080094); |
| | | |
| | | -- 5.3 ééè®°å½ |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080095, 'ééè®°å½', '', 2, 3, 1080085, 'record', 'ep:list', 'mes/dc/record/index', 'MesDcRecord', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080095); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080096, 'è®°å½æ¥è¯¢', 'mes:dc-record:query', 3, 1, 1080095, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080096); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080097, 'è®°å½æ´æ£', 'mes:dc-record:correct', 3, 2, 1080095, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080097); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080098, 'è®°å½ä½åº', 'mes:dc-record:cancel', 3, 3, 1080095, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080098); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080099, 'è®°å½å¯¼åº', 'mes:dc-record:export', 3, 4, 1080095, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080099); |
| | | |
| | | -- 5.4 ç»è®¡åæ |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080100, 'ç»è®¡åæ', '', 2, 4, 1080085, 'statistics', 'ep:trend-charts', 'mes/dc/statistics/index', 'MesDcStatistics', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080100); |
| | | |
| | | INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT 1080101, 'ç»è®¡æ¥è¯¢', 'mes:dc-statistics:query', 3, 1, 1080100, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' |
| | | FROM DUAL |
| | | WHERE NOT EXISTS (SELECT 1 FROM `system_menu` WHERE `id` = 1080101); |
| | | |
| | | -- 6. è§è²ææï¼ä¸ç°æç产/è´¨æ£èåä¿æä¸è´ï¼æ®éè§è² + 155/160/162/163ï¼ |
| | | INSERT INTO `system_role_menu` (`role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) |
| | | SELECT r.id, m.id, '1', NOW(), '1', NOW(), b'0' |
| | | FROM `system_role` r |
| | | JOIN `system_menu` m ON m.id IN (1080085, 1080086, 1080087, 1080088, 1080089, 1080090, 1080091, 1080092, 1080093, 1080094, 1080095, 1080096, 1080097, 1080098, 1080099, 1080100, 1080101) AND m.deleted = b'0' |
| | | WHERE r.id IN (2, 155, 160, 162, 163) AND r.deleted = b'0' |
| | | AND NOT EXISTS (SELECT 1 FROM `system_role_menu` rm WHERE rm.role_id = r.id AND rm.menu_id = m.id); |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.device; |
| | | |
| | | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| | | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| | | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDeviceBindWorkOrderReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDeviceCreateRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDevicePageReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDeviceRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDeviceSaveReqVO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.device.MesDcDeviceDO; |
| | | import cn.iocoder.yudao.module.mes.service.dc.device.MesDcDeviceService; |
| | | import io.swagger.v3.oas.annotations.Operation; |
| | | import io.swagger.v3.oas.annotations.Parameter; |
| | | import io.swagger.v3.oas.annotations.tags.Tag; |
| | | import jakarta.annotation.Resource; |
| | | import jakarta.validation.Valid; |
| | | import org.springframework.security.access.prepost.PreAuthorize; |
| | | import org.springframework.validation.annotation.Validated; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import java.time.LocalDateTime; |
| | | import java.util.List; |
| | | |
| | | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| | | |
| | | @Tag(name = "管çåå° - MES æ°æ®éé设å¤") |
| | | @RestController |
| | | @RequestMapping("/mes/data-collection/device") |
| | | @Validated |
| | | public class MesDcDeviceController { |
| | | |
| | | /** |
| | | * 设å¤å¨çº¿å¤å®éå¼ï¼åéï¼ï¼è¶
è¿è¯¥æ¶é´æ å¿è·³è§ä¸ºç¦»çº¿ |
| | | */ |
| | | private static final int ONLINE_TIMEOUT_MINUTES = 5; |
| | | |
| | | @Resource |
| | | private MesDcDeviceService deviceService; |
| | | |
| | | @PostMapping("/create") |
| | | @Operation(summary = "å建设å¤") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-device:create')") |
| | | public CommonResult<MesDcDeviceCreateRespVO> createDevice( |
| | | @Valid @RequestBody MesDcDeviceSaveReqVO createReqVO) { |
| | | MesDcDeviceDO device = deviceService.createDevice(createReqVO); |
| | | return success(new MesDcDeviceCreateRespVO(device.getId(), device.getToken())); |
| | | } |
| | | |
| | | @PutMapping("/update") |
| | | @Operation(summary = "æ´æ°è®¾å¤") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-device:update')") |
| | | public CommonResult<Boolean> updateDevice(@Valid @RequestBody MesDcDeviceSaveReqVO updateReqVO) { |
| | | deviceService.updateDevice(updateReqVO); |
| | | return success(true); |
| | | } |
| | | |
| | | @DeleteMapping("/delete") |
| | | @Operation(summary = "å é¤è®¾å¤") |
| | | @Parameter(name = "id", description = "ç¼å·", required = true) |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-device:delete')") |
| | | public CommonResult<Boolean> deleteDevice(@RequestParam("id") Long id) { |
| | | deviceService.deleteDevice(id); |
| | | return success(true); |
| | | } |
| | | |
| | | @GetMapping("/get") |
| | | @Operation(summary = "è·å¾è®¾å¤è¯¦æ
") |
| | | @Parameter(name = "id", description = "ç¼å·", required = true, example = "1024") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-device:query')") |
| | | public CommonResult<MesDcDeviceRespVO> getDevice(@RequestParam("id") Long id) { |
| | | MesDcDeviceDO device = deviceService.getDevice(id); |
| | | return success(device == null ? null : buildDeviceRespVOList(List.of(device)).get(0)); |
| | | } |
| | | |
| | | @GetMapping("/page") |
| | | @Operation(summary = "è·å¾è®¾å¤å页") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-device:query')") |
| | | public CommonResult<PageResult<MesDcDeviceRespVO>> getDevicePage( |
| | | @Valid MesDcDevicePageReqVO pageReqVO) { |
| | | PageResult<MesDcDeviceDO> pageResult = deviceService.getDevicePage(pageReqVO); |
| | | return success(new PageResult<>(buildDeviceRespVOList(pageResult.getList()), |
| | | pageResult.getTotal())); |
| | | } |
| | | |
| | | @GetMapping("/simple-list") |
| | | @Operation(summary = "è·å¾è®¾å¤ç²¾ç®å表") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-device:query')") |
| | | public CommonResult<List<MesDcDeviceRespVO>> getDeviceSimpleList() { |
| | | return success(buildDeviceRespVOList(deviceService.getDeviceList())); |
| | | } |
| | | |
| | | @PutMapping("/reset-token") |
| | | @Operation(summary = "éç½®éé令ç") |
| | | @Parameter(name = "id", description = "ç¼å·", required = true) |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-device:reset-token')") |
| | | public CommonResult<String> resetToken(@RequestParam("id") Long id) { |
| | | return success(deviceService.resetToken(id)); |
| | | } |
| | | |
| | | @PutMapping("/bind-work-order") |
| | | @Operation(summary = "ç»å®ç产工å") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-device:bind')") |
| | | public CommonResult<Boolean> bindWorkOrder( |
| | | @Valid @RequestBody MesDcDeviceBindWorkOrderReqVO reqVO) { |
| | | deviceService.bindWorkOrder(reqVO.getId(), reqVO.getWorkOrderId()); |
| | | return success(true); |
| | | } |
| | | |
| | | @PutMapping("/unbind-work-order") |
| | | @Operation(summary = "è§£ç»ç产工å") |
| | | @Parameter(name = "id", description = "ç¼å·", required = true) |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-device:bind')") |
| | | public CommonResult<Boolean> unbindWorkOrder(@RequestParam("id") Long id) { |
| | | deviceService.unbindWorkOrder(id); |
| | | return success(true); |
| | | } |
| | | |
| | | // ==================== æ¼æ¥ VO ==================== |
| | | |
| | | private static List<MesDcDeviceRespVO> buildDeviceRespVOList(List<MesDcDeviceDO> list) { |
| | | LocalDateTime threshold = LocalDateTime.now().minusMinutes(ONLINE_TIMEOUT_MINUTES); |
| | | return BeanUtils.toBean(list, MesDcDeviceRespVO.class, |
| | | vo -> vo.setOnline(vo.getLastHeartbeatTime() != null |
| | | && vo.getLastHeartbeatTime().isAfter(threshold))); |
| | | } |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import jakarta.validation.constraints.NotNull; |
| | | import lombok.Data; |
| | | |
| | | @Schema(description = "管çåå° - MES éé设å¤ç»å®å·¥å Request VO") |
| | | @Data |
| | | public class MesDcDeviceBindWorkOrderReqVO { |
| | | |
| | | @Schema(description = "设å¤ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| | | @NotNull(message = "设å¤ç¼å·ä¸è½ä¸ºç©º") |
| | | private Long id; |
| | | |
| | | @Schema(description = "ç产工åç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048") |
| | | @NotNull(message = "ç产工åä¸è½ä¸ºç©º") |
| | | private Long workOrderId; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.AllArgsConstructor; |
| | | import lombok.Data; |
| | | import lombok.NoArgsConstructor; |
| | | |
| | | @Schema(description = "管çåå° - MES éé设å¤å建 Response VO") |
| | | @Data |
| | | @NoArgsConstructor |
| | | @AllArgsConstructor |
| | | public class MesDcDeviceCreateRespVO { |
| | | |
| | | @Schema(description = "ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| | | private Long id; |
| | | |
| | | @Schema(description = "éé令çï¼ä»
å建/éç½®æ¶è¿å䏿¬¡ï¼è¯·ç«å³é
ç½®å°è®¾å¤ç«¯ï¼", requiredMode = Schema.RequiredMode.REQUIRED) |
| | | private String token; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo; |
| | | |
| | | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | import lombok.EqualsAndHashCode; |
| | | import lombok.ToString; |
| | | |
| | | @Schema(description = "管çåå° - MES éé设å¤å页 Request VO") |
| | | @Data |
| | | @EqualsAndHashCode(callSuper = true) |
| | | @ToString(callSuper = true) |
| | | public class MesDcDevicePageReqVO extends PageParam { |
| | | |
| | | @Schema(description = "设å¤ç¼å·", example = "DC001") |
| | | private String code; |
| | | |
| | | @Schema(description = "设å¤åç§°", example = "ä¸è½¦é´é¸¡çªè®¡æ°å¨") |
| | | private String name; |
| | | |
| | | @Schema(description = "设å¤ç±»å", example = "CHICKEN_FEET_COUNTER") |
| | | private String deviceType; |
| | | |
| | | @Schema(description = "设å¤ç¶æï¼0 å¯ç¨ / 1 ç¦ç¨", example = "0") |
| | | private Integer status; |
| | | |
| | | @Schema(description = "å½åç»å®ç产工åID", example = "1024") |
| | | private Long workOrderId; |
| | | |
| | | @Schema(description = "å½åç»å®ç产工åç¼å·", example = "WO202611100001") |
| | | private String workOrderCode; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | |
| | | import java.time.LocalDateTime; |
| | | |
| | | @Schema(description = "管çåå° - MES ééè®¾å¤ Response VO") |
| | | @Data |
| | | public class MesDcDeviceRespVO { |
| | | |
| | | @Schema(description = "ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| | | private Long id; |
| | | |
| | | @Schema(description = "设å¤ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "DC001") |
| | | private String code; |
| | | |
| | | @Schema(description = "设å¤åç§°", requiredMode = Schema.RequiredMode.REQUIRED, example = "ä¸è½¦é´é¸¡çªè®¡æ°å¨") |
| | | private String name; |
| | | |
| | | @Schema(description = "设å¤ç±»å", example = "CHICKEN_FEET_COUNTER") |
| | | private String deviceType; |
| | | |
| | | @Schema(description = "设å¤åå·", example = "CF-2000") |
| | | private String model; |
| | | |
| | | @Schema(description = "设å¤åºåå·", example = "SN20261110001") |
| | | private String serialNo; |
| | | |
| | | @Schema(description = "å®è£
ä½ç½®", example = "ä¸è½¦é´ä¸ä¾§å
è£
线") |
| | | private String location; |
| | | |
| | | @Schema(description = "设å¤ç¶æï¼0 å¯ç¨ / 1 ç¦ç¨", example = "0") |
| | | private Integer status; |
| | | |
| | | @Schema(description = "æ¯å¦å¨çº¿ï¼5 åéå
æå¿è·³ï¼", example = "true") |
| | | private Boolean online; |
| | | |
| | | @Schema(description = "å½åç»å®ç产工åID", example = "1024") |
| | | private Long workOrderId; |
| | | |
| | | @Schema(description = "å½åç»å®ç产工åç¼å·", example = "WO202611100001") |
| | | private String workOrderCode; |
| | | |
| | | @Schema(description = "ç»å®å·¥åæ¶é´") |
| | | private LocalDateTime bindTime; |
| | | |
| | | @Schema(description = "æåå¿è·³æ¶é´") |
| | | private LocalDateTime lastHeartbeatTime; |
| | | |
| | | @Schema(description = "æåæ°æ®ä¸æ¥æ¶é´") |
| | | private LocalDateTime lastIngestTime; |
| | | |
| | | @Schema(description = "åºä»¶çæ¬", example = "1.0.2") |
| | | private String firmwareVersion; |
| | | |
| | | @Schema(description = "è®¾å¤ IP", example = "192.168.1.50") |
| | | private String deviceIp; |
| | | |
| | | @Schema(description = "夿³¨") |
| | | private String remark; |
| | | |
| | | @Schema(description = "å建æ¶é´") |
| | | private LocalDateTime createTime; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import jakarta.validation.constraints.NotBlank; |
| | | import jakarta.validation.constraints.NotNull; |
| | | import jakarta.validation.constraints.Size; |
| | | import lombok.Data; |
| | | |
| | | @Schema(description = "管çåå° - MES ééè®¾å¤æ°å¢/ä¿®æ¹ Request VO") |
| | | @Data |
| | | public class MesDcDeviceSaveReqVO { |
| | | |
| | | @Schema(description = "ç¼å·", example = "1024") |
| | | private Long id; |
| | | |
| | | @Schema(description = "设å¤ç¼å·ï¼è®¾å¤ç«¯ä¸æ¥æ¶ä½¿ç¨ï¼å建åä¸å¯ä¿®æ¹ï¼", requiredMode = Schema.RequiredMode.REQUIRED, example = "DC001") |
| | | @NotBlank(message = "设å¤ç¼å·ä¸è½ä¸ºç©º") |
| | | @Size(max = 64, message = "设å¤ç¼å·é¿åº¦ä¸è½è¶
è¿ 64 个å符") |
| | | private String code; |
| | | |
| | | @Schema(description = "设å¤åç§°", requiredMode = Schema.RequiredMode.REQUIRED, example = "ä¸è½¦é´é¸¡çªè®¡æ°å¨") |
| | | @NotBlank(message = "设å¤åç§°ä¸è½ä¸ºç©º") |
| | | @Size(max = 100, message = "设å¤åç§°é¿åº¦ä¸è½è¶
è¿ 100 个å符") |
| | | private String name; |
| | | |
| | | @Schema(description = "设å¤ç±»å", requiredMode = Schema.RequiredMode.REQUIRED, example = "CHICKEN_FEET_COUNTER") |
| | | @NotBlank(message = "设å¤ç±»åä¸è½ä¸ºç©º") |
| | | @Size(max = 32, message = "设å¤ç±»åé¿åº¦ä¸è½è¶
è¿ 32 个å符") |
| | | private String deviceType; |
| | | |
| | | @Schema(description = "设å¤åå·", example = "CF-2000") |
| | | @Size(max = 100, message = "设å¤åå·é¿åº¦ä¸è½è¶
è¿ 100 个å符") |
| | | private String model; |
| | | |
| | | @Schema(description = "设å¤åºåå·", example = "SN20261110001") |
| | | @Size(max = 100, message = "设å¤åºåå·é¿åº¦ä¸è½è¶
è¿ 100 个å符") |
| | | private String serialNo; |
| | | |
| | | @Schema(description = "å®è£
ä½ç½®", example = "ä¸è½¦é´ä¸ä¾§å
è£
线") |
| | | @Size(max = 200, message = "å®è£
ä½ç½®é¿åº¦ä¸è½è¶
è¿ 200 个å符") |
| | | private String location; |
| | | |
| | | @Schema(description = "设å¤ç¶æï¼0 å¯ç¨ / 1 ç¦ç¨", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") |
| | | @NotNull(message = "设å¤ç¶æä¸è½ä¸ºç©º") |
| | | private Integer status; |
| | | |
| | | @Schema(description = "夿³¨", example = "鸡çªèªå¨è®¡æ°/ç§°é设å¤") |
| | | @Size(max = 500, message = "夿³¨é¿åº¦ä¸è½è¶
è¿ 500 个å符") |
| | | private String remark; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.open; |
| | | |
| | | import cn.hutool.core.util.StrUtil; |
| | | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| | | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcHeartbeatReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcHeartbeatRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcIngestReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcIngestRespVO; |
| | | import cn.iocoder.yudao.module.mes.service.dc.device.MesDcDeviceService; |
| | | import cn.iocoder.yudao.module.mes.service.dc.record.MesDcRecordService; |
| | | import io.swagger.v3.oas.annotations.Operation; |
| | | import io.swagger.v3.oas.annotations.tags.Tag; |
| | | import jakarta.annotation.Resource; |
| | | import jakarta.annotation.security.PermitAll; |
| | | import jakarta.validation.Valid; |
| | | import org.springframework.validation.annotation.Validated; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| | | |
| | | @Tag(name = "设å¤ç«¯ - MES æ°æ®éé") |
| | | @RestController |
| | | @RequestMapping("/mes/data-collection/open") |
| | | @Validated |
| | | public class MesDcOpenController { |
| | | |
| | | @Resource |
| | | private MesDcRecordService dcRecordService; |
| | | @Resource |
| | | private MesDcDeviceService deviceService; |
| | | |
| | | @PostMapping("/ingest") |
| | | @Operation(summary = "æ¥æ¶è®¾å¤ä¸æ¥çééæ°æ®") |
| | | @PermitAll |
| | | public CommonResult<MesDcIngestRespVO> ingest( |
| | | @Valid @RequestBody MesDcIngestReqVO reqVO, |
| | | @RequestHeader(value = "X-Device-Token", required = false) String headerToken, |
| | | @RequestParam(value = "token", required = false) String paramToken) { |
| | | String token = resolveToken(headerToken, paramToken); |
| | | return success(dcRecordService.ingest(reqVO, token, JsonUtils.toJsonString(reqVO))); |
| | | } |
| | | |
| | | @PostMapping("/heartbeat") |
| | | @Operation(summary = "æ¥æ¶è®¾å¤å¿è·³") |
| | | @PermitAll |
| | | public CommonResult<MesDcHeartbeatRespVO> heartbeat( |
| | | @Valid @RequestBody MesDcHeartbeatReqVO reqVO, |
| | | @RequestHeader(value = "X-Device-Token", required = false) String headerToken, |
| | | @RequestParam(value = "token", required = false) String paramToken) { |
| | | String token = resolveToken(headerToken, paramToken); |
| | | return success(deviceService.heartbeat(reqVO, token)); |
| | | } |
| | | |
| | | /** |
| | | * ä¼å
å请æ±å¤´ X-Device-Tokenï¼å
¶æ¬¡å URL åæ° token |
| | | */ |
| | | private static String resolveToken(String headerToken, String paramToken) { |
| | | return StrUtil.isNotBlank(headerToken) ? headerToken : paramToken; |
| | | } |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import jakarta.validation.constraints.NotBlank; |
| | | import jakarta.validation.constraints.Size; |
| | | import lombok.Data; |
| | | |
| | | @Schema(description = "设å¤ç«¯ - å¿è·³ Request VO") |
| | | @Data |
| | | public class MesDcHeartbeatReqVO { |
| | | |
| | | @Schema(description = "设å¤ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "DC001") |
| | | @NotBlank(message = "设å¤ç¼å·ä¸è½ä¸ºç©º") |
| | | @Size(max = 64, message = "设å¤ç¼å·é¿åº¦ä¸è½è¶
è¿ 64 个å符") |
| | | private String deviceCode; |
| | | |
| | | @Schema(description = "åºä»¶çæ¬", example = "1.0.2") |
| | | @Size(max = 64, message = "åºä»¶çæ¬é¿åº¦ä¸è½è¶
è¿ 64 个å符") |
| | | private String firmwareVersion; |
| | | |
| | | @Schema(description = "è®¾å¤ IP", example = "192.168.1.50") |
| | | @Size(max = 64, message = "è®¾å¤ IP é¿åº¦ä¸è½è¶
è¿ 64 个å符") |
| | | private String ip; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | |
| | | import java.time.LocalDateTime; |
| | | |
| | | @Schema(description = "设å¤ç«¯ - å¿è·³ Response VO") |
| | | @Data |
| | | public class MesDcHeartbeatRespVO { |
| | | |
| | | @Schema(description = "æå¡å¨å½åæ¶é´") |
| | | private LocalDateTime serverTime; |
| | | |
| | | @Schema(description = "设å¤åç§°", example = "ä¸è½¦é´é¸¡çªè®¡æ°å¨") |
| | | private String deviceName; |
| | | |
| | | @Schema(description = "è®¾å¤æ¯å¦å¯ç¨", example = "true") |
| | | private Boolean enabled; |
| | | |
| | | @Schema(description = "å½åç»å®ç产工åID", example = "2048") |
| | | private Long workOrderId; |
| | | |
| | | @Schema(description = "å½åç»å®ç产工åç¼å·", example = "WO202611100001") |
| | | private String workOrderCode; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import jakarta.validation.constraints.NotBlank; |
| | | import jakarta.validation.constraints.Size; |
| | | import lombok.Data; |
| | | |
| | | import java.math.BigDecimal; |
| | | import java.time.LocalDateTime; |
| | | |
| | | @Schema(description = "设å¤ç«¯ - ééæ°æ®ä¸æ¥ Request VO") |
| | | @Data |
| | | public class MesDcIngestReqVO { |
| | | |
| | | @Schema(description = "设å¤ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "DC001") |
| | | @NotBlank(message = "设å¤ç¼å·ä¸è½ä¸ºç©º") |
| | | @Size(max = 64, message = "设å¤ç¼å·é¿åº¦ä¸è½è¶
è¿ 64 个å符") |
| | | private String deviceCode; |
| | | |
| | | @Schema(description = "设å¤ä¾§å¯ä¸é®ï¼æ¨è䏿¥ï¼ç¨äºéå¤ä¸æ¥å¹çï¼", example = "20261110142305-0001") |
| | | @Size(max = 64, message = "设å¤ä¾§å¯ä¸é®é¿åº¦ä¸è½è¶
è¿ 64 个å符") |
| | | private String bizId; |
| | | |
| | | @Schema(description = "设å¤ä¾§è®°å½åºå·", example = "0001") |
| | | @Size(max = 64, message = "设å¤ä¾§è®°å½åºå·é¿åº¦ä¸è½è¶
è¿ 64 个å符") |
| | | private String recordNo; |
| | | |
| | | @Schema(description = "设å¤ééæ¶é´ï¼ä¸ä¼ ååæå¡å¨å½åæ¶é´", example = "2026-11-10 14:23:05") |
| | | private LocalDateTime recordTime; |
| | | |
| | | @Schema(description = "æ¬æ¬¡è®¡æ°ï¼ä¸ totalCount è³å°å¡«ä¸ä¸ªï¼é½å¡«æ¶ä»¥ count 为åï¼", example = "12") |
| | | private Integer count; |
| | | |
| | | @Schema(description = "设å¤ç´¯è®¡è®¡æ°ï¼è®¾å¤åªæ¥ç´¯è®¡å¼æ¶ï¼ç³»ç»æä¸ä¸æ¬¡ç´¯è®¡å¼çå·®å¼è®¡ç®æ¬æ¬¡æ°éï¼", example = "1234") |
| | | private Integer totalCount; |
| | | |
| | | @Schema(description = "æ¬æ¬¡ééï¼gï¼", example = "3500.50") |
| | | private BigDecimal weight; |
| | | |
| | | @Schema(description = "设å¤ç´¯è®¡ééï¼gï¼", example = "123456.70") |
| | | private BigDecimal totalWeight; |
| | | |
| | | @Schema(description = "æ¯å¦å¨çº¿å®æ¶ä¸æ¥ï¼ç¦»çº¿è¡¥æ¥è¯·ä¼ falseï¼é»è®¤ true", example = "true") |
| | | private Boolean online; |
| | | |
| | | @Schema(description = "åºä»¶çæ¬ï¼å¯éï¼ä¸æ¥åæ´æ°å°è®¾å¤å°è´¦ï¼", example = "1.0.2") |
| | | @Size(max = 64, message = "åºä»¶çæ¬é¿åº¦ä¸è½è¶
è¿ 64 个å符") |
| | | private String firmwareVersion; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | |
| | | import java.math.BigDecimal; |
| | | import java.time.LocalDateTime; |
| | | |
| | | @Schema(description = "设å¤ç«¯ - ééæ°æ®ä¸æ¥ Response VO") |
| | | @Data |
| | | public class MesDcIngestRespVO { |
| | | |
| | | @Schema(description = "ééè®°å½ç¼å·", example = "1024") |
| | | private Long recordId; |
| | | |
| | | @Schema(description = "æ¯å¦ä¸ºéå¤ä¸æ¥ï¼éå¤ä¸æ¥ä¸ä¼æ°å¢è®°å½ï¼", example = "false") |
| | | private Boolean duplicate; |
| | | |
| | | @Schema(description = "æ¬æ¬¡å
¥åºæ°é", example = "12") |
| | | private Integer quantity; |
| | | |
| | | @Schema(description = "设å¤ä»æ¥ç´¯è®¡æ°éï¼ä¸å«å·²ä½åºè®°å½ï¼", example = "1234") |
| | | private Long todayQuantity; |
| | | |
| | | @Schema(description = "设å¤ä»æ¥ç´¯è®¡ééï¼gï¼ä¸å«å·²ä½åºè®°å½ï¼", example = "123456.70") |
| | | private BigDecimal todayWeight; |
| | | |
| | | @Schema(description = "æå¡å¨å½åæ¶é´") |
| | | private LocalDateTime serverTime; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.record; |
| | | |
| | | import cn.hutool.core.collection.CollUtil; |
| | | import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; |
| | | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| | | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| | | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| | | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| | | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordCancelReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordCorrectReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordPageReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordRespVO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.record.MesDcRecordDO; |
| | | import cn.iocoder.yudao.module.mes.enums.dc.MesDcRecordStatusEnum; |
| | | import cn.iocoder.yudao.module.mes.service.dc.record.MesDcRecordService; |
| | | import io.swagger.v3.oas.annotations.Operation; |
| | | import io.swagger.v3.oas.annotations.Parameter; |
| | | import io.swagger.v3.oas.annotations.tags.Tag; |
| | | import jakarta.annotation.Resource; |
| | | import jakarta.servlet.http.HttpServletResponse; |
| | | import jakarta.validation.Valid; |
| | | import org.springframework.security.access.prepost.PreAuthorize; |
| | | import org.springframework.validation.annotation.Validated; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import java.io.IOException; |
| | | import java.util.Collections; |
| | | import java.util.List; |
| | | |
| | | import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; |
| | | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| | | |
| | | @Tag(name = "管çåå° - MES æ°æ®ééè®°å½") |
| | | @RestController |
| | | @RequestMapping("/mes/data-collection/record") |
| | | @Validated |
| | | public class MesDcRecordController { |
| | | |
| | | @Resource |
| | | private MesDcRecordService dcRecordService; |
| | | |
| | | @GetMapping("/get") |
| | | @Operation(summary = "è·å¾ééè®°å½è¯¦æ
") |
| | | @Parameter(name = "id", description = "ç¼å·", required = true, example = "1024") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-record:query')") |
| | | public CommonResult<MesDcRecordRespVO> getRecord(@RequestParam("id") Long id) { |
| | | MesDcRecordDO record = dcRecordService.getRecord(id); |
| | | return success(record == null ? null |
| | | : buildRecordRespVOList(Collections.singletonList(record)).get(0)); |
| | | } |
| | | |
| | | @GetMapping("/page") |
| | | @Operation(summary = "è·å¾ééè®°å½å页") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-record:query')") |
| | | public CommonResult<PageResult<MesDcRecordRespVO>> getRecordPage( |
| | | @Valid MesDcRecordPageReqVO pageReqVO) { |
| | | PageResult<MesDcRecordDO> pageResult = dcRecordService.getRecordPage(pageReqVO); |
| | | return success(new PageResult<>(buildRecordRespVOList(pageResult.getList()), |
| | | pageResult.getTotal())); |
| | | } |
| | | |
| | | @PutMapping("/correct") |
| | | @Operation(summary = "æ´æ£ééè®°å½") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-record:correct')") |
| | | public CommonResult<Boolean> correctRecord(@Valid @RequestBody MesDcRecordCorrectReqVO reqVO) { |
| | | dcRecordService.correctRecord(reqVO); |
| | | return success(true); |
| | | } |
| | | |
| | | @PutMapping("/cancel") |
| | | @Operation(summary = "ä½åºééè®°å½") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-record:cancel')") |
| | | public CommonResult<Boolean> cancelRecord(@Valid @RequestBody MesDcRecordCancelReqVO reqVO) { |
| | | dcRecordService.cancelRecord(reqVO); |
| | | return success(true); |
| | | } |
| | | |
| | | @GetMapping("/export-excel") |
| | | @Operation(summary = "导åºééè®°å½ Excel") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-record:export')") |
| | | @ApiAccessLog(operateType = EXPORT) |
| | | public void exportRecordExcel(@Valid MesDcRecordPageReqVO pageReqVO, |
| | | HttpServletResponse response) throws IOException { |
| | | pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); |
| | | PageResult<MesDcRecordDO> pageResult = dcRecordService.getRecordPage(pageReqVO); |
| | | ExcelUtils.write(response, "ééè®°å½.xls", "æ°æ®", MesDcRecordRespVO.class, |
| | | buildRecordRespVOList(pageResult.getList())); |
| | | } |
| | | |
| | | // ==================== æ¼æ¥ VO ==================== |
| | | |
| | | private static List<MesDcRecordRespVO> buildRecordRespVOList(List<MesDcRecordDO> list) { |
| | | if (CollUtil.isEmpty(list)) { |
| | | return Collections.emptyList(); |
| | | } |
| | | List<MesDcRecordRespVO> result = BeanUtils.toBean(list, MesDcRecordRespVO.class); |
| | | result.forEach(vo -> { |
| | | vo.setStatusName(resolveStatusName(vo.getStatus())); |
| | | vo.setOnlineName(Boolean.FALSE.equals(vo.getOnline()) ? "离线补æ¥" : "å¨çº¿"); |
| | | }); |
| | | return result; |
| | | } |
| | | |
| | | private static String resolveStatusName(Integer status) { |
| | | MesDcRecordStatusEnum statusEnum = MesDcRecordStatusEnum.valueOf(status); |
| | | return statusEnum != null ? statusEnum.getName() : "æªç¥ç¶æ(" + status + ")"; |
| | | } |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import jakarta.validation.constraints.NotBlank; |
| | | import jakarta.validation.constraints.NotNull; |
| | | import jakarta.validation.constraints.Size; |
| | | import lombok.Data; |
| | | |
| | | @Schema(description = "管çåå° - MES ééè®°å½ä½åº Request VO") |
| | | @Data |
| | | public class MesDcRecordCancelReqVO { |
| | | |
| | | @Schema(description = "è®°å½ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| | | @NotNull(message = "è®°å½ç¼å·ä¸è½ä¸ºç©º") |
| | | private Long id; |
| | | |
| | | @Schema(description = "ä½åºåå ", requiredMode = Schema.RequiredMode.REQUIRED, example = "éå¤ä¸æ¥ï¼ä½åºæ¬æ¡è®°å½") |
| | | @NotBlank(message = "ä½åºåå ä¸è½ä¸ºç©º") |
| | | @Size(max = 255, message = "ä½åºåå é¿åº¦ä¸è½è¶
è¿ 255 个å符") |
| | | private String reason; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import jakarta.validation.constraints.Min; |
| | | import jakarta.validation.constraints.NotBlank; |
| | | import jakarta.validation.constraints.NotNull; |
| | | import jakarta.validation.constraints.Size; |
| | | import lombok.Data; |
| | | |
| | | @Schema(description = "管çåå° - MES ééè®°å½æ´æ£ Request VO") |
| | | @Data |
| | | public class MesDcRecordCorrectReqVO { |
| | | |
| | | @Schema(description = "è®°å½ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| | | @NotNull(message = "è®°å½ç¼å·ä¸è½ä¸ºç©º") |
| | | private Long id; |
| | | |
| | | @Schema(description = "æ´æ£åçééæ°é", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") |
| | | @NotNull(message = "æ´æ£åçæ°éä¸è½ä¸ºç©º") |
| | | @Min(value = 0, message = "æ´æ£åçæ°éä¸è½å°äº 0") |
| | | private Integer quantity; |
| | | |
| | | @Schema(description = "æ´æ£åå ", requiredMode = Schema.RequiredMode.REQUIRED, example = "设å¤è¯¯è®¡æ°ï¼æå®é
æ°éæ´æ£") |
| | | @NotBlank(message = "æ´æ£åå ä¸è½ä¸ºç©º") |
| | | @Size(max = 255, message = "æ´æ£åå é¿åº¦ä¸è½è¶
è¿ 255 个å符") |
| | | private String reason; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo; |
| | | |
| | | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | import lombok.EqualsAndHashCode; |
| | | import lombok.ToString; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import java.time.LocalDateTime; |
| | | |
| | | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| | | |
| | | @Schema(description = "管çåå° - MES ééè®°å½å页 Request VO") |
| | | @Data |
| | | @EqualsAndHashCode(callSuper = true) |
| | | @ToString(callSuper = true) |
| | | public class MesDcRecordPageReqVO extends PageParam { |
| | | |
| | | @Schema(description = "éé设å¤ID", example = "1024") |
| | | private Long deviceId; |
| | | |
| | | @Schema(description = "设å¤ç¼å·", example = "DC001") |
| | | private String deviceCode; |
| | | |
| | | @Schema(description = "ç产工åID", example = "2048") |
| | | private Long workOrderId; |
| | | |
| | | @Schema(description = "ç产工åç¼å·", example = "WO202611100001") |
| | | private String workOrderCode; |
| | | |
| | | @Schema(description = "产åID", example = "88") |
| | | private Long productId; |
| | | |
| | | @Schema(description = "çäº§æ¹æ¬¡å·", example = "B20261110001") |
| | | private String batchCode; |
| | | |
| | | @Schema(description = "è®°å½ç¶æï¼0 æ£å¸¸ / 1 å·²æ´æ£ / 2 å·²ä½åº", example = "0") |
| | | private Integer status; |
| | | |
| | | @Schema(description = "设å¤ééæ¶é´") |
| | | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| | | private LocalDateTime[] recordTime; |
| | | |
| | | @Schema(description = "æå¡å¨æ¥æ¶æ¶é´") |
| | | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| | | private LocalDateTime[] createTime; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo; |
| | | |
| | | import cn.idev.excel.annotation.ExcelIgnoreUnannotated; |
| | | import cn.idev.excel.annotation.ExcelProperty; |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | |
| | | import java.math.BigDecimal; |
| | | import java.time.LocalDateTime; |
| | | |
| | | @Schema(description = "管çåå° - MES ééè®°å½ Response VO") |
| | | @Data |
| | | @ExcelIgnoreUnannotated |
| | | public class MesDcRecordRespVO { |
| | | |
| | | @Schema(description = "ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| | | private Long id; |
| | | |
| | | @Schema(description = "éé设å¤ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| | | private Long deviceId; |
| | | |
| | | @Schema(description = "设å¤ç¼å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "DC001") |
| | | @ExcelProperty("设å¤ç¼å·") |
| | | private String deviceCode; |
| | | |
| | | @Schema(description = "设å¤åç§°", example = "ä¸è½¦é´é¸¡çªè®¡æ°å¨") |
| | | @ExcelProperty("设å¤åç§°") |
| | | private String deviceName; |
| | | |
| | | @Schema(description = "ç产工åID", example = "2048") |
| | | private Long workOrderId; |
| | | |
| | | @Schema(description = "ç产工åç¼å·", example = "WO202611100001") |
| | | @ExcelProperty("ç产工åç¼å·") |
| | | private String workOrderCode; |
| | | |
| | | @Schema(description = "产åID", example = "88") |
| | | private Long productId; |
| | | |
| | | @Schema(description = "产åç¼ç ", example = "P001") |
| | | @ExcelProperty("产åç¼ç ") |
| | | private String productCode; |
| | | |
| | | @Schema(description = "产ååç§°", example = "èªçç«é
") |
| | | @ExcelProperty("产ååç§°") |
| | | private String productName; |
| | | |
| | | @Schema(description = "çäº§æ¹æ¬¡å·", example = "B20261110001") |
| | | @ExcelProperty("çäº§æ¹æ¬¡å·") |
| | | private String batchCode; |
| | | |
| | | @Schema(description = "设å¤ä¾§è®°å½åºå·", example = "0001") |
| | | @ExcelProperty("设å¤è®°å½åºå·") |
| | | private String recordNo; |
| | | |
| | | @Schema(description = "æ¬æ¬¡ééæ°é", requiredMode = Schema.RequiredMode.REQUIRED, example = "12") |
| | | @ExcelProperty("ééæ°é") |
| | | private Integer quantity; |
| | | |
| | | @Schema(description = "设å¤ç´¯è®¡æ°é", example = "1234") |
| | | private Integer totalQuantity; |
| | | |
| | | @Schema(description = "æ¬æ¬¡ééï¼gï¼", example = "3500.50") |
| | | @ExcelProperty("éé(g)") |
| | | private BigDecimal weight; |
| | | |
| | | @Schema(description = "设å¤ç´¯è®¡ééï¼gï¼", example = "123456.70") |
| | | private BigDecimal totalWeight; |
| | | |
| | | @Schema(description = "设å¤ééæ¶é´", requiredMode = Schema.RequiredMode.REQUIRED) |
| | | @ExcelProperty("ééæ¶é´") |
| | | private LocalDateTime recordTime; |
| | | |
| | | @Schema(description = "æå¡å¨æ¥æ¶æ¶é´", requiredMode = Schema.RequiredMode.REQUIRED) |
| | | @ExcelProperty("æ¥æ¶æ¶é´") |
| | | private LocalDateTime receiveTime; |
| | | |
| | | @Schema(description = "æ¯å¦å¨çº¿å®æ¶ä¸æ¥", example = "true") |
| | | private Boolean online; |
| | | |
| | | @Schema(description = "䏿¥æ¹å¼", example = "å¨çº¿") |
| | | @ExcelProperty("䏿¥æ¹å¼") |
| | | private String onlineName; |
| | | |
| | | @Schema(description = "è®°å½ç¶æï¼0 æ£å¸¸ / 1 å·²æ´æ£ / 2 å·²ä½åº", example = "0") |
| | | private Integer status; |
| | | |
| | | @Schema(description = "è®°å½ç¶æåç§°", example = "æ£å¸¸") |
| | | @ExcelProperty("è®°å½ç¶æ") |
| | | private String statusName; |
| | | |
| | | @Schema(description = "æ´æ£åçåå§æ°é", example = "11") |
| | | @ExcelProperty("åå§æ°é") |
| | | private Integer originalQuantity; |
| | | |
| | | @Schema(description = "æ´æ£/ä½åºåå ", example = "设å¤è¯¯è®¡æ°ï¼æå®é
æ°éæ´æ£") |
| | | @ExcelProperty("æ´æ£/ä½åºåå ") |
| | | private String correctReason; |
| | | |
| | | @Schema(description = "夿³¨") |
| | | private String remark; |
| | | |
| | | @Schema(description = "åå§ä¸æ¥æ¥æ") |
| | | private String rawData; |
| | | |
| | | @Schema(description = "å建æ¶é´") |
| | | private LocalDateTime createTime; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.statistics; |
| | | |
| | | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcDeviceOverviewRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsSummaryRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsTrendItemVO; |
| | | import cn.iocoder.yudao.module.mes.service.dc.statistics.MesDcStatisticsService; |
| | | import io.swagger.v3.oas.annotations.Operation; |
| | | import io.swagger.v3.oas.annotations.tags.Tag; |
| | | import jakarta.annotation.Resource; |
| | | import jakarta.validation.Valid; |
| | | import org.springframework.security.access.prepost.PreAuthorize; |
| | | import org.springframework.validation.annotation.Validated; |
| | | import org.springframework.web.bind.annotation.GetMapping; |
| | | import org.springframework.web.bind.annotation.RequestMapping; |
| | | import org.springframework.web.bind.annotation.RestController; |
| | | |
| | | import java.util.List; |
| | | |
| | | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| | | |
| | | @Tag(name = "管çåå° - MES æ°æ®ééç»è®¡") |
| | | @RestController |
| | | @RequestMapping("/mes/data-collection/statistics") |
| | | @Validated |
| | | public class MesDcStatisticsController { |
| | | |
| | | @Resource |
| | | private MesDcStatisticsService statisticsService; |
| | | |
| | | @GetMapping("/summary") |
| | | @Operation(summary = "è·å¾ééç»è®¡æ±æ»") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-statistics:query')") |
| | | public CommonResult<MesDcStatisticsSummaryRespVO> getSummary( |
| | | @Valid MesDcStatisticsReqVO reqVO) { |
| | | return success(statisticsService.getSummary(reqVO)); |
| | | } |
| | | |
| | | @GetMapping("/trend") |
| | | @Operation(summary = "è·å¾ééè¶å¿") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-statistics:query')") |
| | | public CommonResult<List<MesDcStatisticsTrendItemVO>> getTrend( |
| | | @Valid MesDcStatisticsReqVO reqVO) { |
| | | return success(statisticsService.getTrend(reqVO)); |
| | | } |
| | | |
| | | @GetMapping("/device-overview") |
| | | @Operation(summary = "è·å¾è®¾å¤å®æ¶æ¦è§") |
| | | @PreAuthorize("@ss.hasPermission('mes:dc-statistics:query')") |
| | | public CommonResult<List<MesDcDeviceOverviewRespVO>> getDeviceOverview() { |
| | | return success(statisticsService.getDeviceOverview()); |
| | | } |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | |
| | | import java.math.BigDecimal; |
| | | import java.time.LocalDateTime; |
| | | |
| | | @Schema(description = "管çåå° - MES éé设å¤å®æ¶æ¦è§ VO") |
| | | @Data |
| | | public class MesDcDeviceOverviewRespVO { |
| | | |
| | | @Schema(description = "éé设å¤ID", example = "1024") |
| | | private Long deviceId; |
| | | |
| | | @Schema(description = "设å¤ç¼å·", example = "DC001") |
| | | private String code; |
| | | |
| | | @Schema(description = "设å¤åç§°", example = "ä¸è½¦é´é¸¡çªè®¡æ°å¨") |
| | | private String name; |
| | | |
| | | @Schema(description = "è®¾å¤æ¯å¦å¯ç¨", example = "true") |
| | | private Boolean enabled; |
| | | |
| | | @Schema(description = "æ¯å¦å¨çº¿ï¼5 åéå
æå¿è·³ï¼", example = "true") |
| | | private Boolean online; |
| | | |
| | | @Schema(description = "å½åç»å®ç产工åID", example = "2048") |
| | | private Long workOrderId; |
| | | |
| | | @Schema(description = "å½åç»å®ç产工åç¼å·", example = "WO202611100001") |
| | | private String workOrderCode; |
| | | |
| | | @Schema(description = "仿¥ééæ°éï¼ä¸å«å·²ä½åºè®°å½ï¼", example = "1234") |
| | | private Long todayQuantity; |
| | | |
| | | @Schema(description = "仿¥ééï¼gï¼ä¸å«å·²ä½åºè®°å½ï¼", example = "123456.70") |
| | | private BigDecimal todayWeight; |
| | | |
| | | @Schema(description = "æåæ°æ®ä¸æ¥æ¶é´") |
| | | private LocalDateTime lastIngestTime; |
| | | |
| | | @Schema(description = "æåå¿è·³æ¶é´") |
| | | private LocalDateTime lastHeartbeatTime; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | |
| | | import java.math.BigDecimal; |
| | | |
| | | @Schema(description = "管çåå° - MES æ°æ®ééæè®¾å¤ç»è®¡é¡¹ VO") |
| | | @Data |
| | | public class MesDcStatisticsDeviceItemVO { |
| | | |
| | | @Schema(description = "éé设å¤ID", example = "1024") |
| | | private Long deviceId; |
| | | |
| | | @Schema(description = "设å¤ç¼å·", example = "DC001") |
| | | private String deviceCode; |
| | | |
| | | @Schema(description = "设å¤åç§°", example = "ä¸è½¦é´é¸¡çªè®¡æ°å¨") |
| | | private String deviceName; |
| | | |
| | | @Schema(description = "ééæ°é", example = "1234") |
| | | private Long totalQuantity; |
| | | |
| | | @Schema(description = "ééï¼gï¼", example = "123456.70") |
| | | private BigDecimal totalWeight; |
| | | |
| | | @Schema(description = "è®°å½æ¡æ°", example = "25") |
| | | private Long recordCount; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import java.time.LocalDateTime; |
| | | |
| | | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| | | |
| | | @Schema(description = "管çåå° - MES æ°æ®ééç»è®¡ Request VO") |
| | | @Data |
| | | public class MesDcStatisticsReqVO { |
| | | |
| | | @Schema(description = "å¼å§ééæ¶é´ï¼å«ï¼ï¼ä¸ä¼ åä¸é", example = "2026-11-01 00:00:00") |
| | | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| | | private LocalDateTime beginTime; |
| | | |
| | | @Schema(description = "ç»æééæ¶é´ï¼å«ï¼ï¼ä¸ä¼ åä¸é", example = "2026-11-10 23:59:59") |
| | | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| | | private LocalDateTime endTime; |
| | | |
| | | @Schema(description = "éé设å¤ID", example = "1024") |
| | | private Long deviceId; |
| | | |
| | | @Schema(description = "ç产工åID", example = "2048") |
| | | private Long workOrderId; |
| | | |
| | | @Schema(description = "è¶å¿ç²åº¦ï¼day æå¤© / hour æå°æ¶ï¼é»è®¤ day", example = "day") |
| | | private String granularity; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | |
| | | import java.math.BigDecimal; |
| | | import java.util.List; |
| | | |
| | | @Schema(description = "管çåå° - MES æ°æ®ééç»è®¡æ±æ» Response VO") |
| | | @Data |
| | | public class MesDcStatisticsSummaryRespVO { |
| | | |
| | | @Schema(description = "æ»ééæ°éï¼ä¸å«å·²ä½åºè®°å½ï¼", example = "12345") |
| | | private Long totalQuantity; |
| | | |
| | | @Schema(description = "æ»ééï¼gï¼ä¸å«å·²ä½åºè®°å½ï¼", example = "1234567.80") |
| | | private BigDecimal totalWeight; |
| | | |
| | | @Schema(description = "è®°å½æ¡æ°ï¼ä¸å«å·²ä½åºè®°å½ï¼", example = "120") |
| | | private Long recordCount; |
| | | |
| | | @Schema(description = "åä¸ç»è®¡çè®¾å¤æ°", example = "3") |
| | | private Integer deviceCount; |
| | | |
| | | @Schema(description = "æè®¾å¤åç»çç»è®¡") |
| | | private List<MesDcStatisticsDeviceItemVO> devices; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo; |
| | | |
| | | import io.swagger.v3.oas.annotations.media.Schema; |
| | | import lombok.Data; |
| | | |
| | | import java.math.BigDecimal; |
| | | |
| | | @Schema(description = "管çåå° - MES æ°æ®ééè¶å¿é¡¹ VO") |
| | | @Data |
| | | public class MesDcStatisticsTrendItemVO { |
| | | |
| | | @Schema(description = "æ¶é´æ®µï¼æå¤©ä¸º yyyy-MM-ddï¼æå°æ¶ä¸º yyyy-MM-dd HH:00", example = "2026-11-10") |
| | | private String period; |
| | | |
| | | @Schema(description = "ééæ°é", example = "1234") |
| | | private Long totalQuantity; |
| | | |
| | | @Schema(description = "ééï¼gï¼", example = "123456.70") |
| | | private BigDecimal totalWeight; |
| | | |
| | | @Schema(description = "è®°å½æ¡æ°", example = "25") |
| | | private Long recordCount; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.dal.dataobject.dc.device; |
| | | |
| | | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| | | import com.baomidou.mybatisplus.annotation.KeySequence; |
| | | import com.baomidou.mybatisplus.annotation.TableId; |
| | | import com.baomidou.mybatisplus.annotation.TableName; |
| | | import lombok.*; |
| | | |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | | * MES æ°æ®ééè®¾å¤ DO |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | @TableName("mes_dc_device") |
| | | @KeySequence("mes_dc_device_seq") |
| | | @Data |
| | | @EqualsAndHashCode(callSuper = true) |
| | | @ToString(callSuper = true) |
| | | @Builder |
| | | @NoArgsConstructor |
| | | @AllArgsConstructor |
| | | public class MesDcDeviceDO extends BaseDO { |
| | | |
| | | /** |
| | | * ç¼å· |
| | | */ |
| | | @TableId |
| | | private Long id; |
| | | /** |
| | | * 设å¤ç¼å·ï¼è®¾å¤ç«¯ä¸æ¥æ¶ä½¿ç¨ï¼ |
| | | */ |
| | | private String code; |
| | | /** |
| | | * 设å¤åç§° |
| | | */ |
| | | private String name; |
| | | /** |
| | | * 设å¤ç±»å |
| | | * |
| | | * åå
¸ {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_DC_DEVICE_TYPE} |
| | | */ |
| | | private String deviceType; |
| | | /** |
| | | * 设å¤åå· |
| | | */ |
| | | private String model; |
| | | /** |
| | | * 设å¤åºåå· |
| | | */ |
| | | private String serialNo; |
| | | /** |
| | | * å®è£
ä½ç½® |
| | | */ |
| | | private String location; |
| | | /** |
| | | * 设å¤ç¶æ |
| | | * |
| | | * æä¸¾ {@link cn.iocoder.yudao.module.mes.enums.dc.MesDcDeviceStatusEnum} |
| | | */ |
| | | private Integer status; |
| | | /** |
| | | * éé令ç |
| | | */ |
| | | private String token; |
| | | /** |
| | | * å½åç»å®ç产工åç¼å· |
| | | */ |
| | | private Long workOrderId; |
| | | /** |
| | | * å½åç»å®ç产工åç¼å·ï¼åä½ï¼ |
| | | */ |
| | | private String workOrderCode; |
| | | /** |
| | | * ç»å®å·¥åæ¶é´ |
| | | */ |
| | | private LocalDateTime bindTime; |
| | | /** |
| | | * æåå¿è·³æ¶é´ |
| | | */ |
| | | private LocalDateTime lastHeartbeatTime; |
| | | /** |
| | | * æåæ°æ®ä¸æ¥æ¶é´ |
| | | */ |
| | | private LocalDateTime lastIngestTime; |
| | | /** |
| | | * åºä»¶çæ¬ |
| | | */ |
| | | private String firmwareVersion; |
| | | /** |
| | | * è®¾å¤ IP |
| | | */ |
| | | private String deviceIp; |
| | | /** |
| | | * 夿³¨ |
| | | */ |
| | | private String remark; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.dal.dataobject.dc.record; |
| | | |
| | | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| | | import com.baomidou.mybatisplus.annotation.KeySequence; |
| | | import com.baomidou.mybatisplus.annotation.TableId; |
| | | import com.baomidou.mybatisplus.annotation.TableName; |
| | | import lombok.*; |
| | | |
| | | import java.math.BigDecimal; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | | * MES æ°æ®ééè®°å½ DO |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | @TableName("mes_dc_record") |
| | | @KeySequence("mes_dc_record_seq") |
| | | @Data |
| | | @EqualsAndHashCode(callSuper = true) |
| | | @ToString(callSuper = true) |
| | | @Builder |
| | | @NoArgsConstructor |
| | | @AllArgsConstructor |
| | | public class MesDcRecordDO extends BaseDO { |
| | | |
| | | /** |
| | | * ç¼å· |
| | | */ |
| | | @TableId |
| | | private Long id; |
| | | /** |
| | | * éé设å¤ç¼å· |
| | | * |
| | | * å
³è {@link cn.iocoder.yudao.module.mes.dal.dataobject.dc.device.MesDcDeviceDO#getId()} |
| | | */ |
| | | private Long deviceId; |
| | | /** |
| | | * 设å¤ç¼å·ï¼åä½ï¼ |
| | | */ |
| | | private String deviceCode; |
| | | /** |
| | | * 设å¤åç§°ï¼åä½ï¼ |
| | | */ |
| | | private String deviceName; |
| | | /** |
| | | * ééæ¶ç»å®çç产工åç¼å· |
| | | */ |
| | | private Long workOrderId; |
| | | /** |
| | | * ç产工åç¼å·ï¼åä½ï¼ |
| | | */ |
| | | private String workOrderCode; |
| | | /** |
| | | * 产åç¼å· |
| | | */ |
| | | private Long productId; |
| | | /** |
| | | * 产åç¼ç ï¼åä½ï¼ |
| | | */ |
| | | private String productCode; |
| | | /** |
| | | * 产ååç§°ï¼åä½ï¼ |
| | | */ |
| | | private String productName; |
| | | /** |
| | | * çäº§æ¹æ¬¡å· |
| | | */ |
| | | private String batchCode; |
| | | /** |
| | | * 设å¤ä¾§è®°å½åºå· |
| | | */ |
| | | private String recordNo; |
| | | /** |
| | | * 设å¤ä¾§å¯ä¸é®ï¼ç¨äºå¹çï¼ |
| | | */ |
| | | private String bizId; |
| | | /** |
| | | * æ¬æ¬¡ééæ°é |
| | | */ |
| | | private Integer quantity; |
| | | /** |
| | | * 设å¤ç´¯è®¡æ°éï¼è®¾å¤åªæ¥ç´¯è®¡å¼æ¶ç¨äºè®¡ç®å·®å¼ï¼ |
| | | */ |
| | | private Integer totalQuantity; |
| | | /** |
| | | * æ¬æ¬¡ééï¼gï¼ |
| | | */ |
| | | private BigDecimal weight; |
| | | /** |
| | | * 设å¤ç´¯è®¡ééï¼gï¼ |
| | | */ |
| | | private BigDecimal totalWeight; |
| | | /** |
| | | * 设å¤ééæ¶é´ |
| | | */ |
| | | private LocalDateTime recordTime; |
| | | /** |
| | | * æå¡å¨æ¥æ¶æ¶é´ |
| | | */ |
| | | private LocalDateTime receiveTime; |
| | | /** |
| | | * æ¯å¦å¨çº¿å®æ¶ä¸æ¥ |
| | | */ |
| | | private Boolean online; |
| | | /** |
| | | * åå§ä¸æ¥æ¥æ |
| | | */ |
| | | private String rawData; |
| | | /** |
| | | * è®°å½ç¶æ |
| | | * |
| | | * æä¸¾ {@link cn.iocoder.yudao.module.mes.enums.dc.MesDcRecordStatusEnum} |
| | | */ |
| | | private Integer status; |
| | | /** |
| | | * æ´æ£åçåå§æ°éï¼é¦æ¬¡æ´æ£/ä½åºæ¶ççï¼ |
| | | */ |
| | | private Integer originalQuantity; |
| | | /** |
| | | * æ´æ£/ä½åºåå |
| | | */ |
| | | private String correctReason; |
| | | /** |
| | | * 夿³¨ |
| | | */ |
| | | private String remark; |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.dal.mysql.dc.device; |
| | | |
| | | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| | | import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; |
| | | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDevicePageReqVO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.device.MesDcDeviceDO; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * MES æ°æ®ééè®¾å¤ Mapper |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | @Mapper |
| | | public interface MesDcDeviceMapper extends BaseMapperX<MesDcDeviceDO> { |
| | | |
| | | default PageResult<MesDcDeviceDO> selectPage(MesDcDevicePageReqVO reqVO) { |
| | | return selectPage(reqVO, new LambdaQueryWrapperX<MesDcDeviceDO>() |
| | | .likeIfPresent(MesDcDeviceDO::getCode, reqVO.getCode()) |
| | | .likeIfPresent(MesDcDeviceDO::getName, reqVO.getName()) |
| | | .eqIfPresent(MesDcDeviceDO::getDeviceType, reqVO.getDeviceType()) |
| | | .eqIfPresent(MesDcDeviceDO::getStatus, reqVO.getStatus()) |
| | | .eqIfPresent(MesDcDeviceDO::getWorkOrderId, reqVO.getWorkOrderId()) |
| | | .likeIfPresent(MesDcDeviceDO::getWorkOrderCode, reqVO.getWorkOrderCode()) |
| | | .orderByAsc(MesDcDeviceDO::getCode) |
| | | .orderByDesc(MesDcDeviceDO::getId)); |
| | | } |
| | | |
| | | default MesDcDeviceDO selectByCode(String code) { |
| | | return selectOne(MesDcDeviceDO::getCode, code); |
| | | } |
| | | |
| | | default List<MesDcDeviceDO> selectSimpleList() { |
| | | return selectList(new LambdaQueryWrapperX<MesDcDeviceDO>() |
| | | .orderByAsc(MesDcDeviceDO::getCode)); |
| | | } |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.dal.mysql.dc.record; |
| | | |
| | | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| | | import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; |
| | | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordPageReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsReqVO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.record.MesDcRecordDO; |
| | | import cn.iocoder.yudao.module.mes.enums.dc.MesDcRecordStatusEnum; |
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | |
| | | import java.util.List; |
| | | import java.util.Map; |
| | | |
| | | /** |
| | | * MES æ°æ®ééè®°å½ Mapper |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | @Mapper |
| | | public interface MesDcRecordMapper extends BaseMapperX<MesDcRecordDO> { |
| | | |
| | | default PageResult<MesDcRecordDO> selectPage(MesDcRecordPageReqVO reqVO) { |
| | | return selectPage(reqVO, new LambdaQueryWrapperX<MesDcRecordDO>() |
| | | .eqIfPresent(MesDcRecordDO::getDeviceId, reqVO.getDeviceId()) |
| | | .likeIfPresent(MesDcRecordDO::getDeviceCode, reqVO.getDeviceCode()) |
| | | .eqIfPresent(MesDcRecordDO::getWorkOrderId, reqVO.getWorkOrderId()) |
| | | .likeIfPresent(MesDcRecordDO::getWorkOrderCode, reqVO.getWorkOrderCode()) |
| | | .eqIfPresent(MesDcRecordDO::getProductId, reqVO.getProductId()) |
| | | .eqIfPresent(MesDcRecordDO::getBatchCode, reqVO.getBatchCode()) |
| | | .eqIfPresent(MesDcRecordDO::getStatus, reqVO.getStatus()) |
| | | .betweenIfPresent(MesDcRecordDO::getRecordTime, reqVO.getRecordTime()) |
| | | .betweenIfPresent(MesDcRecordDO::getCreateTime, reqVO.getCreateTime()) |
| | | .orderByDesc(MesDcRecordDO::getRecordTime) |
| | | .orderByDesc(MesDcRecordDO::getId)); |
| | | } |
| | | |
| | | default MesDcRecordDO selectByDeviceIdAndBizId(Long deviceId, String bizId) { |
| | | return selectOne(new LambdaQueryWrapperX<MesDcRecordDO>() |
| | | .eq(MesDcRecordDO::getDeviceId, deviceId) |
| | | .eq(MesDcRecordDO::getBizId, bizId)); |
| | | } |
| | | |
| | | default MesDcRecordDO selectLastByDeviceId(Long deviceId) { |
| | | return selectOne(new LambdaQueryWrapperX<MesDcRecordDO>() |
| | | .eq(MesDcRecordDO::getDeviceId, deviceId) |
| | | .orderByDesc(MesDcRecordDO::getId) |
| | | .last("LIMIT 1")); |
| | | } |
| | | |
| | | default Long selectCountByDeviceId(Long deviceId) { |
| | | return selectCount(MesDcRecordDO::getDeviceId, deviceId); |
| | | } |
| | | |
| | | /** |
| | | * æè®¾å¤åç»ç»è®¡ééæ°éãééãè®°å½æ¡æ°ï¼ä¸å«å·²ä½åºè®°å½ï¼ |
| | | */ |
| | | default List<Map<String, Object>> selectDeviceSummary(MesDcStatisticsReqVO reqVO) { |
| | | QueryWrapper<MesDcRecordDO> wrapper = new QueryWrapper<>(); |
| | | wrapper.select("device_id AS deviceId", "device_code AS deviceCode", |
| | | "MAX(device_name) AS deviceName", |
| | | "COALESCE(SUM(quantity), 0) AS totalQuantity", |
| | | "COALESCE(SUM(weight), 0) AS totalWeight", |
| | | "COUNT(*) AS recordCount"); |
| | | appendStatisticsWhere(wrapper, reqVO); |
| | | wrapper.groupBy("device_id", "device_code"); |
| | | wrapper.orderByDesc("totalQuantity"); |
| | | return selectMaps(wrapper); |
| | | } |
| | | |
| | | /** |
| | | * ç»è®¡æ±æ»æ°éãééãè®°å½æ¡æ°ï¼ä¸å«å·²ä½åºè®°å½ï¼ |
| | | */ |
| | | default List<Map<String, Object>> selectTotals(MesDcStatisticsReqVO reqVO) { |
| | | QueryWrapper<MesDcRecordDO> wrapper = new QueryWrapper<>(); |
| | | wrapper.select("COALESCE(SUM(quantity), 0) AS totalQuantity", |
| | | "COALESCE(SUM(weight), 0) AS totalWeight", |
| | | "COUNT(*) AS recordCount"); |
| | | appendStatisticsWhere(wrapper, reqVO); |
| | | return selectMaps(wrapper); |
| | | } |
| | | |
| | | /** |
| | | * æå¤©/å°æ¶ç»è®¡ééè¶å¿ï¼ä¸å«å·²ä½åºè®°å½ï¼ |
| | | * |
| | | * @param reqVO æ¥è¯¢æ¡ä»¶ |
| | | * @param byHour æ¯å¦æå°æ¶åç» |
| | | */ |
| | | default List<Map<String, Object>> selectTrend(MesDcStatisticsReqVO reqVO, boolean byHour) { |
| | | String periodExpression = byHour |
| | | ? "DATE_FORMAT(record_time, '%Y-%m-%d %H:00')" |
| | | : "DATE_FORMAT(record_time, '%Y-%m-%d')"; |
| | | QueryWrapper<MesDcRecordDO> wrapper = new QueryWrapper<>(); |
| | | wrapper.select(periodExpression + " AS period", |
| | | "COALESCE(SUM(quantity), 0) AS totalQuantity", |
| | | "COALESCE(SUM(weight), 0) AS totalWeight", |
| | | "COUNT(*) AS recordCount"); |
| | | appendStatisticsWhere(wrapper, reqVO); |
| | | wrapper.groupBy(periodExpression); |
| | | wrapper.orderByAsc(periodExpression); |
| | | return selectMaps(wrapper); |
| | | } |
| | | |
| | | /** |
| | | * æ¼æ¥ç»è®¡æ¥è¯¢æ¡ä»¶ï¼æé¤å·²ä½åºè®°å½ï¼å¯é设å¤ãå·¥åãæ¶é´èå´ |
| | | */ |
| | | private void appendStatisticsWhere(QueryWrapper<MesDcRecordDO> wrapper, |
| | | MesDcStatisticsReqVO reqVO) { |
| | | if (reqVO == null) { |
| | | wrapper.ne("status", MesDcRecordStatusEnum.CANCELED.getStatus()); |
| | | return; |
| | | } |
| | | wrapper.ne("status", MesDcRecordStatusEnum.CANCELED.getStatus()); |
| | | if (reqVO.getDeviceId() != null) { |
| | | wrapper.eq("device_id", reqVO.getDeviceId()); |
| | | } |
| | | if (reqVO.getWorkOrderId() != null) { |
| | | wrapper.eq("work_order_id", reqVO.getWorkOrderId()); |
| | | } |
| | | if (reqVO.getBeginTime() != null) { |
| | | wrapper.ge("record_time", reqVO.getBeginTime()); |
| | | } |
| | | if (reqVO.getEndTime() != null) { |
| | | wrapper.le("record_time", reqVO.getEndTime()); |
| | | } |
| | | } |
| | | |
| | | } |
| | |
| | | String MES_DV_METERING_STATUS = "mes_dv_metering_status"; // MES 计éå¨å
·ç¶æ |
| | | String MES_DV_METERING_CHECK_RESULT = "mes_dv_metering_check_result"; // MES è®¡éæ£æµç»è®º |
| | | |
| | | // ========== æ°æ®éé (DC) ========== |
| | | String MES_DC_DEVICE_TYPE = "mes_dc_device_type"; // MES æ°æ®éé设å¤ç±»å |
| | | String MES_DC_DEVICE_STATUS = "mes_dc_device_status"; // MES æ°æ®éé设å¤ç¶æ |
| | | String MES_DC_RECORD_STATUS = "mes_dc_record_status"; // MES æ°æ®ééè®°å½ç¶æ |
| | | |
| | | // ========== æçæ¥å (CAL) ========== |
| | | String MES_CAL_HOLIDAY_TYPE = "mes_cal_holiday_type"; // MES åæç±»å |
| | | String MES_CAL_SHIFT_TYPE = "mes_cal_shift_type"; // MES è½®çæ¹å¼ |
| | |
| | | ErrorCode QC_RETENTION_SAMPLE_SALE_ORDER_AMBIGUOUS = new ErrorCode(1_040_610_011, "ç产工åã{}ãç±å¤å¼ éå®è®¢ååå¹¶ä¸åï¼{}ï¼ï¼è¯·éæ©æ¬æ¬¡çæ ·å¯¹åºçéå®è®¢å"); |
| | | ErrorCode QC_RETENTION_SAMPLE_MPS_SALE_ORDER_NOT_EXISTS = new ErrorCode(1_040_610_012, "ç产工åã{}ãç± MPS ä¸åï¼ä½ MPS è®°å½çéå®è®¢åã{}ãï¼ID={}ï¼å¨éå®è®¢åä¸ä¸åå¨ï¼æ æ³ç»è®°çæ ·ï¼è¯·å
ä¿®æ£è¯¥ MPS çéå®è®¢åä¿¡æ¯ååç»è®°"); |
| | | |
| | | // ========== MES æ°æ®éé-设å¤ï¼1-040-611-000ï¼ ========== |
| | | ErrorCode DC_DEVICE_NOT_EXISTS = new ErrorCode(1_040_611_000, "éé设å¤ä¸åå¨ï¼è¯·å·æ°é¡µé¢åéè¯"); |
| | | ErrorCode DC_DEVICE_CODE_DUPLICATE = new ErrorCode(1_040_611_001, "设å¤ç¼å·ã{}ã已被å
¶ä»è®¾å¤ä½¿ç¨ï¼è¯·æ´æ¢è®¾å¤ç¼å·åéè¯"); |
| | | ErrorCode DC_DEVICE_DISABLED = new ErrorCode(1_040_611_002, "éé设å¤ã{}ãå·²ç¦ç¨ï¼æ°æ®æªæ¥æ¶ï¼è¯·å¨ãçäº§ç®¡æ§ â æ°æ®éé â 设å¤ç®¡çãä¸å°è¯¥è®¾å¤æ¹ä¸ºå¯ç¨"); |
| | | ErrorCode DC_DEVICE_TOKEN_REQUIRED = new ErrorCode(1_040_611_003, "æªæºå¸¦éé令çï¼è¯·å¨è¯·æ±å¤´ X-Device-Tokenï¼æ URL åæ° tokenï¼ä¸æä¾è®¾å¤ä»¤ç"); |
| | | ErrorCode DC_DEVICE_CODE_MISSING = new ErrorCode(1_040_611_004, "æªæä¾è®¾å¤ç¼å·ï¼è¯·å¨æ¥æä¸å¡«å deviceCodeï¼æå¨ URL åæ° deviceCode 䏿ä¾"); |
| | | ErrorCode DC_DEVICE_CODE_NOT_EXISTS = new ErrorCode(1_040_611_005, "设å¤ç¼å·ã{}ãå°æªç»è®°ï¼è¯·å
å¨ãçäº§ç®¡æ§ â æ°æ®éé â 设å¤ç®¡çã䏿°å¢è¯¥è®¾å¤"); |
| | | ErrorCode DC_DEVICE_TOKEN_INVALID = new ErrorCode(1_040_611_006, "设å¤ã{}ãééä»¤çæ ¡éªå¤±è´¥ï¼è¯·æ ¸å¯¹è®¾å¤ç«¯é
ç½®ç令çï¼å¦ç³»ç»å·²é置令çï¼è¯·ä»¥è®¾å¤ç®¡çä¸ææ°æ¾ç¤ºç令çéæ°é
置设å¤ç«¯"); |
| | | ErrorCode DC_DEVICE_WORK_ORDER_BIND_INVALID = new ErrorCode(1_040_611_007, "ç产工åã{}ãå½åç¶æä¸ºã{}ãï¼ä¸è½ç»å®éé设å¤ï¼è¯·éæ©æªå®å·¥ãæªåæ¶çå·¥å"); |
| | | ErrorCode DC_DEVICE_DELETE_HAS_RECORD = new ErrorCode(1_040_611_008, "设å¤ã{}ãå·²æééè®°å½ï¼æ æ³å é¤ï¼å¦éåç¨ï¼è¯·å°è®¾å¤ç¶ææ¹ä¸ºãç¦ç¨ã"); |
| | | ErrorCode DC_DEVICE_WORK_ORDER_NOT_EXISTS = new ErrorCode(1_040_611_009, "ç产工åä¸å卿已å é¤ï¼è¯·éæ°éæ©æªå®å·¥ãæªåæ¶çå·¥å"); |
| | | |
| | | // ========== MES æ°æ®éé-è®°å½ï¼1-040-612-000ï¼ ========== |
| | | ErrorCode DC_RECORD_NOT_EXISTS = new ErrorCode(1_040_612_000, "ééè®°å½ä¸åå¨ï¼è¯·å·æ°é¡µé¢åéè¯"); |
| | | ErrorCode DC_RECORD_OPERATE_STATUS_INVALID = new ErrorCode(1_040_612_001, "ééè®°å½ã{}ãå½åç¶æä¸ºã{}ãï¼ä¸è½{}ï¼ä»
ãæ£å¸¸ãç¶æçè®°å½å¯æ´æ£ï¼ä»
ãæ£å¸¸/å·²æ´æ£ãç¶æçè®°å½å¯ä½åºï¼è¯·å·æ°é¡µé¢åéè¯"); |
| | | ErrorCode DC_RECORD_COUNT_REQUIRED = new ErrorCode(1_040_612_002, "䏿¥æ°éæ æï¼count ä¸ totalCount è³å°å¡«åä¸ä¸ªï¼è¯·æ£æ¥è®¾å¤ç«¯ä¸æ¥å
容"); |
| | | ErrorCode DC_RECORD_COUNT_INVALID = new ErrorCode(1_040_612_003, "䏿¥æ°éä¸è½ä¸ºè´æ°ï¼count={}ï¼totalCount={}ï¼è¯·æ£æ¥è®¾å¤ç«¯ä¸æ¥å
容"); |
| | | ErrorCode DC_RECORD_WEIGHT_INVALID = new ErrorCode(1_040_612_004, "䏿¥ééä¸è½ä¸ºè´æ°ï¼weight={}ï¼totalWeight={}ï¼è¯·æ£æ¥è®¾å¤ç«¯ä¸æ¥å
容"); |
| | | ErrorCode DC_RECORD_CORRECT_QUANTITY_INVALID = new ErrorCode(1_040_612_005, "æ´æ£åçæ°éã{}ãæ æï¼å¿
须为ä¸å°äº 0 çæ´æ°ï¼è¯·å¡«åå®é
ééæ°é"); |
| | | |
| | | // ========== MES ä»åºç®¡ç-ä»åºï¼1-040-700-000ï¼ ========== |
| | | ErrorCode WM_WAREHOUSE_NOT_EXISTS = new ErrorCode(1_040_700_000, "ä»åºä¸åå¨"); |
| | | ErrorCode WM_WAREHOUSE_CODE_DUPLICATE = new ErrorCode(1_040_700_001, "ä»åºç¼ç å·²åå¨"); |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.enums.dc; |
| | | |
| | | import cn.iocoder.yudao.framework.common.core.ArrayValuable; |
| | | import lombok.AllArgsConstructor; |
| | | import lombok.Getter; |
| | | |
| | | import java.util.Arrays; |
| | | |
| | | /** |
| | | * MES æ°æ®éé设å¤ç¶ææä¸¾ |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | @Getter |
| | | @AllArgsConstructor |
| | | public enum MesDcDeviceStatusEnum implements ArrayValuable<Integer> { |
| | | |
| | | ENABLE(0, "å¯ç¨"), |
| | | DISABLE(1, "ç¦ç¨"); |
| | | |
| | | private final Integer status; |
| | | private final String name; |
| | | |
| | | public static final Integer[] ARRAYS = Arrays.stream(values()) |
| | | .map(MesDcDeviceStatusEnum::getStatus).toArray(Integer[]::new); |
| | | |
| | | @Override |
| | | public Integer[] array() { |
| | | return ARRAYS; |
| | | } |
| | | |
| | | public static MesDcDeviceStatusEnum valueOf(Integer status) { |
| | | return Arrays.stream(values()) |
| | | .filter(item -> item.getStatus().equals(status)) |
| | | .findFirst().orElse(null); |
| | | } |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.enums.dc; |
| | | |
| | | import cn.iocoder.yudao.framework.common.core.ArrayValuable; |
| | | import lombok.AllArgsConstructor; |
| | | import lombok.Getter; |
| | | |
| | | import java.util.Arrays; |
| | | |
| | | /** |
| | | * MES æ°æ®ééè®°å½ç¶ææä¸¾ |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | @Getter |
| | | @AllArgsConstructor |
| | | public enum MesDcRecordStatusEnum implements ArrayValuable<Integer> { |
| | | |
| | | NORMAL(0, "æ£å¸¸"), |
| | | CORRECTED(1, "å·²æ´æ£"), |
| | | CANCELED(2, "å·²ä½åº"); |
| | | |
| | | private final Integer status; |
| | | private final String name; |
| | | |
| | | public static final Integer[] ARRAYS = Arrays.stream(values()) |
| | | .map(MesDcRecordStatusEnum::getStatus).toArray(Integer[]::new); |
| | | |
| | | @Override |
| | | public Integer[] array() { |
| | | return ARRAYS; |
| | | } |
| | | |
| | | public static MesDcRecordStatusEnum valueOf(Integer status) { |
| | | return Arrays.stream(values()) |
| | | .filter(item -> item.getStatus().equals(status)) |
| | | .findFirst().orElse(null); |
| | | } |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.service.dc.device; |
| | | |
| | | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDevicePageReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDeviceSaveReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcHeartbeatReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcHeartbeatRespVO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.device.MesDcDeviceDO; |
| | | import jakarta.validation.Valid; |
| | | |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * MES æ°æ®ééè®¾å¤ Service æ¥å£ |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | public interface MesDcDeviceService { |
| | | |
| | | /** |
| | | * åå»ºè®¾å¤ |
| | | * |
| | | * @param createReqVO åå»ºä¿¡æ¯ |
| | | * @return å建设å¤ï¼å«èªå¨çæçéé令çï¼ |
| | | */ |
| | | MesDcDeviceDO createDevice(@Valid MesDcDeviceSaveReqVO createReqVO); |
| | | |
| | | /** |
| | | * æ´æ°è®¾å¤ |
| | | * |
| | | * @param updateReqVO æ´æ°ä¿¡æ¯ |
| | | */ |
| | | void updateDevice(@Valid MesDcDeviceSaveReqVO updateReqVO); |
| | | |
| | | /** |
| | | * å é¤è®¾å¤ |
| | | * |
| | | * @param id ç¼å· |
| | | */ |
| | | void deleteDevice(Long id); |
| | | |
| | | /** |
| | | * è·å¾è®¾å¤ |
| | | * |
| | | * @param id ç¼å· |
| | | * @return è®¾å¤ |
| | | */ |
| | | MesDcDeviceDO getDevice(Long id); |
| | | |
| | | /** |
| | | * æ ¡éªè®¾å¤åå¨ |
| | | * |
| | | * @param id ç¼å· |
| | | * @return è®¾å¤ |
| | | */ |
| | | MesDcDeviceDO validateDeviceExists(Long id); |
| | | |
| | | /** |
| | | * è·å¾è®¾å¤å页 |
| | | * |
| | | * @param pageReqVO å页æ¥è¯¢ |
| | | * @return 设å¤å页 |
| | | */ |
| | | PageResult<MesDcDeviceDO> getDevicePage(MesDcDevicePageReqVO pageReqVO); |
| | | |
| | | /** |
| | | * è·å¾å
¨é¨è®¾å¤åè¡¨ï¼æè®¾å¤ç¼å·ååºï¼ |
| | | * |
| | | * @return 设å¤å表 |
| | | */ |
| | | List<MesDcDeviceDO> getDeviceList(); |
| | | |
| | | /** |
| | | * éç½®éé令ç |
| | | * |
| | | * @param id ç¼å· |
| | | * @return æ°ä»¤çï¼ä»
æ¬æ¬¡è¿åï¼ |
| | | */ |
| | | String resetToken(Long id); |
| | | |
| | | /** |
| | | * ç»å®ç产工å |
| | | * |
| | | * @param id 设å¤ç¼å· |
| | | * @param workOrderId ç产工åç¼å· |
| | | */ |
| | | void bindWorkOrder(Long id, Long workOrderId); |
| | | |
| | | /** |
| | | * è§£ç»ç产工å |
| | | * |
| | | * @param id 设å¤ç¼å· |
| | | */ |
| | | void unbindWorkOrder(Long id); |
| | | |
| | | /** |
| | | * æ ¡éªè®¾å¤ç¼å·ä¸éé令çï¼ä»
æ ¡éªå卿§ä¸ä»¤çï¼ä¸æ ¡éªç¦ç¨ç¶æï¼ |
| | | * |
| | | * @param deviceCode 设å¤ç¼å· |
| | | * @param token éé令ç |
| | | * @return è®¾å¤ |
| | | */ |
| | | MesDcDeviceDO validateDeviceToken(String deviceCode, String token); |
| | | |
| | | /** |
| | | * 设å¤å¿è·³ |
| | | * |
| | | * @param heartbeatReqVO å¿è·³ä¿¡æ¯ |
| | | * @param token éé令ç |
| | | * @return å¿è·³ååº |
| | | */ |
| | | MesDcHeartbeatRespVO heartbeat(MesDcHeartbeatReqVO heartbeatReqVO, String token); |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.service.dc.device; |
| | | |
| | | import cn.hutool.core.util.ObjUtil; |
| | | import cn.hutool.core.util.RandomUtil; |
| | | import cn.hutool.core.util.StrUtil; |
| | | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| | | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDevicePageReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.device.vo.MesDcDeviceSaveReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcHeartbeatReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcHeartbeatRespVO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.device.MesDcDeviceDO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; |
| | | import cn.iocoder.yudao.module.mes.dal.mysql.dc.device.MesDcDeviceMapper; |
| | | import cn.iocoder.yudao.module.mes.dal.mysql.dc.record.MesDcRecordMapper; |
| | | import cn.iocoder.yudao.module.mes.enums.dc.MesDcDeviceStatusEnum; |
| | | import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum; |
| | | import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; |
| | | import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
| | | import jakarta.annotation.Resource; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.transaction.annotation.Transactional; |
| | | import org.springframework.validation.annotation.Validated; |
| | | |
| | | import java.nio.charset.StandardCharsets; |
| | | import java.security.MessageDigest; |
| | | import java.time.LocalDateTime; |
| | | import java.util.Arrays; |
| | | import java.util.List; |
| | | |
| | | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| | | import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; |
| | | |
| | | /** |
| | | * MES æ°æ®ééè®¾å¤ Service å®ç°ç±» |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | @Service |
| | | @Validated |
| | | public class MesDcDeviceServiceImpl implements MesDcDeviceService { |
| | | |
| | | /** |
| | | * éé令çé¿åº¦ |
| | | */ |
| | | private static final int TOKEN_LENGTH = 40; |
| | | |
| | | @Resource |
| | | private MesDcDeviceMapper deviceMapper; |
| | | @Resource |
| | | private MesDcRecordMapper recordMapper; |
| | | @Resource |
| | | private MesProWorkOrderService workOrderService; |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public MesDcDeviceDO createDevice(MesDcDeviceSaveReqVO createReqVO) { |
| | | validateDeviceCodeUnique(null, createReqVO.getCode()); |
| | | MesDcDeviceDO device = BeanUtils.toBean(createReqVO, MesDcDeviceDO.class); |
| | | device.setId(null); |
| | | device.setToken(RandomUtil.randomString(TOKEN_LENGTH)); |
| | | deviceMapper.insert(device); |
| | | return device; |
| | | } |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public void updateDevice(MesDcDeviceSaveReqVO updateReqVO) { |
| | | MesDcDeviceDO oldDevice = validateDeviceExists(updateReqVO.getId()); |
| | | // 设å¤ç¼å·ååæ¶æ ¡éªå¯ä¸æ§ï¼è®¾å¤ç«¯éåæ¥ä¿®æ¹ä¸æ¥ç deviceCodeï¼ |
| | | if (StrUtil.isNotBlank(updateReqVO.getCode()) |
| | | && ObjUtil.notEqual(oldDevice.getCode(), updateReqVO.getCode())) { |
| | | validateDeviceCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); |
| | | } |
| | | MesDcDeviceDO updateObj = BeanUtils.toBean(updateReqVO, MesDcDeviceDO.class); |
| | | updateObj.setToken(null); // 令çä»
éè¿éç½®æ¥å£åæ´ |
| | | deviceMapper.updateById(updateObj); |
| | | } |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public void deleteDevice(Long id) { |
| | | MesDcDeviceDO device = validateDeviceExists(id); |
| | | Long recordCount = recordMapper.selectCountByDeviceId(id); |
| | | if (recordCount != null && recordCount > 0) { |
| | | throw exception(DC_DEVICE_DELETE_HAS_RECORD, device.getCode()); |
| | | } |
| | | deviceMapper.deleteById(id); |
| | | } |
| | | |
| | | @Override |
| | | public MesDcDeviceDO getDevice(Long id) { |
| | | return deviceMapper.selectById(id); |
| | | } |
| | | |
| | | @Override |
| | | public MesDcDeviceDO validateDeviceExists(Long id) { |
| | | MesDcDeviceDO device = deviceMapper.selectById(id); |
| | | if (device == null) { |
| | | throw exception(DC_DEVICE_NOT_EXISTS); |
| | | } |
| | | return device; |
| | | } |
| | | |
| | | @Override |
| | | public PageResult<MesDcDeviceDO> getDevicePage(MesDcDevicePageReqVO pageReqVO) { |
| | | return deviceMapper.selectPage(pageReqVO); |
| | | } |
| | | |
| | | @Override |
| | | public List<MesDcDeviceDO> getDeviceList() { |
| | | return deviceMapper.selectSimpleList(); |
| | | } |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public String resetToken(Long id) { |
| | | MesDcDeviceDO device = validateDeviceExists(id); |
| | | String token = RandomUtil.randomString(TOKEN_LENGTH); |
| | | MesDcDeviceDO updateObj = new MesDcDeviceDO(); |
| | | updateObj.setId(device.getId()); |
| | | updateObj.setToken(token); |
| | | deviceMapper.updateById(updateObj); |
| | | return token; |
| | | } |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public void bindWorkOrder(Long id, Long workOrderId) { |
| | | MesDcDeviceDO device = validateDeviceExists(id); |
| | | MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(workOrderId); |
| | | if (workOrder == null) { |
| | | throw exception(DC_DEVICE_WORK_ORDER_NOT_EXISTS); |
| | | } |
| | | // å·²å®å·¥ã已忶çå·¥åä¸è½ç»å® |
| | | if (ObjUtil.equal(workOrder.getStatus(), MesProWorkOrderStatusEnum.FINISHED.getStatus()) |
| | | || ObjUtil.equal(workOrder.getStatus(), MesProWorkOrderStatusEnum.CANCELED.getStatus())) { |
| | | throw exception(DC_DEVICE_WORK_ORDER_BIND_INVALID, workOrder.getCode(), |
| | | resolveWorkOrderStatusName(workOrder.getStatus())); |
| | | } |
| | | MesDcDeviceDO updateObj = MesDcDeviceDO.builder() |
| | | .id(device.getId()) |
| | | .workOrderId(workOrder.getId()) |
| | | .workOrderCode(workOrder.getCode()) |
| | | .bindTime(LocalDateTime.now()) |
| | | .build(); |
| | | deviceMapper.updateById(updateObj); |
| | | } |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public void unbindWorkOrder(Long id) { |
| | | MesDcDeviceDO device = validateDeviceExists(id); |
| | | deviceMapper.update(null, new LambdaUpdateWrapper<MesDcDeviceDO>() |
| | | .eq(MesDcDeviceDO::getId, device.getId()) |
| | | .set(MesDcDeviceDO::getWorkOrderId, null) |
| | | .set(MesDcDeviceDO::getWorkOrderCode, null) |
| | | .set(MesDcDeviceDO::getBindTime, null)); |
| | | } |
| | | |
| | | @Override |
| | | public MesDcDeviceDO validateDeviceToken(String deviceCode, String token) { |
| | | if (StrUtil.isBlank(deviceCode)) { |
| | | throw exception(DC_DEVICE_CODE_MISSING); |
| | | } |
| | | if (StrUtil.isBlank(token)) { |
| | | throw exception(DC_DEVICE_TOKEN_REQUIRED); |
| | | } |
| | | MesDcDeviceDO device = deviceMapper.selectByCode(deviceCode); |
| | | if (device == null) { |
| | | throw exception(DC_DEVICE_CODE_NOT_EXISTS, deviceCode); |
| | | } |
| | | if (!isTokenMatch(token, device.getToken())) { |
| | | throw exception(DC_DEVICE_TOKEN_INVALID, device.getCode()); |
| | | } |
| | | return device; |
| | | } |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public MesDcHeartbeatRespVO heartbeat(MesDcHeartbeatReqVO heartbeatReqVO, String token) { |
| | | MesDcDeviceDO device = validateDeviceToken(heartbeatReqVO.getDeviceCode(), token); |
| | | MesDcDeviceDO updateObj = new MesDcDeviceDO(); |
| | | updateObj.setId(device.getId()); |
| | | updateObj.setLastHeartbeatTime(LocalDateTime.now()); |
| | | if (StrUtil.isNotBlank(heartbeatReqVO.getFirmwareVersion())) { |
| | | updateObj.setFirmwareVersion(heartbeatReqVO.getFirmwareVersion()); |
| | | } |
| | | if (StrUtil.isNotBlank(heartbeatReqVO.getIp())) { |
| | | updateObj.setDeviceIp(heartbeatReqVO.getIp()); |
| | | } |
| | | deviceMapper.updateById(updateObj); |
| | | |
| | | MesDcHeartbeatRespVO respVO = new MesDcHeartbeatRespVO(); |
| | | respVO.setServerTime(LocalDateTime.now()); |
| | | respVO.setDeviceName(device.getName()); |
| | | respVO.setEnabled(ObjUtil.equal(device.getStatus(), MesDcDeviceStatusEnum.ENABLE.getStatus())); |
| | | respVO.setWorkOrderId(device.getWorkOrderId()); |
| | | respVO.setWorkOrderCode(device.getWorkOrderCode()); |
| | | return respVO; |
| | | } |
| | | |
| | | // ==================== ç§ææ¹æ³ ==================== |
| | | |
| | | private void validateDeviceCodeUnique(Long id, String code) { |
| | | MesDcDeviceDO device = deviceMapper.selectByCode(code); |
| | | if (device != null && ObjUtil.notEqual(device.getId(), id)) { |
| | | throw exception(DC_DEVICE_CODE_DUPLICATE, code); |
| | | } |
| | | } |
| | | |
| | | private static boolean isTokenMatch(String submittedToken, String storedToken) { |
| | | if (submittedToken == null || storedToken == null) { |
| | | return false; |
| | | } |
| | | return MessageDigest.isEqual(submittedToken.getBytes(StandardCharsets.UTF_8), |
| | | storedToken.getBytes(StandardCharsets.UTF_8)); |
| | | } |
| | | |
| | | private static String resolveWorkOrderStatusName(Integer status) { |
| | | return Arrays.stream(MesProWorkOrderStatusEnum.values()) |
| | | .filter(item -> ObjUtil.equal(item.getStatus(), status)) |
| | | .findFirst().map(MesProWorkOrderStatusEnum::getName) |
| | | .orElse("æªç¥ç¶æ(" + status + ")"); |
| | | } |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.service.dc.record; |
| | | |
| | | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcIngestReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcIngestRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordCancelReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordCorrectReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordPageReqVO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.record.MesDcRecordDO; |
| | | import jakarta.validation.Valid; |
| | | |
| | | /** |
| | | * MES æ°æ®ééè®°å½ Service æ¥å£ |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | public interface MesDcRecordService { |
| | | |
| | | /** |
| | | * æ¥æ¶è®¾å¤ä¸æ¥çééæ°æ® |
| | | * |
| | | * @param reqVO 䏿¥å
容 |
| | | * @param token éé令ç |
| | | * @param rawData åå§ä¸æ¥æ¥æï¼JSONï¼ |
| | | * @return 䏿¥ç»æ |
| | | */ |
| | | MesDcIngestRespVO ingest(@Valid MesDcIngestReqVO reqVO, String token, String rawData); |
| | | |
| | | /** |
| | | * æ´æ£ééè®°å½ |
| | | * |
| | | * @param reqVO æ´æ£ä¿¡æ¯ |
| | | */ |
| | | void correctRecord(@Valid MesDcRecordCorrectReqVO reqVO); |
| | | |
| | | /** |
| | | * ä½åºééè®°å½ |
| | | * |
| | | * @param reqVO ä½åºä¿¡æ¯ |
| | | */ |
| | | void cancelRecord(@Valid MesDcRecordCancelReqVO reqVO); |
| | | |
| | | /** |
| | | * è·å¾ééè®°å½ |
| | | * |
| | | * @param id ç¼å· |
| | | * @return ééè®°å½ |
| | | */ |
| | | MesDcRecordDO getRecord(Long id); |
| | | |
| | | /** |
| | | * è·å¾ééè®°å½å页 |
| | | * |
| | | * @param pageReqVO å页æ¥è¯¢ |
| | | * @return ééè®°å½å页 |
| | | */ |
| | | PageResult<MesDcRecordDO> getRecordPage(MesDcRecordPageReqVO pageReqVO); |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.service.dc.record; |
| | | |
| | | import cn.hutool.core.util.ObjUtil; |
| | | import cn.hutool.core.util.StrUtil; |
| | | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcIngestReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.open.vo.MesDcIngestRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordCancelReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordCorrectReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.record.vo.MesDcRecordPageReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsReqVO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.device.MesDcDeviceDO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.record.MesDcRecordDO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; |
| | | import cn.iocoder.yudao.module.mes.dal.mysql.dc.device.MesDcDeviceMapper; |
| | | import cn.iocoder.yudao.module.mes.dal.mysql.dc.record.MesDcRecordMapper; |
| | | import cn.iocoder.yudao.module.mes.enums.dc.MesDcDeviceStatusEnum; |
| | | import cn.iocoder.yudao.module.mes.enums.dc.MesDcRecordStatusEnum; |
| | | import cn.iocoder.yudao.module.mes.service.dc.device.MesDcDeviceService; |
| | | import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; |
| | | import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; |
| | | import jakarta.annotation.Resource; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.transaction.annotation.Transactional; |
| | | import org.springframework.validation.annotation.Validated; |
| | | |
| | | import java.math.BigDecimal; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | import java.util.List; |
| | | import java.util.Map; |
| | | |
| | | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| | | import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; |
| | | |
| | | /** |
| | | * MES æ°æ®ééè®°å½ Service å®ç°ç±» |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | @Service |
| | | @Validated |
| | | public class MesDcRecordServiceImpl implements MesDcRecordService { |
| | | |
| | | @Resource |
| | | private MesDcRecordMapper recordMapper; |
| | | @Resource |
| | | private MesDcDeviceMapper deviceMapper; |
| | | @Resource |
| | | private MesDcDeviceService deviceService; |
| | | @Resource |
| | | private MesProWorkOrderService workOrderService; |
| | | @Resource |
| | | private MesMdItemService itemService; |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public MesDcIngestRespVO ingest(MesDcIngestReqVO reqVO, String token, String rawData) { |
| | | // 1. æ ¡éªè®¾å¤ç¼å·ä¸ä»¤ç |
| | | MesDcDeviceDO device = deviceService.validateDeviceToken(reqVO.getDeviceCode(), token); |
| | | // 2. å¹çï¼åä¸è®¾å¤ + bizId éå¤ä¸æ¥ç´æ¥è¿åå·²æè®°å½ |
| | | if (StrUtil.isNotBlank(reqVO.getBizId())) { |
| | | MesDcRecordDO existing = recordMapper.selectByDeviceIdAndBizId(device.getId(), reqVO.getBizId()); |
| | | if (existing != null) { |
| | | return buildIngestResp(existing, device, true); |
| | | } |
| | | } |
| | | // 3. æ ¡éªä¸æ¥æ°éä¸éé |
| | | validateIngestPayload(device, reqVO); |
| | | |
| | | // 4. è®¡ç®æ¬æ¬¡æ°éï¼ä¼å
countï¼åªæç´¯è®¡å¼æ¶æä¸ä¸æ¬¡ç´¯è®¡å¼æ±å·® |
| | | int quantity = resolveQuantity(device, reqVO); |
| | | // 累计å¼éå¤ä¸æ¥ï¼è®¾å¤éè¯ä½æªå¸¦ bizIdï¼ï¼ä¸æ°å¢è®°å½ï¼æéå¤ä¸æ¥è¿å |
| | | if (reqVO.getCount() == null && reqVO.getTotalCount() != null && quantity == 0) { |
| | | MesDcRecordDO last = recordMapper.selectLastByDeviceId(device.getId()); |
| | | if (last != null) { |
| | | return buildIngestResp(last, device, true); |
| | | } |
| | | } |
| | | |
| | | // 5. ç»è£
è®°å½ï¼æªæå°ç§ï¼é¿å
æ°æ®åºæç§åèäºå
¥åè½å°ä¸ä¸æ¶å»ï¼ |
| | | LocalDateTime now = LocalDateTime.now().withNano(0); |
| | | MesDcRecordDO record = new MesDcRecordDO(); |
| | | record.setDeviceId(device.getId()); |
| | | record.setDeviceCode(device.getCode()); |
| | | record.setDeviceName(device.getName()); |
| | | record.setRecordNo(reqVO.getRecordNo()); |
| | | record.setBizId(StrUtil.emptyToNull(reqVO.getBizId())); |
| | | record.setQuantity(quantity); |
| | | record.setTotalQuantity(reqVO.getTotalCount()); |
| | | record.setWeight(reqVO.getWeight()); |
| | | record.setTotalWeight(reqVO.getTotalWeight()); |
| | | record.setRecordTime(reqVO.getRecordTime() != null ? reqVO.getRecordTime() : now); |
| | | record.setReceiveTime(now); |
| | | record.setOnline(reqVO.getOnline() == null || reqVO.getOnline()); |
| | | record.setRawData(rawData); |
| | | record.setStatus(MesDcRecordStatusEnum.NORMAL.getStatus()); |
| | | fillWorkOrderInfo(record, device); |
| | | recordMapper.insert(record); |
| | | |
| | | // 6. æ´æ°è®¾å¤æå䏿¥æ¶é´ä¸åºä»¶çæ¬ |
| | | MesDcDeviceDO updateObj = new MesDcDeviceDO(); |
| | | updateObj.setId(device.getId()); |
| | | updateObj.setLastIngestTime(now); |
| | | if (StrUtil.isNotBlank(reqVO.getFirmwareVersion())) { |
| | | updateObj.setFirmwareVersion(reqVO.getFirmwareVersion()); |
| | | } |
| | | deviceMapper.updateById(updateObj); |
| | | |
| | | return buildIngestResp(record, device, false); |
| | | } |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public void correctRecord(MesDcRecordCorrectReqVO reqVO) { |
| | | MesDcRecordDO record = validateRecordExists(reqVO.getId()); |
| | | if (!ObjUtil.equal(record.getStatus(), MesDcRecordStatusEnum.NORMAL.getStatus())) { |
| | | throw exception(DC_RECORD_OPERATE_STATUS_INVALID, record.getId(), |
| | | resolveRecordStatusName(record.getStatus()), "æ´æ£"); |
| | | } |
| | | MesDcRecordDO updateObj = new MesDcRecordDO(); |
| | | updateObj.setId(record.getId()); |
| | | updateObj.setQuantity(reqVO.getQuantity()); |
| | | updateObj.setStatus(MesDcRecordStatusEnum.CORRECTED.getStatus()); |
| | | updateObj.setCorrectReason(reqVO.getReason()); |
| | | if (record.getOriginalQuantity() == null) { |
| | | updateObj.setOriginalQuantity(record.getQuantity()); |
| | | } |
| | | recordMapper.updateById(updateObj); |
| | | } |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public void cancelRecord(MesDcRecordCancelReqVO reqVO) { |
| | | MesDcRecordDO record = validateRecordExists(reqVO.getId()); |
| | | if (ObjUtil.equal(record.getStatus(), MesDcRecordStatusEnum.CANCELED.getStatus())) { |
| | | throw exception(DC_RECORD_OPERATE_STATUS_INVALID, record.getId(), |
| | | resolveRecordStatusName(record.getStatus()), "ä½åº"); |
| | | } |
| | | MesDcRecordDO updateObj = new MesDcRecordDO(); |
| | | updateObj.setId(record.getId()); |
| | | updateObj.setStatus(MesDcRecordStatusEnum.CANCELED.getStatus()); |
| | | updateObj.setCorrectReason(reqVO.getReason()); |
| | | if (record.getOriginalQuantity() == null) { |
| | | updateObj.setOriginalQuantity(record.getQuantity()); |
| | | } |
| | | recordMapper.updateById(updateObj); |
| | | } |
| | | |
| | | @Override |
| | | public MesDcRecordDO getRecord(Long id) { |
| | | return recordMapper.selectById(id); |
| | | } |
| | | |
| | | @Override |
| | | public PageResult<MesDcRecordDO> getRecordPage(MesDcRecordPageReqVO pageReqVO) { |
| | | return recordMapper.selectPage(pageReqVO); |
| | | } |
| | | |
| | | // ==================== ç§ææ¹æ³ ==================== |
| | | |
| | | private MesDcRecordDO validateRecordExists(Long id) { |
| | | MesDcRecordDO record = recordMapper.selectById(id); |
| | | if (record == null) { |
| | | throw exception(DC_RECORD_NOT_EXISTS); |
| | | } |
| | | return record; |
| | | } |
| | | |
| | | private void validateIngestPayload(MesDcDeviceDO device, MesDcIngestReqVO reqVO) { |
| | | if (ObjUtil.equal(device.getStatus(), MesDcDeviceStatusEnum.DISABLE.getStatus())) { |
| | | throw exception(DC_DEVICE_DISABLED, device.getName() + "ï¼" + device.getCode() + "ï¼"); |
| | | } |
| | | if (reqVO.getCount() == null && reqVO.getTotalCount() == null) { |
| | | throw exception(DC_RECORD_COUNT_REQUIRED); |
| | | } |
| | | if ((reqVO.getCount() != null && reqVO.getCount() < 0) |
| | | || (reqVO.getTotalCount() != null && reqVO.getTotalCount() < 0)) { |
| | | throw exception(DC_RECORD_COUNT_INVALID, |
| | | reqVO.getCount() == null ? "æªå¡«å" : String.valueOf(reqVO.getCount()), |
| | | reqVO.getTotalCount() == null ? "æªå¡«å" : String.valueOf(reqVO.getTotalCount())); |
| | | } |
| | | if ((reqVO.getWeight() != null && reqVO.getWeight().signum() < 0) |
| | | || (reqVO.getTotalWeight() != null && reqVO.getTotalWeight().signum() < 0)) { |
| | | throw exception(DC_RECORD_WEIGHT_INVALID, |
| | | reqVO.getWeight() == null ? "æªå¡«å" : reqVO.getWeight().toPlainString(), |
| | | reqVO.getTotalWeight() == null ? "æªå¡«å" : reqVO.getTotalWeight().toPlainString()); |
| | | } |
| | | } |
| | | |
| | | /** |
| | | * è®¡ç®æ¬æ¬¡æ°éï¼ |
| | | * 1. 䏿¥ count æ¶ç´æ¥ä½¿ç¨ï¼ |
| | | * 2. åªæ totalCount æ¶ï¼ä¸ä¸ä¸æ¬¡è®°å½çç´¯è®¡å¼æ±å·®ï¼é¦æ¬¡ä¸æ¥æè®¾å¤è®¡æ°å¨æ¸
é¶æ¶ç´æ¥ä½¿ç¨ç´¯è®¡å¼ã |
| | | */ |
| | | private int resolveQuantity(MesDcDeviceDO device, MesDcIngestReqVO reqVO) { |
| | | if (reqVO.getCount() != null) { |
| | | return reqVO.getCount(); |
| | | } |
| | | MesDcRecordDO last = recordMapper.selectLastByDeviceId(device.getId()); |
| | | Integer lastTotal = last != null ? last.getTotalQuantity() : null; |
| | | if (lastTotal == null || reqVO.getTotalCount() < lastTotal) { |
| | | return reqVO.getTotalCount(); |
| | | } |
| | | return reqVO.getTotalCount() - lastTotal; |
| | | } |
| | | |
| | | private void fillWorkOrderInfo(MesDcRecordDO record, MesDcDeviceDO device) { |
| | | if (device.getWorkOrderId() == null) { |
| | | return; |
| | | } |
| | | MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(device.getWorkOrderId()); |
| | | if (workOrder == null) { |
| | | return; |
| | | } |
| | | record.setWorkOrderId(workOrder.getId()); |
| | | record.setWorkOrderCode(workOrder.getCode()); |
| | | record.setProductId(workOrder.getProductId()); |
| | | record.setBatchCode(workOrder.getBatchCode()); |
| | | if (workOrder.getProductId() != null) { |
| | | MesMdItemDO item = itemService.getItem(workOrder.getProductId()); |
| | | if (item != null) { |
| | | record.setProductCode(item.getCode()); |
| | | record.setProductName(item.getName()); |
| | | } |
| | | } |
| | | } |
| | | |
| | | private MesDcIngestRespVO buildIngestResp(MesDcRecordDO record, MesDcDeviceDO device, |
| | | boolean duplicate) { |
| | | MesDcIngestRespVO respVO = new MesDcIngestRespVO(); |
| | | respVO.setRecordId(record.getId()); |
| | | respVO.setDuplicate(duplicate); |
| | | respVO.setQuantity(record.getQuantity()); |
| | | respVO.setServerTime(LocalDateTime.now()); |
| | | // 仿¥ç´¯è®¡ï¼ä¸å«å·²ä½åºè®°å½ï¼ |
| | | MesDcStatisticsReqVO todayReqVO = new MesDcStatisticsReqVO(); |
| | | todayReqVO.setBeginTime(LocalDate.now().atStartOfDay()); |
| | | todayReqVO.setEndTime(LocalDate.now().plusDays(1).atStartOfDay()); |
| | | todayReqVO.setDeviceId(device.getId()); |
| | | List<Map<String, Object>> totals = recordMapper.selectTotals(todayReqVO); |
| | | Map<String, Object> totalRow = totals.isEmpty() ? Map.of() : totals.get(0); |
| | | respVO.setTodayQuantity(toLong(totalRow.get("totalQuantity"))); |
| | | respVO.setTodayWeight(toDecimal(totalRow.get("totalWeight"))); |
| | | return respVO; |
| | | } |
| | | |
| | | private static String resolveRecordStatusName(Integer status) { |
| | | MesDcRecordStatusEnum statusEnum = MesDcRecordStatusEnum.valueOf(status); |
| | | return statusEnum != null ? statusEnum.getName() : "æªç¥ç¶æ(" + status + ")"; |
| | | } |
| | | |
| | | private static long toLong(Object value) { |
| | | if (value == null) { |
| | | return 0L; |
| | | } |
| | | if (value instanceof Number number) { |
| | | return number.longValue(); |
| | | } |
| | | return Long.parseLong(value.toString()); |
| | | } |
| | | |
| | | private static BigDecimal toDecimal(Object value) { |
| | | if (value == null) { |
| | | return BigDecimal.ZERO; |
| | | } |
| | | if (value instanceof BigDecimal decimal) { |
| | | return decimal; |
| | | } |
| | | if (value instanceof Number number) { |
| | | return new BigDecimal(number.toString()); |
| | | } |
| | | return new BigDecimal(value.toString()); |
| | | } |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.service.dc.statistics; |
| | | |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcDeviceOverviewRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsSummaryRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsTrendItemVO; |
| | | |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * MES æ°æ®ééç»è®¡ Service æ¥å£ |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | public interface MesDcStatisticsService { |
| | | |
| | | /** |
| | | * è·å¾ééç»è®¡æ±æ»ï¼ä¸å«å·²ä½åºè®°å½ï¼ |
| | | * |
| | | * @param reqVO ç»è®¡æ¡ä»¶ |
| | | * @return ç»è®¡æ±æ» |
| | | */ |
| | | MesDcStatisticsSummaryRespVO getSummary(MesDcStatisticsReqVO reqVO); |
| | | |
| | | /** |
| | | * è·å¾ééè¶å¿ï¼ä¸å«å·²ä½åºè®°å½ï¼ |
| | | * |
| | | * @param reqVO ç»è®¡æ¡ä»¶ |
| | | * @return è¶å¿å表 |
| | | */ |
| | | List<MesDcStatisticsTrendItemVO> getTrend(MesDcStatisticsReqVO reqVO); |
| | | |
| | | /** |
| | | * è·å¾è®¾å¤å®æ¶æ¦è§ï¼å
¨é¨è®¾å¤ç仿¥ééä¸å¨çº¿ç¶æï¼ |
| | | * |
| | | * @return è®¾å¤æ¦è§å表 |
| | | */ |
| | | List<MesDcDeviceOverviewRespVO> getDeviceOverview(); |
| | | |
| | | } |
| ¶Ô±ÈÐÂÎļþ |
| | |
| | | package cn.iocoder.yudao.module.mes.service.dc.statistics; |
| | | |
| | | import cn.hutool.core.util.ObjUtil; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcDeviceOverviewRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsDeviceItemVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsReqVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsSummaryRespVO; |
| | | import cn.iocoder.yudao.module.mes.controller.admin.dc.statistics.vo.MesDcStatisticsTrendItemVO; |
| | | import cn.iocoder.yudao.module.mes.dal.dataobject.dc.device.MesDcDeviceDO; |
| | | import cn.iocoder.yudao.module.mes.dal.mysql.dc.device.MesDcDeviceMapper; |
| | | import cn.iocoder.yudao.module.mes.dal.mysql.dc.record.MesDcRecordMapper; |
| | | import cn.iocoder.yudao.module.mes.enums.dc.MesDcDeviceStatusEnum; |
| | | import jakarta.annotation.Resource; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.validation.annotation.Validated; |
| | | |
| | | import java.math.BigDecimal; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | import java.util.ArrayList; |
| | | import java.util.HashMap; |
| | | import java.util.List; |
| | | import java.util.Map; |
| | | |
| | | /** |
| | | * MES æ°æ®ééç»è®¡ Service å®ç°ç±» |
| | | * |
| | | * @author è¶
级管çå |
| | | */ |
| | | @Service |
| | | @Validated |
| | | public class MesDcStatisticsServiceImpl implements MesDcStatisticsService { |
| | | |
| | | /** |
| | | * 设å¤å¨çº¿å¤å®éå¼ï¼åéï¼ï¼è¶
è¿è¯¥æ¶é´æ å¿è·³è§ä¸ºç¦»çº¿ |
| | | */ |
| | | private static final int ONLINE_TIMEOUT_MINUTES = 5; |
| | | |
| | | @Resource |
| | | private MesDcRecordMapper recordMapper; |
| | | @Resource |
| | | private MesDcDeviceMapper deviceMapper; |
| | | |
| | | @Override |
| | | public MesDcStatisticsSummaryRespVO getSummary(MesDcStatisticsReqVO reqVO) { |
| | | MesDcStatisticsSummaryRespVO summary = new MesDcStatisticsSummaryRespVO(); |
| | | // 1. æ±æ»æ°éãééãæ¡æ° |
| | | List<Map<String, Object>> totals = recordMapper.selectTotals(reqVO); |
| | | Map<String, Object> totalRow = totals.isEmpty() ? Map.of() : totals.get(0); |
| | | summary.setTotalQuantity(toLong(totalRow.get("totalQuantity"))); |
| | | summary.setTotalWeight(toDecimal(totalRow.get("totalWeight"))); |
| | | summary.setRecordCount(toLong(totalRow.get("recordCount"))); |
| | | // 2. æè®¾å¤åç» |
| | | List<MesDcStatisticsDeviceItemVO> devices = new ArrayList<>(); |
| | | for (Map<String, Object> row : recordMapper.selectDeviceSummary(reqVO)) { |
| | | MesDcStatisticsDeviceItemVO item = new MesDcStatisticsDeviceItemVO(); |
| | | item.setDeviceId(toLong(row.get("deviceId"))); |
| | | item.setDeviceCode(toString(row.get("deviceCode"))); |
| | | item.setDeviceName(toString(row.get("deviceName"))); |
| | | item.setTotalQuantity(toLong(row.get("totalQuantity"))); |
| | | item.setTotalWeight(toDecimal(row.get("totalWeight"))); |
| | | item.setRecordCount(toLong(row.get("recordCount"))); |
| | | devices.add(item); |
| | | } |
| | | summary.setDevices(devices); |
| | | summary.setDeviceCount(devices.size()); |
| | | return summary; |
| | | } |
| | | |
| | | @Override |
| | | public List<MesDcStatisticsTrendItemVO> getTrend(MesDcStatisticsReqVO reqVO) { |
| | | boolean byHour = "hour".equalsIgnoreCase(reqVO.getGranularity()); |
| | | List<MesDcStatisticsTrendItemVO> result = new ArrayList<>(); |
| | | for (Map<String, Object> row : recordMapper.selectTrend(reqVO, byHour)) { |
| | | MesDcStatisticsTrendItemVO item = new MesDcStatisticsTrendItemVO(); |
| | | item.setPeriod(toString(row.get("period"))); |
| | | item.setTotalQuantity(toLong(row.get("totalQuantity"))); |
| | | item.setTotalWeight(toDecimal(row.get("totalWeight"))); |
| | | item.setRecordCount(toLong(row.get("recordCount"))); |
| | | result.add(item); |
| | | } |
| | | return result; |
| | | } |
| | | |
| | | @Override |
| | | public List<MesDcDeviceOverviewRespVO> getDeviceOverview() { |
| | | List<MesDcDeviceDO> devices = deviceMapper.selectSimpleList(); |
| | | // 仿¥æè®¾å¤ç»è®¡ |
| | | MesDcStatisticsReqVO todayReqVO = new MesDcStatisticsReqVO(); |
| | | todayReqVO.setBeginTime(LocalDate.now().atStartOfDay()); |
| | | todayReqVO.setEndTime(LocalDate.now().plusDays(1).atStartOfDay()); |
| | | Map<Long, Map<String, Object>> summaryByDevice = new HashMap<>(); |
| | | for (Map<String, Object> row : recordMapper.selectDeviceSummary(todayReqVO)) { |
| | | summaryByDevice.put(toLong(row.get("deviceId")), row); |
| | | } |
| | | // ç»è£
æ¦è§ |
| | | LocalDateTime onlineThreshold = LocalDateTime.now().minusMinutes(ONLINE_TIMEOUT_MINUTES); |
| | | List<MesDcDeviceOverviewRespVO> result = new ArrayList<>(devices.size()); |
| | | for (MesDcDeviceDO device : devices) { |
| | | MesDcDeviceOverviewRespVO item = new MesDcDeviceOverviewRespVO(); |
| | | item.setDeviceId(device.getId()); |
| | | item.setCode(device.getCode()); |
| | | item.setName(device.getName()); |
| | | item.setEnabled(ObjUtil.equal(device.getStatus(), MesDcDeviceStatusEnum.ENABLE.getStatus())); |
| | | item.setOnline(device.getLastHeartbeatTime() != null |
| | | && device.getLastHeartbeatTime().isAfter(onlineThreshold)); |
| | | item.setWorkOrderId(device.getWorkOrderId()); |
| | | item.setWorkOrderCode(device.getWorkOrderCode()); |
| | | Map<String, Object> row = summaryByDevice.get(device.getId()); |
| | | item.setTodayQuantity(row == null ? 0L : toLong(row.get("totalQuantity"))); |
| | | item.setTodayWeight(row == null ? BigDecimal.ZERO : toDecimal(row.get("totalWeight"))); |
| | | item.setLastIngestTime(device.getLastIngestTime()); |
| | | item.setLastHeartbeatTime(device.getLastHeartbeatTime()); |
| | | result.add(item); |
| | | } |
| | | return result; |
| | | } |
| | | |
| | | // ==================== è½¬æ¢æ¹æ³ ==================== |
| | | |
| | | private static long toLong(Object value) { |
| | | if (value == null) { |
| | | return 0L; |
| | | } |
| | | if (value instanceof Number number) { |
| | | return number.longValue(); |
| | | } |
| | | return Long.parseLong(value.toString()); |
| | | } |
| | | |
| | | private static BigDecimal toDecimal(Object value) { |
| | | if (value == null) { |
| | | return BigDecimal.ZERO; |
| | | } |
| | | if (value instanceof BigDecimal decimal) { |
| | | return decimal; |
| | | } |
| | | if (value instanceof Number number) { |
| | | return new BigDecimal(number.toString()); |
| | | } |
| | | return new BigDecimal(value.toString()); |
| | | } |
| | | |
| | | private static String toString(Object value) { |
| | | return value == null ? null : value.toString(); |
| | | } |
| | | |
| | | } |