mom-pro2-after.git

云

6 天以前 85156554438bb13930c89072ee0b7fa93192a7fe

1.联调优化采购申请到入库的整个逻辑

已添加10个文件

已修改32个文件

	docs/confirm_receipt_qc_flow.md	117 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/purchase_flow_frontend_guide.md	202 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/purchase_order_confirm_receipt.md	160 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/purchase_request_in_status.md	97 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierApi.java	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpSupplierRespDTO.java	48 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/pom.xml	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierApiImpl.java	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java	78 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java	43 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/listener/ErpPurchaseRequestStatusListener.java	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApi.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApiImpl.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeLineDO.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcCheckResultEnum.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineService.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java	83 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java	82 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wms/approval/listener/WmsInboundStatusListener.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wms/approval/listener/WmsOutboundStatusListener.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wms/approval/listener/WmsTransferStatusListener.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 docs/confirm_receipt_qc_flow.md

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,117 @@
# ç¡®è®¤æ¶è´§ä¸è´¨æ£æµç¨ - åç«¯èè°æ¹æ¡

## æ¶åé¡µé¢

- éè´è®¢ååè¡¨é¡µ
- éè´è®¢åè¯¦æé¡µ
- å°è´§éç¥ååè¡¨é¡µ
- å°è´§éç¥åè¯¦æé¡µ
- IQC æ¥ææ£éªåé¡µé¢

## ä¸å¡æµç¨ä¸æ°æ®å¸¦å¥

```
éè´ç³è¯·å®¡æ¹éè¿ â çæéè´è®¢åï¼å·²å®¡æ ¸ï¼ â ç¡®è®¤æ¶è´§
â å¤ææ¯å¦åå¨éè´¨æ£ç©æ
  âââ æ¯ â çæå°è´§éç¥åï¼å¾è´¨æ£ï¼â èªå¨åå»º IQC å â IQC æ¥æè´¨æ£
  â      âââ åæ ¼ â çå¾ææè´¨æ£å®æ
  â      âââ ç¹é â çå¾ææè´¨æ£å®æ
  â      âââ ä¸åæ ¼ï¼éè´§ï¼â ç¶æä¿æå¾è´¨æ£
  â      âââ ä¸åæ ¼ï¼æ¥åºï¼â ç¶æä¿æå¾è´¨æ£
  â      â
  â  ææéæ£ç©æè´¨æ£å®æä¸å¯å¥åºï¼åæ ¼/ç¹éï¼â å°è´§éç¥åï¼å¾å¥åºï¼
  âââ å¦ â çæå°è´§éç¥åï¼å¾å¥åºï¼
```

**åæ®µå¸¦å¥è¯´æï¼**

| æºåæ® | ç®æ åæ® | å¸¦å¥åæ®µ |
|--------|----------|----------|
| éè´è®¢å | å°è´§éç¥å | ä¾åºåãéè´è®¢åå· |
| éè´è®¢åæç» | å°è´§éç¥åè¡ | ç©æãå°è´§æ°éãè´¨æ£æ è¯(qcCheckFlag) |
| å°è´§éç¥åè¡ | IQC æ£éªå | ç©æãå°è´§æ°éãä¾åºå |

## API

| æ¹æ³ | è·¯å¾ | è¯´æ |
|------|------|------|
| POST | /erp/purchase-order/confirm-receipt | ç¡®è®¤æ¶è´§ |

**è¯·æ±åæ°ï¼**

| åæ° | ç±»å | å¿å¡« | è¯´æ |
|------|------|------|------|
| id | Long | æ¯ | éè´è®¢åç¼å· |

**ååºï¼**

```json
{
  "code": 0,
  "data": 123,  // çæçå°è´§éç¥åç¼å·
  "msg": "æä½æå"
}
```

## åæ®µå±ç¤ºè§å

### éè´è®¢åæç»æ°å¢åæ®µ

| åæ®µ | ç±»å | å±ç¤ºä½ç½® | è¯´æ |
|------|------|----------|------|
| qcCheckFlag | Boolean | åè¡¨ãè¯¦æãè¡¨å | æ¯å¦éè¦æ¥ææ£éªï¼é»è®¤ false |

### å°è´§éç¥åè¡æ°å¢åæ®µ

| åæ®µ | ç±»å | å±ç¤ºä½ç½® | è¯´æ |
|------|------|----------|------|
| iqcCheckFlag | Boolean | åè¡¨ãè¯¦æ | æ¯å¦éè¦æ¥ææ£éªï¼ä»éè´è®¢åå¸¦å¥ï¼ |
| iqcId | Long | è¯¦æ | å³èç IQC æ£éªåç¼å·ï¼èªå¨åå»ºåååï¼ |
| iqcCheckResult | Integer | åè¡¨ãè¯¦æ | è´¨æ£ç»æï¼1åæ ¼ 2ç¹é 3ä¸åæ ¼éè´§ 4ä¸åæ ¼æ¥åº |
| qualifiedQuantity | BigDecimal | åè¡¨ãè¯¦æ | åæ ¼æ°éï¼è´¨æ£å®æåååï¼ |

### å°è´§éç¥åç¶ææµè½¬

| ç¶æå¼ | ç¶æå | è¯´æ |
|--------|--------|------|
| 0 | èç¨¿ | æ°å»ºç¶æ |
| 10 | å¾è´¨æ£ | åå¨éè´¨æ£ç©æï¼çå¾ IQC å®æ |
| 20 | å¾å¥åº | æ éè´¨æ£æææè´¨æ£å®æä¸å¯å¥åº |
| 30 | å·²å®æ | å¥åºå®æ |

## ä¸å¡è§åè¯´æ

### ç¡®è®¤æ¶è´§æé®å±ç¤º

| åºæ¯ | è§å |
|------|------|
| æ¾ç¤ºæ¡ä»¶ | è®¢åç¶æ=å·²å®¡æ ¸(20) ä¸ å¥åºç¶æâ å¨é¨å¥åº(2) |
| ç¹å»å | è°ç¨ confirmReceipt æ¥å£ï¼è¿åå°è´§éç¥åç¼å· |
| æåå | æç¤º"ç¡®è®¤æ¶è´§æåï¼å·²çæå°è´§éç¥å"ï¼å·æ°åè¡¨ |

### è´¨æ£ç»æå¯¹å¥åºçå½±å

| è´¨æ£ç»æ | å¼ | æ¯å¦å¯å¥åº | è¯´æ |
|----------|-----|------------|------|
| åæ ¼ | 1 | â æ¯ | æ£å¸¸å¥åº |
| ç¹é | 2 | â æ¯ | ç¹æ®æ¹åå¥åº |
| ä¸åæ ¼éè´§ | 3 | â å¦ | éåä¾åºåï¼ä¸å¯å¥åº |
| ä¸åæ ¼æ¥åº | 4 | â å¦ | æ¥åºå¤çï¼ä¸å¯å¥åº |

### å°è´§éç¥åç¶ææ¨è¿è§å

| å½åç¶æ | æ¨è¿æ¡ä»¶ | ç®æ ç¶æ |
|----------|----------|----------|
| èç¨¿ | æäº¤æ¶åå¨éè´¨æ£è¡ | å¾è´¨æ£ |
| èç¨¿ | æäº¤æ¶æ éè´¨æ£è¡ | å¾å¥åº |
| å¾è´¨æ£ | ææéæ£è¡å®æè´¨æ£ï¼ä¸é½ä¸ºåæ ¼/ç¹é | å¾å¥åº |
| å¾è´¨æ£ | åå¨éè´§/æ¥åºç»æçè¡ | ä¿æå¾è´¨æ£ |
| å¾å¥åº | æå¨å®ææä½ | å·²å®æ |

## æ³¨æäºé¡¹

1. **èªå¨åå»º IQC å**ï¼ç¡®è®¤æ¶è´§æ¶ï¼å¦æéè´è®¢åæç»è®¾ç½®äº `qcCheckFlag=true`ï¼ç³»ç»ä¼èªå¨åå»ºå¯¹åºç IQC æ£éªåï¼æ éæå¨åå»ºã
2. **è´¨æ£ç»æåå**ï¼IQC æ£éªå®æåï¼ä¼èªå¨ååå°è´§éç¥åè¡ç `iqcCheckResult` å `qualifiedQuantity` åæ®µã
3. **é¨åæ¶è´§**ï¼ä¸ä¸ªéè´è®¢åå¯ä»¥å¤æ¬¡ç¡®è®¤æ¶è´§ï¼é¨åæ¶è´§åºæ¯ï¼ï¼æ¯æ¬¡çæç¬ç«çå°è´§éç¥åã
4. **å¥åºåææ¡ä»¶**ï¼åªæå°è´§éç¥åç¶æä¸º"å¾å¥åº"æ¶æè½æ§è¡éè´å¥åºæä½ã
5. **è´¨æ£å¤±è´¥å¤ç**ï¼å¦æè´¨æ£ç»æä¸ºéè´§ææ¥åºï¼å°è´§éç¥åç¶æä¿æ"å¾è´¨æ£"ï¼éè¦äººå·¥ä»å¥å¤çï¼å¦éæ°å®ææ¶è´§ï¼ã

 docs/purchase_flow_frontend_guide.md

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,202 @@
# éè´æµç¨åç«¯èè°æ¹æ¡

## æ¶åé¡µé¢

- éè´è®¢ååè¡¨é¡µ
- éè´è®¢åè¯¦æé¡µ
- å°è´§éç¥ååè¡¨é¡µ
- å°è´§éç¥åè¯¦æé¡µ

## ä¸å¡æµç¨

```
éè´ç³è¯·å®¡æ¹éè¿ â èªå¨çæéè´è®¢å(å·²å®¡æ ¸)
    â ç¹å»"ç¡®è®¤æ¶è´§" â çæå°è´§éç¥å(å¾å¥åº/å¾è´¨æ£)
    â IQCè´¨æ£(å¦éè¦) â éè´å¥åº
```

---

## ä¸ãéè´è®¢åæ¨¡å

### 1. æ°å¢æé®ï¼ç¡®è®¤æ¶è´§

**ä½ç½®ï¼** éè´è®¢ååè¡¨é¡µãè¯¦æé¡µ

**å±ç¤ºæ¡ä»¶ï¼**
- è®¢åç¶æ = å·²å®¡æ ¸(20)
- å¥åºç¶æ â  å¨é¨å¥åº(2)

**APIï¼**

| æ¹æ³ | è·¯å¾ | è¯´æ |
|------|------|------|
| POST | /erp/purchase-order/confirm-receipt | ç¡®è®¤æ¶è´§ |

**è¯·æ±åæ°ï¼**

| åæ° | ç±»å | å¿å¡« | è¯´æ |
|------|------|------|------|
| id | Long | æ¯ | éè´è®¢åç¼å· |

**ååºï¼**

```json
{
  "code": 0,
  "data": 123,  // çæçå°è´§éç¥åç¼å·
  "msg": "æä½æå"
}
```

### 2. æ°å¢åæ®µï¼éè´è®¢åæç»

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| qcCheckFlag | Boolean | æ¯å¦éè¦æ¥ææ£éªï¼é»è®¤ false |

**å±ç¤ºä½ç½®ï¼** éè´è®¢åæç»è¡¨æ ¼

---

## äºãéè´ç³è¯·æ¨¡å

### æ°å¢åæ®µï¼éè´ç³è¯·æç»

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| qcCheckFlag | Boolean | æ¯å¦éè¦æ¥ææ£éªï¼é»è®¤ false |

**å±ç¤ºä½ç½®ï¼** éè´ç³è¯·æç»è¡¨æ ¼

### æ°å¢åæ®µï¼éè´ç³è¯·ä¸»è¡¨

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| depositPrice | BigDecimal | å®ééé¢ï¼é»è®¤ 0 |

**å±ç¤ºä½ç½®ï¼** éè´ç³è¯·è¡¨å

---

## ä¸ãå°è´§éç¥åæ¨¡å

### 1. ç¶ææµè½¬è¯´æ

| ç¶æå¼ | ç¶æå | è¯´æ |
|--------|--------|------|
| 0 | èç¨¿ | æ°å»ºç¶æ |
| 2 | å¾è´¨æ£ | åå¨éè´¨æ£ç©æï¼çå¾ IQC å®æ |
| 3 | å¾å¥åº | æ éè´¨æ£æææè´¨æ£å®æä¸å¯å¥åº |
| 4 | å·²å®æ | å¥åºå®æ |

### 2. æ°å¢åæ®µï¼å°è´§éç¥åè¡

| åæ®µ | ç±»å | å±ç¤ºä½ç½® | è¯´æ |
|------|------|----------|------|
| iqcCheckFlag | Boolean | åè¡¨ãè¯¦æ | æ¯å¦éè¦æ¥ææ£éª |
| iqcId | Long | è¯¦æ | å³èç IQC æ£éªåç¼å· |
| iqcCheckResult | Integer | åè¡¨ãè¯¦æ | è´¨æ£ç»æ |
| qualifiedQuantity | BigDecimal | åè¡¨ãè¯¦æ | åæ ¼æ°é |

### 3. è´¨æ£ç»ææä¸¾

| å¼ | åç§° | æ¯å¦å¯å¥åº |
|-----|------|------------|
| 1 | åæ ¼ | â æ¯ |
| 2 | ç¹é | â æ¯ |
| 3 | ä¸åæ ¼éè´§ | â å¦ |
| 4 | ä¸åæ ¼æ¥åº | â å¦ |

### 4. æ°å¢æ¥å£ï¼æ ¹æ®éè´è®¢åçæå°è´§éç¥å

| æ¹æ³ | è·¯å¾ | è¯´æ |
|------|------|------|
| POST | /mes/wm/arrival-notice/generate-from-purchase-order | æ ¹æ®éè´è®¢åçæå°è´§éç¥å |

**è¯·æ±åæ°ï¼**

| åæ° | ç±»å | å¿å¡« | è¯´æ |
|------|------|------|------|
| purchaseOrderId | Long | æ¯ | éè´è®¢åç¼å· |

**ååºï¼**

```json
{
  "code": 0,
  "data": 123,  // çæçå°è´§éç¥åç¼å·
  "msg": "æä½æå"
}
```

---

## åãåæ®µå¸¦å¥è¯´æ

### æ°æ®æµè½¬æ å°

| æºåæ® | ç®æ åæ® | å¸¦å¥åæ®µ |
|--------|----------|----------|
| éè´ç³è¯·æç» | éè´è®¢åæç» | qcCheckFlagï¼è´¨æ£æ è¯ï¼ |
| éè´ç³è¯·ä¸»è¡¨ | éè´è®¢åä¸»è¡¨ | depositPriceï¼å®ééé¢ï¼ |
| éè´è®¢å | å°è´§éç¥å | ä¾åºåãéè´è®¢åå· |
| éè´è®¢åæç» | å°è´§éç¥åè¡ | ç©æãå°è´§æ°éãqcCheckFlag |
| å°è´§éç¥åè¡ | IQC æ£éªå | ç©æãå°è´§æ°éãä¾åºå |

---

## äºãæé®å±ç¤ºè§åæ±æ»

### éè´è®¢ååè¡¨/è¯¦æé¡µ

| æé® | æ¾ç¤ºæ¡ä»¶ |
|------|----------|
| ç¡®è®¤æ¶è´§ | è®¢åç¶æ=å·²å®¡æ ¸(20) ä¸ å¥åºç¶æâ å¨é¨å¥åº(2) |

### éè´ç³è¯·æç»è¡¨æ ¼

| å | è¯´æ |
|----|------|
| æ¯å¦è´¨æ£ | å¼å³ç»ä»¶ï¼é»è®¤å³é |

### éè´è®¢åæç»è¡¨æ ¼

| å | è¯´æ |
|----|------|
| æ¯å¦è´¨æ£ | åªè¯»å±ç¤ºï¼ä»éè´ç³è¯·å¸¦å¥ |

### å°è´§éç¥åè¡è¡¨æ ¼

| å | è¯´æ |
|----|------|
| è´¨æ£æ è¯ | åªè¯»å±ç¤º |
| è´¨æ£ç»æ | åªè¯»å±ç¤ºï¼è´¨æ£å®æååå |
| åæ ¼æ°é | åªè¯»å±ç¤ºï¼è´¨æ£å®æååå |

---

## åãæ³¨æäºé¡¹

1. **ç¡®è®¤æ¶è´§æåå**ï¼è¿åå°è´§éç¥åç¼å·ï¼åç«¯å¯æç¤ºå¹¶å·æ°åè¡¨ï¼æè·³è½¬å°è´§éç¥åè¯¦æ
2. **ä¸ä¸ªéè´è®¢åå¯å¤æ¬¡ç¡®è®¤æ¶è´§**ï¼æ¯æé¨åæ¶è´§åºæ¯ï¼æ¯æ¬¡çæç¬ç«çå°è´§éç¥å
3. **è´¨æ£èªå¨åå»º**ï¼ç¡®è®¤æ¶è´§æ¶ï¼ç³»ç»èªå¨åå»º IQC æ£éªåï¼æ éæå¨åå»º
4. **å¥åºåææ¡ä»¶**ï¼åªæå°è´§éç¥åç¶æä¸º"å¾å¥åº"æ¶æè½æ§è¡éè´å¥åº
5. **è´¨æ£å¤±è´¥å¤ç**ï¼å¦æè´¨æ£ç»æä¸ºéè´§ææ¥åºï¼å°è´§éç¥åç¶æä¿æ"å¾è´¨æ£"ï¼éäººå·¥å¤ç

---

## ä¸ãæééç½®

| æéæ è¯ | è¯´æ |
|----------|------|
| erp:purchase-order:confirm-receipt | ç¡®è®¤æ¶è´§æé |

---

## å«ãAPI æ±æ»

| æ¨¡å | æ¹æ³ | è·¯å¾ | è¯´æ |
|------|------|------|------|
| éè´è®¢å | POST | /erp/purchase-order/confirm-receipt | ç¡®è®¤æ¶è´§ |
| å°è´§éç¥å | POST | /mes/wm/arrival-notice/generate-from-purchase-order | æ ¹æ®éè´è®¢åçæ |

 docs/purchase_order_confirm_receipt.md

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,160 @@
# éè´è®¢åç¡®è®¤æ¶è´§ - åç«¯èè°æ¹æ¡

## æ¶åé¡µé¢

- éè´è®¢ååè¡¨é¡µ
- éè´è®¢åè¯¦æé¡µ

## ä¸å¡æµç¨

```
éè´ç³è¯·å®¡æ¹éè¿ â çæéè´è®¢å(å·²å®¡æ ¸) â ç¡®è®¤æ¶è´§ â çæå°è´§éç¥å(å¾å¥åº/å¾è´¨æ£) â æ§è¡å¥åº
```

**ç¡®è®¤æ¶è´§åçèªå¨å¤çï¼**
- å¦æéè´è®¢åæç»è®¾ç½®äº `qcCheckFlag=true`ï¼éè¦è´¨æ£ï¼ï¼å°è´§éç¥åèªå¨è¿å¥"å¾è´¨æ£"ç¶æï¼å¹¶åå»º IQC æ£éªå
- å¦æéè´è®¢åæç»è®¾ç½®äº `qcCheckFlag=false`ï¼æ éè´¨æ£ï¼ï¼å°è´§éç¥åç´æ¥è¿å¥"å¾å¥åº"ç¶æ

## æ°å¢ API

| æ¹æ³ | è·¯å¾ | è¯´æ |
|------|------|------|
| POST | /erp/purchase-order/confirm-receipt | ç¡®è®¤æ¶è´§ |

**è¯·æ±åæ°ï¼**

| åæ° | ç±»å | å¿å¡« | è¯´æ |
|------|------|------|------|
| id | Long | æ¯ | éè´è®¢åç¼å· |

**ååºï¼**

```json
{
  "code": 0,
  "data": 123,  // çæçå°è´§éç¥åç¼å·
  "msg": "æä½æå"
}
```

**ä¸å¡è§åï¼**
- åªæå·²å®¡æ ¸ç¶æçéè´è®¢åæè½ç¡®è®¤æ¶è´§
- å·²å¨é¨å¥åºçéè´è®¢åä¸è½ç¡®è®¤æ¶è´§
- ç¡®è®¤æ¶è´§åè¿åçæçå°è´§éç¥åç¼å·ï¼åç«¯å¯è·³è½¬å°è´§éç¥åè¯¦æ

## åæ®µåæ´

### éè´ç³è¯·æç»æ°å¢åæ®µ

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| qcCheckFlag | Boolean | æ¯å¦éè¦æ¥ææ£éªï¼é»è®¤ false |

### éè´è®¢åæç»æ°å¢åæ®µ

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| qcCheckFlag | Boolean | æ¯å¦éè¦æ¥ææ£éªï¼ä»éè´ç³è¯·å¸¦å¥ |

### éè´ç³è¯·æ°å¢åæ®µ

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| depositPrice | BigDecimal | å®ééé¢ï¼é»è®¤ 0 |

### éè´è®¢åæ°å¢åæ®µ

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| depositPrice | BigDecimal | å®ééé¢ï¼ä»éè´ç³è¯·å¸¦å¥ |

## æé®å±ç¤ºè§å

### éè´è®¢ååè¡¨/è¯¦æé¡µ

| æé® | æ¾ç¤ºæ¡ä»¶ |
|------|----------|
| ç¡®è®¤æ¶è´§ | è®¢åç¶æ=å·²å®¡æ ¸(20) ä¸ å¥åºç¶æâ å¨é¨å¥åº(2) |

## åç«¯ä¿®æ¹ç¹

### 1. éè´è®¢ååè¡¨é¡µ - æ·»å ç¡®è®¤æ¶è´§æé®

```html
<el-button 
  type="success" 
  v-if="scope.row.status === 20 && scope.row.inStatus !== 2" 
  @click="handleConfirmReceipt(scope.row)"
  v-hasPermi="['erp:purchase-order:confirm-receipt']">
  ç¡®è®¤æ¶è´§
</el-button>
```

### 2. æ¹æ³å®ç°

```js
// ç¡®è®¤æ¶è´§
async handleConfirmReceipt(row) {
  try {
    await this.$modal.confirm(`ç¡®è®¤å¯¹éè´è®¢åã${row.no}ãè¿è¡æ¶è´§æä½ï¼`);
    const res = await confirmReceipt(row.id);
    this.$modal.msgSuccess('ç¡®è®¤æ¶è´§æåï¼å·²çæå°è´§éç¥å');
    // å¯éï¼è·³è½¬å°è´§éç¥åè¯¦æ
    // this.$router.push({ path: '/mes/wm/arrival-notice/detail', query: { id: res.data } });
    this.getList();
  } catch (e) {
    // åæ¶æå¤±è´¥
  }
}
```

### 3. API æ¥å£

```js
// api/erp/purchase/order.js
export function confirmReceipt(id) {
  return request({
    url: '/erp/purchase-order/confirm-receipt',
    method: 'post',
    params: { id }
  })
}
```

### 4. éè´ç³è¯·è¡¨å - æ·»å è´¨æ£æ è¯åæ®µ

å¨éè´ç³è¯·æç»è¡¨æ ¼ä¸æ·»å "æ¯å¦è´¨æ£"åï¼

```html
<el-table-column label="æ¯å¦è´¨æ£" prop="qcCheckFlag" width="100">
  <template #default="scope">
    <el-switch v-model="scope.row.qcCheckFlag" />
  </template>
</el-table-column>
```

### 5. éè´ç³è¯·è¡¨å - æ·»å å®éåæ®µ

```html
<el-form-item label="å®ééé¢" prop="depositPrice">
  <el-input-number 
    v-model="form.depositPrice" 
    :min="0" 
    :precision="2" 
    :controls="false"
    placeholder="è¯·è¾å¥å®ééé¢" />
</el-form-item>
```

## æééç½®

| æéæ è¯ | è¯´æ |
|----------|------|
| erp:purchase-order:confirm-receipt | ç¡®è®¤æ¶è´§æé |

## æ³¨æäºé¡¹

1. ç¡®è®¤æ¶è´§æä½ä¼èªå¨çæå°è´§éç¥åï¼æ éæå¨åå»º
2. è´¨æ£æ è¯ä»éè´ç³è¯· â éè´è®¢å â å°è´§éç¥åå¨ç¨ä¼ é
3. å®ééé¢ä»éè´ç³è¯·èªå¨å¸¦å¥éè´è®¢å
4. ä¸ä¸ªéè´è®¢åå¯ä»¥å¤æ¬¡ç¡®è®¤æ¶è´§ï¼é¨åæ¶è´§åºæ¯ï¼

 docs/purchase_request_in_status.md

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,97 @@
# éè´å¥åºç¶æåå - åç«¯èè°æ¹æ¡

## æ¶åé¡µé¢

- éè´ç³è¯·åè¡¨é¡µ
- éè´ç³è¯·è¯¦æé¡µ
- éè´è®¢ååè¡¨é¡µ
- éè´è®¢åè¯¦æé¡µ

## ä¸å¡æµç¨ä¸æ°æ®å¸¦å¥

```
éè´ç³è¯·å®¡æ¹éè¿ â çæéè´è®¢å(å·²å®¡æ ¸) â ç¡®è®¤æ¶è´§ â çæå°è´§éç¥å(å¾å¥åº) â æ§è¡å¥åº
       â                    â                                           â
   order_id/order_no   request_item_id å³è                         in_status åå
```

**ç¶æååæµç¨ï¼**
1. å¥åºåå®æ â ååéè´è®¢åæç»å¥åºæ°éï¼in_countï¼
2. å¥åºåå®æ â ååéè´è®¢åå¥åºç¶æï¼in_statusï¼
3. å¥åºåå®æ â ååéè´ç³è¯·æç»å¥åºæ°éï¼in_countï¼
4. å¥åºåå®æ â ååéè´ç³è¯·å¥åºç¶æï¼in_statusï¼

## åæ®µåæ´

### éè´ç³è¯·æ°å¢åæ®µ

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| inStatus | Integer | å¥åºç¶æï¼0:æªå¥åº 1:é¨åå¥åº 2:å¨é¨å¥åºï¼ |

### éè´ç³è¯·æç»æ°å¢åæ®µ

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| inCount | BigDecimal | å¥åºæ°é |

### éè´è®¢åæç»æ°å¢åæ®µ

| åæ®µ | ç±»å | è¯´æ |
|------|------|------|
| requestItemId | Long | éè´ç³è¯·æç»ç¼å·ï¼ç³»ç»èªå¨å³èï¼ |

## ååºåæ®µåæ´

### éè´ç³è¯·è¯¦æååºæ°å¢

```json
{
  "inStatus": 0
}
```

### éè´ç³è¯·æç»ååºæ°å¢

```json
{
  "items": [
    {
      "inCount": 0
    }
  ]
}
```

### éè´è®¢åè¯¦æååºæ°å¢

æ ååï¼`requestItemId` ä¸ºç³»ç»åé¨å³èï¼åç«¯æ éå±ç¤ºï¼

## åæ®µå±ç¤ºè§å

| åæ®µ | å±ç¤ºä½ç½® | è¯´æ |
|------|----------|------|
| å¥åºç¶æ | éè´ç³è¯·åè¡¨ãè¯¦æ | ä½¿ç¨æ ç¾å±ç¤ºï¼æªå¥åº/é¨åå¥åº/å¨é¨å¥åº |
| å¥åºæ°é | éè´ç³è¯·æç»è¡¨æ ¼ | æ°å¼å±ç¤ºï¼ä¿ç6ä½å°æ° |

## ä¸å¡è§åè¯´æ

| åºæ¯ | è§å |
|------|------|
| éè´ç³è¯·å¥åºç¶æ | æ ¹æ®éè´è®¢åå¥åºç¶æèªå¨æ´æ°ï¼æ éæå¨æä½ |
| éè´ç³è¯·æç»å¥åºæ°é | æ ¹æ®éè´è®¢åæç»å¥åºæ°éç´¯å æ´æ° |
| å¤æ¬¡å¥åº | æ¯æé¨åå¥åºï¼å¥åºç¶æèªå¨æµè½¬ |

## å¥åºç¶ææä¸¾

| å¼ | åç§° | é¢è²å»ºè®® |
|----|------|----------|
| 0 | æªå¥åº | infoï¼ç°è²ï¼ |
| 1 | é¨åå¥åº | warningï¼æ©è²ï¼ |
| 2 | å¨é¨å¥åº | successï¼ç»¿è²ï¼ |

## æ³¨æäºé¡¹

1. å¥åºç¶æç±ç³»ç»èªå¨ååï¼æ éæå¨ç»´æ¤
2. ä¸ä¸ªéè´ç³è¯·å¯¹åºä¸ä¸ªéè´è®¢åï¼å¥åºç¶æåæ¥
3. å¦æéè´ç³è¯·æªæå®ä¾åºåï¼å®¡æ¹éè¿åéè¦æå¨éæ©ä¾åºåçæè®¢å

 yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierApi.java

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,40 @@
package cn.iocoder.yudao.module.erp.api.purchase;

import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;

import java.util.Collection;
import java.util.List;

/**
 * ERP ä¾åºå API æ¥å£
 */
public interface ErpSupplierApi {

    String PREFIX = "/rpc-api/erp/supplier";

    /**
     * è·åä¾åºå
     *
     * @param id ä¾åºåç¼å·
     * @return ä¾åºå
     */
    CommonResult<ErpSupplierRespDTO> getSupplier(Long id);

    /**
     * æ ¡éªä¾åºååå¨
     *
     * @param id ä¾åºåç¼å·
     * @return ä¾åºå
     */
    CommonResult<ErpSupplierRespDTO> validateSupplier(Long id);

    /**
     * è·åä¾åºååè¡¨
     *
     * @param ids ç¼å·åè¡¨
     * @return ä¾åºååè¡¨
     */
    CommonResult<List<ErpSupplierRespDTO>> getSupplierList(Collection<Long> ids);

}

 yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpSupplierRespDTO.java

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,48 @@
package cn.iocoder.yudao.module.erp.api.purchase.dto;

import lombok.Data;

/**
 * ERP ä¾åºå Response DTO
 */
@Data
public class ErpSupplierRespDTO {

    /**
     * ä¾åºåç¼å·
     */
    private Long id;
    /**
     * ä¾åºååç§°
     */
    private String name;
    /**
     * èç³»äºº
     */
    private String contact;
    /**
     * ææºå·ç 
     */
    private String mobile;
    /**
     * èç³»çµè¯
     */
    private String telephone;
    /**
     * çµåé®ç®±
     */
    private String email;
    /**
     * å¼å¯ç¶æ
     */
    private Integer status;
    /**
     * çº³ç¨äººè¯å«å·
     */
    private String taxNo;
    /**
     * ç¨ç
     */
    private java.math.BigDecimal taxPercent;

}

 yudao-module-erp/pom.xml

@@ -52,6 +52,13 @@
            <version>${revision}</version>
        </dependency>

        <!-- MES å¶é æ§è¡ç³»ç» API -->
        <dependency>
            <groupId>cn.iocoder.boot</groupId>
            <artifactId>yudao-module-mes-api</artifactId>
            <version>${revision}</version>
        </dependency>

        <!-- ä¸å¡ç»ä»¶ -->

        <!-- Web ç¸å³ -->

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierApiImpl.java

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,45 @@
package cn.iocoder.yudao.module.erp.api.purchase;

import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;

import java.util.Collection;
import java.util.List;

import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

/**
 * ERP ä¾åºå API å®ç°ç±»
 */
@Service
@Validated
public class ErpSupplierApiImpl implements ErpSupplierApi {

    @Resource
    private ErpSupplierService supplierService;

    @Override
    public CommonResult<ErpSupplierRespDTO> getSupplier(Long id) {
        ErpSupplierDO supplier = supplierService.getSupplier(id);
        return success(BeanUtils.toBean(supplier, ErpSupplierRespDTO.class));
    }

    @Override
    public CommonResult<ErpSupplierRespDTO> validateSupplier(Long id) {
        ErpSupplierDO supplier = supplierService.validateSupplier(id);
        return success(BeanUtils.toBean(supplier, ErpSupplierRespDTO.class));
    }

    @Override
    public CommonResult<List<ErpSupplierRespDTO>> getSupplierList(Collection<Long> ids) {
        List<ErpSupplierDO> list = supplierService.getSupplierList(ids);
        return success(BeanUtils.toBean(list, ErpSupplierRespDTO.class));
    }

}

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java

@@ -148,6 +148,14 @@
        ExcelUtils.write(response, "éè´è®¢å.xls", "æ°æ®", ErpPurchaseOrderRespVO.class, list);
    }

    @PostMapping("/confirm-receipt")
    @Operation(summary = "ç¡®è®¤æ¶è´§")
    @Parameter(name = "id", description = "éè´è®¢åç¼å·", required = true)
    @PreAuthorize("@ss.hasPermission('erp:purchase-order:confirm-receipt')")
    public CommonResult<Long> confirmReceipt(@RequestParam("id") Long id) {
        return success(purchaseOrderService.confirmReceipt(id));
    }

    private PageResult<ErpPurchaseOrderRespVO> buildPurchaseOrderVOPageResult(PageResult<ErpPurchaseOrderDO> pageResult) {
        if (CollUtil.isEmpty(pageResult.getList())) {
            return PageResult.empty(pageResult.getTotal());

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java

@@ -43,6 +43,9 @@
    @Schema(description = "ä¾åºååç§°", example = "ä¾åºåA")
    private String supplierName;

    @Schema(description = "å®ééé¢", example = "1000.00")
    private BigDecimal depositPrice;

    @Schema(description = "åè®¡æ°é", requiredMode = Schema.RequiredMode.REQUIRED)
    private BigDecimal totalCount;

@@ -113,6 +116,9 @@
        @Schema(description = "å¤æ³¨", example = "å¤æ³¨")
        private String remark;

        @Schema(description = "æ¯å¦éè¦æ¥ææ£éª", example = "true")
        private Boolean qcCheckFlag;

    }

}

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java

@@ -30,6 +30,9 @@
    @Schema(description = "ä¼æ çï¼ç¾åæ¯", example = "10")
    private BigDecimal discountPercent;

    @Schema(description = "å®ééé¢", example = "1000.00")
    private BigDecimal depositPrice;

    @Schema(description = "éä»¶å°å", example = "https://xxx.com/xxx.pdf")
    private String fileUrl;

@@ -72,6 +75,9 @@
        @Schema(description = "å¤æ³¨", example = "å¤æ³¨")
        private String remark;

        @Schema(description = "æ¯å¦éè¦æ¥ææ£éª", example = "true")
        private Boolean qcCheckFlag;

        @Schema(description = "äº§ååç§°ï¼åç«¯å±ç¤ºç¨ï¼åç«¯å¿½ç¥ï¼", example = "äº§åA")
        private String productName;


 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java

@@ -35,6 +35,12 @@
     */
    private Long orderId;
    /**
     * éè´ç³è¯·æç»ç¼å·
     *
     * å³è {@link ErpPurchaseRequestItemDO#getId()}
     */
    private Long requestItemId;
    /**
     * ç©æç¼å·
     *
     * å³è {@link cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO#getId()}

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java

@@ -100,6 +100,11 @@
    private BigDecimal discountPrice;

    /**
     * å®ééé¢
     */
    private BigDecimal depositPrice;

    /**
     * éä»¶å°å
     */
    private String fileUrl;
@@ -124,4 +129,13 @@
     */
    private String orderNo;

    /**
     * å¥åºç¶æ
     *
     * 0: æªå¥åº
     * 1: é¨åå¥åº
     * 2: å¨é¨å¥åº
     */
    private Integer inStatus;

}

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java

@@ -78,4 +78,14 @@
     */
    private String remark;

    /**
     * æ¯å¦éè¦æ¥ææ£éª
     */
    private Boolean qcCheckFlag;

    /**
     * å¥åºæ°é
     */
    private BigDecimal inCount;

}

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java

@@ -28,6 +28,7 @@
    ErrorCode PURCHASE_ORDER_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_101_011, "éè´å®¡æ ¸åç±»ä¸åå¨ï¼è¯·åå¨BPMæ¨¡ååå»ºéè´å®¡æ ¸æµç¨åç±»");
    ErrorCode PURCHASE_ORDER_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_030_101_012, "éè´å®¡æ ¸åç±»ä¸æ²¡æå¯ç¨çæµç¨æ¨¡åï¼è¯·ååå»ºå¹¶åå¸æµç¨");
    ErrorCode PURCHASE_ORDER_SUBMIT_FAIL_STATUS = new ErrorCode(1_030_101_013, "æäº¤å®¡æ¹å¤±è´¥ï¼åªææªå®¡æ ¸ç¶æçéè´è®¢åæè½æäº¤");
    ErrorCode PURCHASE_ORDER_ALL_IN = new ErrorCode(1_030_101_014, "éè´è®¢åå·²å¨é¨å¥åºï¼æ éç¡®è®¤æ¶è´§");

    // ========== ERP éè´å¥åºï¼1-030-102-000ï¼ ==========
    ErrorCode PURCHASE_IN_NOT_EXISTS = new ErrorCode(1_030_102_000, "éè´å¥åºåä¸åå¨");

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java

@@ -160,4 +160,14 @@
     */
    void updatePurchaseOrderInStatus(Long orderId);

    /**
     * ç¡®è®¤æ¶è´§
     *
     * çæå°è´§éç¥åï¼ç¶æä¸ºå¾å¥åº
     *
     * @param id éè´è®¢åç¼å·
     * @return å°è´§éç¥åç¼å·
     */
    Long confirmReceipt(Long id);

}

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java

@@ -16,15 +16,21 @@
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.mes.api.arrivalnotice.MesArrivalNoticeApi;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -70,6 +76,15 @@
    private BpmCategoryService bpmCategoryService;
    @Resource
    private BpmProcessDefinitionService bpmProcessDefinitionService;

    @Resource
    @Lazy
    private MesArrivalNoticeApi arrivalNoticeApi;

    @Resource
    private ErpPurchaseRequestItemMapper purchaseRequestItemMapper;
    @Resource
    private ErpPurchaseRequestMapper purchaseRequestMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -436,6 +451,51 @@
        // 4. æ´æ°éè´è®¢åå¥åºç¶æ
        purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
                .setId(orderId).setInStatus(inStatus));

        // 5. ååéè´ç³è¯·æç»çå¥åºæ°éåéè´ç³è¯·çå¥åºç¶æ
        updatePurchaseRequestInStatus(items, inStatus);
    }

    /**
     * ååéè´ç³è¯·å¥åºæ°éåå¥åºç¶æ
     *
     * @param orderItems éè´è®¢åæç»åè¡¨
     * @param orderInStatus éè´è®¢åå¥åºç¶æ
     */
    private void updatePurchaseRequestInStatus(List<ErpPurchaseOrderItemDO> orderItems, int orderInStatus) {
        // è·åææå³èçéè´ç³è¯·æç» ID
        Set<Long> requestItemIds = new HashSet<>();
        for (ErpPurchaseOrderItemDO item : orderItems) {
            if (item.getRequestItemId() != null) {
                requestItemIds.add(item.getRequestItemId());
            }
        }
        if (requestItemIds.isEmpty()) {
            return;
        }

        // æ´æ°éè´ç³è¯·æç»çå¥åºæ°é
        for (ErpPurchaseOrderItemDO orderItem : orderItems) {
            if (orderItem.getRequestItemId() != null && orderItem.getInCount() != null) {
                purchaseRequestItemMapper.updateById(new ErpPurchaseRequestItemDO()
                        .setId(orderItem.getRequestItemId())
                        .setInCount(orderItem.getInCount()));
            }
        }

        // è·åéè´ç³è¯·æç»ï¼æ¾å°å¯¹åºçéè´ç³è¯· ID
        List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectBatchIds(requestItemIds);
        if (CollUtil.isEmpty(requestItems)) {
            return;
        }
        Set<Long> requestIds = convertSet(requestItems, ErpPurchaseRequestItemDO::getRequestId);

        // æ´æ°éè´ç³è¯·çå¥åºç¶æ
        for (Long requestId : requestIds) {
            purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
                    .setId(requestId)
                    .setInStatus(orderInStatus));
        }
    }

    /**
@@ -469,4 +529,22 @@
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long confirmReceipt(Long id) {
        // 1. æ ¡éªéè´è®¢ååå¨ä¸å·²å®¡æ ¸
        ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrder(id);

        // 2. æ ¡éªéè´è®¢åæªå¨é¨å¥åº
        if (ErpPurchaseOrderInStatusEnum.ALL_IN.getStatus().equals(purchaseOrder.getInStatus())) {
            throw exception(PURCHASE_ORDER_ALL_IN);
        }

        // 3. è°ç¨ MES æ¥å£çæå°è´§éç¥å
        Long arrivalNoticeId = arrivalNoticeApi.generateArrivalNoticeFromPurchaseOrder(id);
        log.info("[confirmReceipt] éè´è®¢å({}) ç¡®è®¤æ¶è´§ï¼çæå°è´§éç¥å({})", id, arrivalNoticeId);

        return arrivalNoticeId;
    }

}

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java

@@ -309,6 +309,19 @@
            purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
                    .setId(id).setStatus(newStatus));
        }

        // 3. å®¡æ¹éè¿ä¸æä¾åºåï¼èªå¨çæéè´è®¢å
        if (ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(newStatus)
                && purchaseRequest.getSupplierId() != null
                && purchaseRequest.getOrderId() == null) {
            try {
                Long orderId = doGeneratePurchaseOrder(purchaseRequest);
                log.info("[updatePurchaseRequestAuditStatus] éè´ç³è¯·({}) èªå¨çæéè´è®¢å({})", id, orderId);
            } catch (Exception e) {
                log.error("[updatePurchaseRequestAuditStatus] éè´ç³è¯·({}) èªå¨çæéè´è®¢åå¤±è´¥", id, e);
                // ä¸æåºå¼å¸¸ï¼é¿åå½±åç¶ææ´æ°
            }
        }
    }

    @Override
@@ -326,23 +339,37 @@
        // 3. æ ¡éªä¾åºå
        supplierService.validateSupplier(supplierId);

        // 4. è·åç³è¯·æç»
        // 4. è®¾ç½®ä¾åºåå¹¶çæè®¢å
        purchaseRequest.setSupplierId(supplierId);
        return doGeneratePurchaseOrder(purchaseRequest);
    }

    /**
     * æ§è¡çæéè´è®¢å
     *
     * @param purchaseRequest éè´ç³è¯·ï¼éåå« supplierIdï¼
     * @return éè´è®¢å ID
     */
    private Long doGeneratePurchaseOrder(ErpPurchaseRequestDO purchaseRequest) {
        Long id = purchaseRequest.getId();

        // 1. è·åç³è¯·æç»
        List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectListByRequestId(id);
        if (CollUtil.isEmpty(requestItems)) {
            throw exception(PURCHASE_REQUEST_NOT_EXISTS);
        }

        // 5. çæéè´è®¢åå·
        // 2. çæéè´è®¢åå·
        String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
        if (purchaseOrderMapper.selectByNo(orderNo) != null) {
            throw exception(PURCHASE_ORDER_NO_EXISTS);
        }

        // 6. åå»ºéè´è®¢å
        // 3. åå»ºéè´è®¢å
        ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
        purchaseOrder.setNo(orderNo);
        purchaseOrder.setStatus(ErpAuditStatus.APPROVE.getStatus()); // éè´è®¢åç´æ¥ä¸ºå·²å®¡æ ¸ç¶æ
        purchaseOrder.setSupplierId(supplierId);
        purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
        purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
        purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
        purchaseOrder.setTotalPrice(purchaseRequest.getTotalPrice());
@@ -350,15 +377,17 @@
        purchaseOrder.setTotalTaxPrice(purchaseRequest.getTotalTaxPrice());
        purchaseOrder.setDiscountPercent(purchaseRequest.getDiscountPercent());
        purchaseOrder.setDiscountPrice(purchaseRequest.getDiscountPrice());
        purchaseOrder.setDepositPrice(purchaseRequest.getDepositPrice() != null ? purchaseRequest.getDepositPrice() : BigDecimal.ZERO);
        purchaseOrder.setRemark(purchaseRequest.getRemark());
        purchaseOrder.setInCount(BigDecimal.ZERO);
        purchaseOrder.setInStatus(0);
        purchaseOrderMapper.insert(purchaseOrder);

        // 7. åå»ºéè´è®¢åæç»
        // 4. åå»ºéè´è®¢åæç»
        List<ErpPurchaseOrderItemDO> orderItems = convertList(requestItems, item -> {
            ErpPurchaseOrderItemDO orderItem = new ErpPurchaseOrderItemDO();
            orderItem.setOrderId(purchaseOrder.getId());
            orderItem.setRequestItemId(item.getId()); // å³èéè´ç³è¯·æç»
            orderItem.setProductId(item.getProductId());
            orderItem.setProductUnitId(item.getProductUnitId());
            orderItem.setProductPrice(item.getProductPrice());
@@ -368,12 +397,12 @@
            orderItem.setTaxPrice(item.getTaxPrice());
            orderItem.setRemark(item.getRemark());
            orderItem.setInCount(BigDecimal.ZERO);
            orderItem.setQcCheckFlag(false); // é»è®¤ä¸éè¦è´¨æ£
            orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : false);
            return orderItem;
        });
        purchaseOrderItemMapper.insertBatch(orderItems);

        // 8. æ´æ°éè´ç³è¯·çè®¢åä¿¡æ¯
        // 5. æ´æ°éè´ç³è¯·çè®¢åä¿¡æ¯
        purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
                .setId(id)
                .setOrderId(purchaseOrder.getId())

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/listener/ErpPurchaseRequestStatusListener.java

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,51 @@
package cn.iocoder.yudao.module.erp.service.purchase.listener;

import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseRequestService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

/**
 * éè´ç³è¯·å®¡æ¹ç¶æçå¬å¨
 *
 * çå¬ BPM æµç¨å®ä¾ç¶æåæ´äºä»¶ï¼æ´æ°éè´ç³è¯·çå®¡æ¹ç¶æ
 */
@Component
@Slf4j
public class ErpPurchaseRequestStatusListener extends cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener {

    /**
     * éè´ç³è¯·å®¡æ¹æµç¨å®ä¹ Key
     */
    private static final String PROCESS_DEFINITION_KEY = "purchase_request_approve";

    @Resource
    private ErpPurchaseRequestService purchaseRequestService;

    @Override
    protected String getProcessDefinitionKey() {
        return PROCESS_DEFINITION_KEY;
    }

    @Override
    protected void onEvent(BpmProcessInstanceStatusEvent event) {
        Long requestId;
        try {
            requestId = Long.parseLong(event.getBusinessKey());
        } catch (NumberFormatException e) {
            log.warn("[onEvent] businessKey({}) ä¸æ¯ææçéè´ç³è¯·ç¼å·", event.getBusinessKey());
            return;
        }

        log.info("[onEvent] æ¶å°BPMå®¡æ¹äºä»¶ï¼requestId={}, status={}", requestId, event.getStatus());

        try {
            purchaseRequestService.updatePurchaseRequestAuditStatus(requestId, event.getStatus());
            log.info("[onEvent] éè´ç³è¯·({}) å®¡æ¹ç¶ææ´æ°å®æ", requestId);
        } catch (Exception e) {
            log.error("[onEvent] æ´æ°éè´ç³è¯·å®¡æ¹ç¶æå¤±è´¥ï¼requestId={}", requestId, e);
        }
    }

}

 yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApi.java

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,16 @@
package cn.iocoder.yudao.module.mes.api.arrivalnotice;

/**
 * MES å°è´§éç¥å API æ¥å£
 */
public interface MesArrivalNoticeApi {

    /**
     * æ ¹æ®éè´è®¢åçæå°è´§éç¥åï¼å¾å¥åºç¶æï¼
     *
     * @param purchaseOrderId éè´è®¢åç¼å·
     * @return çæçå°è´§éç¥åç¼å·
     */
    Long generateArrivalNoticeFromPurchaseOrder(Long purchaseOrderId);

}

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApiImpl.java

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,21 @@
package cn.iocoder.yudao.module.mes.api.arrivalnotice;

import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;

/**
 * MES å°è´§éç¥å API å®ç°ç±»
 */
@Service
public class MesArrivalNoticeApiImpl implements MesArrivalNoticeApi {

    @Resource
    private MesWmArrivalNoticeService arrivalNoticeService;

    @Override
    public Long generateArrivalNoticeFromPurchaseOrder(Long purchaseOrderId) {
        return arrivalNoticeService.generateArrivalNoticeFromPurchaseOrder(purchaseOrderId);
    }

}

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java

@@ -11,12 +11,12 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,7 +45,7 @@
    @Resource
    private MesWmArrivalNoticeService arrivalNoticeService;
    @Resource
    private MesMdVendorService vendorService;
    private ErpSupplierApi supplierApi;
    @Resource
    private ErpPurchaseOrderApi purchaseOrderApi;

@@ -129,9 +129,10 @@
        if (CollUtil.isEmpty(list)) {
            return Collections.emptyList();
        }
        // 1. è·å¾å³èæ°æ®
        Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
                convertSet(list, MesWmArrivalNoticeDO::getVendorId));
        // 1. è·å¾ä¾åºåä¿¡æ¯ï¼ERP éè´ä¾åºåï¼
        Map<Long, ErpSupplierRespDTO> supplierMap = supplierApi.getSupplierList(
                convertSet(list, MesWmArrivalNoticeDO::getVendorId)).getCheckedData().stream()
                .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, v -> v, (a, b) -> a));
        // 2. è·å¾éè´è®¢åä¿¡æ¯
        List<Long> purchaseOrderIds = list.stream()
                .map(MesWmArrivalNoticeDO::getPurchaseOrderId)
@@ -143,8 +144,8 @@
                .collect(java.util.stream.Collectors.toMap(ErpPurchaseOrderRespDTO::getId, v -> v, (a, b) -> a));
        // 3. æå»ºç»æ
        return BeanUtils.toBean(list, MesWmArrivalNoticeRespVO.class, vo -> {
            MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor ->
                    vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()));
            MapUtils.findAndThen(supplierMap, vo.getVendorId(), supplier ->
                    vo.setVendorName(supplier.getName()));
            MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder ->
                    vo.setPurchaseOrderNo(purchaseOrder.getNo()));
        });

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java

@@ -11,14 +11,14 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -47,7 +47,7 @@
    @Resource
    private MesWmItemReceiptService itemReceiptService;
    @Resource
    private MesMdVendorService vendorService;
    private ErpSupplierApi supplierApi;
    @Resource
    private MesQcIqcService iqcService;
    @Resource
@@ -171,17 +171,18 @@
        if (CollUtil.isEmpty(list)) {
            return Collections.emptyList();
        }
        // 1. è·å¾å³èæ°æ®
        Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
                convertSet(list, MesWmItemReceiptDO::getVendorId));
        // 1. è·å¾å³èæ°æ®ï¼éè´å¥åºä½¿ç¨ ERP ä¾åºåï¼
        Map<Long, ErpSupplierRespDTO> supplierMap = supplierApi.getSupplierList(
                convertSet(list, MesWmItemReceiptDO::getVendorId)).getCheckedData().stream()
                .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, v -> v, (a, b) -> a));
        Map<Long, MesQcIqcDO> iqcMap = iqcService.getIqcMap(
                convertSet(list, MesWmItemReceiptDO::getIqcId));
        Map<Long, MesWmArrivalNoticeDO> noticeMap = arrivalNoticeService.getArrivalNoticeMap(
                convertSet(list, MesWmItemReceiptDO::getNoticeId));
        // 2. æå»ºç»æ
        return BeanUtils.toBean(list, MesWmItemReceiptRespVO.class, vo -> {
            MapUtils.findAndThen(vendorMap, vo.getVendorId(),
                    vendor -> vo.setVendorName(vendor.getName()));
            MapUtils.findAndThen(supplierMap, vo.getVendorId(),
                    supplier -> vo.setVendorName(supplier.getName()));
            MapUtils.findAndThen(iqcMap, vo.getIqcId(),
                    iqc -> vo.setIqcCode(iqc.getCode()));
            MapUtils.findAndThen(noticeMap, vo.getNoticeId(), notice ->

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeLineDO.java

@@ -64,6 +64,15 @@
     * å³è {@link MesQcIqcDO#getId()}
     */
    private Long iqcId;

    /**
     * è´¨æ£ç»æ
     *
     * æä¸¾ {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum}
     * 1-åæ ¼ 2-ç¹é 3-ä¸åæ ¼éè´§ 4-ä¸åæ ¼æ¥åº
     */
    private Integer iqcCheckResult;

    /**
     * å¤æ³¨
     */

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java

@@ -32,4 +32,8 @@
        return selectCount(MesWmArrivalNoticeDO::getVendorId, vendorId);
    }

    default MesWmArrivalNoticeDO selectByPurchaseOrderId(Long purchaseOrderId) {
        return selectOne(MesWmArrivalNoticeDO::getPurchaseOrderId, purchaseOrderId);
    }

}

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java

@@ -36,4 +36,8 @@
        return selectList(MesWmItemReceiptDO::getVendorId, vendorId);
    }

    default MesWmItemReceiptDO selectByNoticeId(Long noticeId) {
        return selectOne(MesWmItemReceiptDO::getNoticeId, noticeId);
    }

}

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java

@@ -31,6 +31,10 @@
        return selectOne(MesWmProductSalesDO::getCode, code);
    }

    default MesWmProductSalesDO selectByNoticeId(Long noticeId) {
        return selectOne(MesWmProductSalesDO::getNoticeId, noticeId);
    }

    default List<MesWmProductSalesDO> selectListByClientId(Long clientId) {
        return selectList(MesWmProductSalesDO::getClientId, clientId);
    }

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java

@@ -27,4 +27,8 @@
        return selectOne(MesWmSalesNoticeDO::getCode, code);
    }

    default MesWmSalesNoticeDO selectBySaleOrderId(Long saleOrderId) {
        return selectOne(MesWmSalesNoticeDO::getSaleOrderId, saleOrderId);
    }

}

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java

@@ -341,6 +341,7 @@
    ErrorCode QC_IQC_NOT_PREPARE = new ErrorCode(1_040_603_002, "åªæèç¨¿ç¶æçæ£éªåæå¯æä½");
    ErrorCode QC_IQC_QUANTITY_MISMATCH = new ErrorCode(1_040_603_004, "åæ ¼åä¸ä¸åæ ¼åæ°éä¹åé¡»çäºæ£æµæ°é");
    ErrorCode QC_NO_TEMPLATE = new ErrorCode(1_040_603_005, "å½åäº§åæªéç½®æ£æµæ¨¡æ¿");
    ErrorCode QC_NO_TEMPLATE_FOR_ITEM = new ErrorCode(1_040_603_008, "ç©æã{}ãæªéç½® IQC æ£æµæ¨¡æ¿ï¼è¯·åå¨è´¨éç®¡çä¸éç½®");
    ErrorCode QC_IQC_SOURCE_DOC_PARAMS_MISSING = new ErrorCode(1_040_603_006, "æ¥æºåæ®ç±»åéç©ºæ¶ï¼æ¥æºåæ® ID åæ¥æºåæ®è¡ ID ä¸è½ä¸ºç©º");
    ErrorCode QC_IQC_CHECK_RESULT_EMPTY = new ErrorCode(1_040_603_007, "å®ææ£éªååï¼æ£æµç»æå¿é¡»å¡«å");
    // ========== MES è´¨éç®¡ç-æ¥ææ£éªè¡ï¼1-040-603-100ï¼ ==========
@@ -451,6 +452,7 @@
    ErrorCode WM_ARRIVAL_NOTICE_IQC_PENDING = new ErrorCode(1_040_704_005, "åå¨å¾æ£éªè¡ï¼æ æ³å®¡æ¹éè¿");
    ErrorCode WM_ARRIVAL_NOTICE_NO_LINE = new ErrorCode(1_040_704_006, "è³å°éè¦ä¸æ¡è¡é¡¹ç®");
    ErrorCode WM_ARRIVAL_NOTICE_VENDOR_MISMATCH = new ErrorCode(1_040_704_007, "å°è´§éç¥åçä¾åºåä¸å½ååæ®ä¸ä¸è´");
    ErrorCode WM_ARRIVAL_NOTICE_ALREADY_EXISTS = new ErrorCode(1_040_704_008, "è¯¥éè´è®¢åå·²çæå°è´§éç¥åï¼ä¸è½éå¤çæ");
    ErrorCode WM_ARRIVAL_NOTICE_LINE_NOT_EXISTS = new ErrorCode(1_040_704_100, "å°è´§éç¥åè¡ä¸åå¨");
    ErrorCode WM_ARRIVAL_NOTICE_LINE_NOT_MATCH = new ErrorCode(1_040_704_101, "å°è´§éç¥åè¡ä¸å±äºæå®çå°è´§éç¥å");

@@ -462,7 +464,8 @@
    ErrorCode WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_705_004, "æç»ä¸æ¶æ»æ°ä¸è¡å¥åºæ°éä¸å¹é");
    ErrorCode WM_ITEM_RECEIPT_STATUS_ERROR = new ErrorCode(1_040_705_005, "å¥åºåç¶æä¸æ£ç¡®");
    ErrorCode WM_ITEM_RECEIPT_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_705_006, "å·²å®ææå·²åæ¶çå¥åºåä¸åè®¸åæ¶");
    ErrorCode WM_PURCHASE_ORDER_NOT_EXISTS = new ErrorCode(1_040_705_007, "éè´è®¢åä¸åå¨");
    ErrorCode WM_ITEM_RECEIPT_ALREADY_EXISTS = new ErrorCode(1_040_705_007, "è¯¥å°è´§éç¥åå·²çæå¥åºåï¼ä¸è½éå¤çæ");
    ErrorCode WM_PURCHASE_ORDER_NOT_EXISTS = new ErrorCode(1_040_705_008, "éè´è®¢åä¸åå¨");
    ErrorCode WM_PURCHASE_ORDER_NO_ITEM = new ErrorCode(1_040_705_008, "éè´è®¢åæ æç»æ°æ®");
    ErrorCode WM_ITEM_RECEIPT_LINE_NOT_EXISTS = new ErrorCode(1_040_705_100, "éè´å¥åºåè¡ä¸åå¨");
    ErrorCode WM_ITEM_RECEIPT_LINE_ARRIVAL_NOTICE_LINE_REQUIRED = new ErrorCode(1_040_705_101,
@@ -471,6 +474,7 @@
            "å¥åºåæªå³èå°è´§éç¥åï¼ä¸è½éæ©å°è´§éç¥åè¡");
    ErrorCode WM_ITEM_RECEIPT_DETAIL_NOT_EXISTS = new ErrorCode(1_040_705_200, "éè´å¥åºæç»ä¸åå¨");
    ErrorCode WM_ITEM_RECEIPT_DETAIL_QUANTITY_EXCEED = new ErrorCode(1_040_705_202, "ä¸æ¶æç»æ»æ°éä¸è½è¶è¿è¡å¥åºæ°é");
    ErrorCode WM_ITEM_RECEIPT_BATCH_REQUIRED = new ErrorCode(1_040_705_203, "ç©æã{}-{}ãå·²å¼å¯æ¹æ¬¡ç®¡çï¼ä¸æ¶æç»çæ¹æ¬¡å·ä¸è½ä¸ºç©º");

    // ========== MES ä»åºç®¡ç-é¢æç³è¯·åï¼1-040-706-000ï¼ ==========
    ErrorCode WM_MATERIAL_REQUEST_NOT_EXISTS = new ErrorCode(1_040_706_000, "é¢æç³è¯·åä¸åå¨");
@@ -635,8 +639,9 @@
    ErrorCode WM_PRODUCT_SALES_CANNOT_FINISH = new ErrorCode(1_040_714_007, "å½åç¶æä¸åè®¸æ§è¡åºåº");
    ErrorCode WM_PRODUCT_SALES_CANNOT_CANCEL = new ErrorCode(1_040_714_008, "å½åç¶æä¸åè®¸åæ¶");
    ErrorCode WM_PRODUCT_SALES_CANNOT_CONFIRM = new ErrorCode(1_040_714_009, "å½åç¶æä¸åè®¸ç¡®è®¤æ£éªéè¿");
    ErrorCode WM_PRODUCT_SALES_ALREADY_EXISTS = new ErrorCode(1_040_714_010, "è¯¥åè´§éç¥åå·²çæéå®åºåºåï¼ä¸è½éå¤çæ");
    ErrorCode WM_PRODUCT_SALES_DETAILS_EMPTY = new ErrorCode(1_040_714_020, "æ£è´§æç»ä¸è½ä¸ºç©º");
    ErrorCode WM_PRODUCT_SALES_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_714_010, "æ£è´§æ°éä¸åºåºæ°éä¸å¹é");
    ErrorCode WM_PRODUCT_SALES_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_714_011, "æ£è´§æ°éä¸åºåºæ°éä¸å¹é");
    ErrorCode WM_PRODUCT_SALES_LINE_NOT_EXISTS = new ErrorCode(1_040_714_011, "éå®åºåºåè¡ä¸åå¨");
    ErrorCode WM_PRODUCT_SALES_DETAIL_NOT_EXISTS = new ErrorCode(1_040_714_012, "éå®åºåºæç»ä¸åå¨");
    ErrorCode WM_PRODUCT_SALES_STOCK_INSUFFICIENT = new ErrorCode(1_040_714_013, "åºåä¸è¶³ï¼æ æ³æ£è´§");
@@ -690,6 +695,7 @@
    ErrorCode WM_SALES_NOTICE_LINE_NOT_MATCH = new ErrorCode(1_040_720_012, "åè´§éç¥åè¡ä¸å±äºæå®çåè´§éç¥å");
    ErrorCode WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS = new ErrorCode(1_040_720_013, "éå®è®¢åä¸åå¨");
    ErrorCode WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY = new ErrorCode(1_040_720_014, "éå®è®¢åæç»ä¸ºç©º");
    ErrorCode WM_SALES_NOTICE_ALREADY_EXISTS = new ErrorCode(1_040_720_015, "è¯¥éå®è®¢åå·²çæåè´§éç¥åï¼ä¸è½éå¤çæ");

    // ========== MES ä»åºç®¡ç-æ¡ç éç½®ï¼1-040-730-000ï¼ ==========
    ErrorCode WM_BARCODE_CONFIG_NOT_EXISTS = new ErrorCode(1_040_730_000, "æ¡ç éç½®ä¸åå¨");

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcCheckResultEnum.java

@@ -8,15 +8,15 @@

/**
 * MES æ£æµç»ææä¸¾
 *
 * @author èéæºç 
 */
@Getter
@AllArgsConstructor
public enum MesQcCheckResultEnum implements ArrayValuable<Integer> {

    PASS(1, "æ£éªéè¿"),
    FAIL(2, "æ£éªä¸éè¿");
    QUALIFIED(1, "åæ ¼"),
    SPECIAL_APPROVAL(2, "ç¹é"),
    RETURN(3, "ä¸åæ ¼éè´§"),
    SCRAP(4, "ä¸åæ ¼æ¥åº");

    public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesQcCheckResultEnum::getType).toArray(Integer[]::new);

@@ -34,4 +34,14 @@
        return ARRAYS;
    }

    /**
     * å¤ææ¯å¦å¯ä»¥å¥åº
     *
     * @param type æ£æµç»æ
     * @return true å¯ä»¥å¥åº
     */
    public static boolean canInbound(Integer type) {
        return QUALIFIED.getType().equals(type) || SPECIAL_APPROVAL.getType().equals(type);
    }

}

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java

@@ -23,6 +23,8 @@
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt.MesWmOutsourceReceiptService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -72,6 +74,13 @@
    @Resource
    private AdminUserApi adminUserApi;

    @Resource
    private MdmItemApi mdmItemApi;

    @Resource
    @Lazy
    private ErpSupplierApi supplierApi;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createIqc(MesQcIqcSaveReqVO createReqVO) {
@@ -117,9 +126,20 @@
    private void validateIqcSaveData(MesQcIqcSaveReqVO reqVO) {
        // æ ¡éªç¼å·å¯ä¸
        validateIqcCodeUnique(reqVO.getId(), reqVO.getCode());
        // æ ¡éªä¾åºåãç©æãæ£æµäººååå¨
        vendorService.validateVendorExists(reqVO.getVendorId());
        itemService.validateItemExists(reqVO.getItemId());
        // æ ¡éªä¾åºååå¨ï¼ä¼åæ ¡éª ERP ä¾åºåï¼å¤±è´¥åæ ¡éª MDM ä¾åºåï¼
        if (reqVO.getVendorId() != null) {
            try {
                supplierApi.validateSupplier(reqVO.getVendorId());
            } catch (Exception e) {
                // ERP ä¾åºåæ ¡éªå¤±è´¥ï¼å°è¯ MDM ä¾åºå
                vendorService.validateVendorExists(reqVO.getVendorId());
            }
        }
        // æ ¡éªç©æåå¨ï¼ä½¿ç¨ MDM ç©æï¼
        if (reqVO.getItemId() != null) {
            mdmItemApi.getItem(reqVO.getItemId()).getCheckedData();
        }
        // æ ¡éªæ£æµäººååå¨
        adminUserApi.validateUser(reqVO.getInspectorUserId());
    }

@@ -161,7 +181,7 @@
        // æ ¹æ®ä¸åçæ¥æºåæ®ç±»åï¼ååä¸åçåæ®
        if (Objects.equals(iqc.getSourceDocType(), MesBizTypeConstants.WM_ARRIVAL_NOTICE)) {
            arrivalNoticeService.updateArrivalNoticeWhenIqcFinish(iqc.getSourceDocId(), iqc.getSourceLineId(),
                    iqc.getId(), iqc.getQualifiedQuantity());
                    iqc.getId(), iqc.getCheckResult(), iqc.getQualifiedQuantity());
        } else if (Objects.equals(iqc.getSourceDocType(), MesBizTypeConstants.WM_OUTSOURCE_RECPT)) {
            outsourceReceiptService.updateOutsourceReceiptWhenIqcFinish(iqc.getSourceDocId(), iqc.getSourceLineId(),
                    iqc.getId(), iqc.getQualifiedQuantity(), iqc.getUnqualifiedQuantity());
@@ -313,8 +333,15 @@
    @Transactional(rollbackFor = Exception.class)
    public Long createIqcFromArrivalNotice(Long noticeId, MesWmArrivalNoticeLineDO line, String noticeCode, Long vendorId) {
        // 1. æ ¡éªç©ææ¯å¦éç½®äº IQC æ£éªæ¨¡æ¿
        MesQcTemplateItemDO templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
                line.getItemId(), MesQcTypeEnum.IQC.getType());
        MesQcTemplateItemDO templateItem;
        try {
            templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
                    line.getItemId(), MesQcTypeEnum.IQC.getType());
        } catch (Exception e) {
            // è·åç©æä¿¡æ¯ï¼æä¾æ´æç¡®çéè¯¯æç¤º
            String itemInfo = getItemInfo(line.getItemId());
            throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
        }
        Long templateId = templateItem.getTemplateId();

        // 2. çææ£éªåç¼ç 
@@ -345,4 +372,22 @@
        return iqc.getId();
    }

    /**
     * è·åç©æä¿¡æ¯ï¼ç¼ç +åç§°ï¼
     */
    private String getItemInfo(Long itemId) {
        if (itemId == null) {
            return "æªç¥ç©æ";
        }
        try {
            cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO item = mdmItemApi.getItem(itemId).getCheckedData();
            if (item != null) {
                return item.getCode() + "-" + item.getName();
            }
        } catch (Exception e) {
            // å¿½ç¥å¼å¸¸
        }
        return "ç©æID:" + itemId;
    }

}

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineService.java

@@ -72,9 +72,10 @@
     *
     * @param lineId è¡ç¼å·
     * @param iqcId IQC æ£éªåç¼å·
     * @param checkResult è´¨æ£ç»æï¼1åæ ¼ 2ç¹é 3ä¸åæ ¼éè´§ 4ä¸åæ ¼æ¥åºï¼
     * @param qualifiedQuantity åæ ¼æ°é
     */
    void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, BigDecimal qualifiedQuantity);
    void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, Integer checkResult, BigDecimal qualifiedQuantity);

    /**
     * æ ¡éªå°è´§éç¥åè¡åå¨

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java

@@ -112,12 +112,12 @@
    }

    @Override
    public void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, BigDecimal qualifiedQuantity) {
    public void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, Integer checkResult, BigDecimal qualifiedQuantity) {
        // æ ¡éªè¡åå¨
        validateArrivalNoticeLineExists(lineId);
        // æ´æ°
        // æ´æ°ï¼ç»å® iqcId + è´¨æ£ç»æ + åæ ¼æ°é
        arrivalNoticeLineMapper.updateById(new MesWmArrivalNoticeLineDO()
                .setId(lineId).setIqcId(iqcId).setQualifiedQuantity(qualifiedQuantity));
                .setId(lineId).setIqcId(iqcId).setIqcCheckResult(checkResult).setQualifiedQuantity(qualifiedQuantity));
    }

    @Override

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java

@@ -69,9 +69,10 @@
     * @param id å°è´§éç¥åç¼å·
     * @param lineId å°è´§éç¥åè¡ç¼å·
     * @param iqcId IQC æ£éªåç¼å·
     * @param checkResult è´¨æ£ç»æï¼1åæ ¼ 2ç¹é 3ä¸åæ ¼éè´§ 4ä¸åæ ¼æ¥åºï¼
     * @param qualifiedQuantity åæ ¼æ°é
     */
    void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, BigDecimal qualifiedQuantity);
    void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, Integer checkResult, BigDecimal qualifiedQuantity);

    /**
     * å®æå°è´§éç¥åï¼å¾å¥åº â å·²å®æï¼ï¼åé¨è°ç¨

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java

@@ -12,10 +12,12 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.arrivalnotice.MesWmArrivalNoticeMapper;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmArrivalNoticeStatusEnum;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderItemRespDTO;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
@@ -44,8 +46,9 @@

    @Resource
    private MesWmArrivalNoticeLineService arrivalNoticeLineService;

    @Resource
    private cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService vendorService;
    private ErpSupplierApi supplierApi;

    @Resource
    private ErpPurchaseOrderApi purchaseOrderApi;
@@ -84,8 +87,8 @@
    private void validateArrivalNoticeSaveData(MesWmArrivalNoticeSaveReqVO reqVO) {
        // æ ¡éªç¼ç å¯ä¸
        validateCodeUnique(reqVO.getId(), reqVO.getCode());
        // æ ¡éªä¾åºååå¨ä¸å¯ç¨
        vendorService.validateVendorExistsAndEnable(reqVO.getVendorId());
        // æ ¡éªä¾åºååå¨ï¼ERP éè´ä¾åºåï¼
        supplierApi.validateSupplier(reqVO.getVendorId());
        // æ ¡éªéè´è®¢ååå¨
        if (reqVO.getPurchaseOrderId() != null) {
            ErpPurchaseOrderRespDTO purchaseOrder = purchaseOrderApi.getPurchaseOrder(reqVO.getPurchaseOrderId()).getCheckedData();
@@ -161,7 +164,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, BigDecimal qualifiedQuantity) {
    public void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, Integer checkResult, BigDecimal qualifiedQuantity) {
        // 1.1 æ ¡éªå°è´§éç¥ååå¨
        MesWmArrivalNoticeDO notice = validateArrivalNoticeExists(id);
        // 1.2 æ ¡éªç¶æä¸ºå¾è´¨æ£
@@ -169,18 +172,28 @@
            throw exception(WM_ARRIVAL_NOTICE_STATUS_NOT_PENDING_QC);
        }

        // 2. æ´æ°å°è´§éç¥åè¡ï¼ç»å® iqcId + åæ ¼æ°é
        arrivalNoticeLineService.updateArrivalNoticeLineWhenIqcFinish(lineId, iqcId, qualifiedQuantity);
        // 2. æ´æ°å°è´§éç¥åè¡ï¼ç»å® iqcId + è´¨æ£ç»æ + åæ ¼æ°é
        arrivalNoticeLineService.updateArrivalNoticeLineWhenIqcFinish(lineId, iqcId, checkResult, qualifiedQuantity);

        // 3.1 å¤ææ¯å¦ææéæ£è¡é½å·²å®æ
        // 3.1 å¤ææ¯å¦ææéæ£è¡é½å·²å®æè´¨æ£
        List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(id);
        boolean hasUnchecked = CollectionUtils.anyMatch(lines,
                line -> Boolean.TRUE.equals(line.getIqcCheckFlag()) && line.getIqcId() == null);
                line -> Boolean.TRUE.equals(line.getIqcCheckFlag()) && line.getIqcCheckResult() == null);
        if (hasUnchecked) {
            log.info("[updateArrivalNoticeWhenIqcFinish][å°è´§éç¥å({}) è¿ææªå®ææ£éªçè¡ï¼æä¸æ´æ°ç¶æ]", id);
            return;
        }
        // 3.2 ææè¡æ£éªå®æï¼æ´æ°ä¸»è¡¨ç¶æ PENDING_QC â PENDING_RECEIPT

        // 3.2 å¤ææ¯å¦ææéæ£è¡é½å¯ä»¥å¥åºï¼åæ ¼æç¹éï¼
        boolean hasNonInbound = CollectionUtils.anyMatch(lines,
                line -> Boolean.TRUE.equals(line.getIqcCheckFlag())
                        && !MesQcCheckResultEnum.canInbound(line.getIqcCheckResult()));
        if (hasNonInbound) {
            log.info("[updateArrivalNoticeWhenIqcFinish][å°è´§éç¥å({}) åå¨ä¸å¯å¥åºçè¡ï¼éè´§/æ¥åºï¼ï¼ç¶æä¿æå¾è´¨æ£]", id);
            return;
        }

        // 3.3 ææè¡æ£éªå®æä¸å¯å¥åºï¼æ´æ°ä¸»è¡¨ç¶æ PENDING_QC â PENDING_RECEIPT
        arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus()));
    }
@@ -285,44 +298,76 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long generateArrivalNoticeFromPurchaseOrder(Long purchaseOrderId) {
        // 1. è·åéè´è®¢å
        // 1. æ ¡éªæ¯å¦å·²çæè¿å°è´§éç¥åï¼é²æ¢éå¤çæï¼
        MesWmArrivalNoticeDO existNotice = arrivalNoticeMapper.selectByPurchaseOrderId(purchaseOrderId);
        if (existNotice != null) {
            throw exception(WM_ARRIVAL_NOTICE_ALREADY_EXISTS);
        }

        // 2. è·åéè´è®¢å
        ErpPurchaseOrderRespDTO purchaseOrder = purchaseOrderApi.getPurchaseOrder(purchaseOrderId).getCheckedData();
        if (purchaseOrder == null) {
            throw exception(WM_PURCHASE_ORDER_NOT_EXISTS);
        }

        // 2. è·åéè´è®¢åæç»
        // 3. è·åéè´è®¢åæç»
        List<ErpPurchaseOrderItemRespDTO> items = purchaseOrderApi.getPurchaseOrderItemList(purchaseOrderId).getCheckedData();
        if (CollUtil.isEmpty(items)) {
            throw exception(WM_PURCHASE_ORDER_NO_ITEM);
        }

        // 3. çæå°è´§éç¥åç¼ç ï¼ä½¿ç¨ç¼ç è§åæå¡ï¼
        // 4. çæå°è´§éç¥åç¼ç 
        String code = generateArrivalNoticeCode();

        // 4. åå»ºå°è´§éç¥åä¸»è¡¨
        // 5. åå»ºå°è´§éç¥åä¸»è¡¨ï¼ç´æ¥è®¾ä¸ºå¾å¥åºç¶æ
        MesWmArrivalNoticeDO notice = new MesWmArrivalNoticeDO();
        notice.setCode(code);
        notice.setName(purchaseOrder.getNo() + "å°è´§éç¥");
        notice.setPurchaseOrderId(purchaseOrderId);
        notice.setPurchaseOrderCode(purchaseOrder.getNo());
        notice.setVendorId(purchaseOrder.getSupplierId());
        notice.setStatus(MesWmArrivalNoticeStatusEnum.PREPARE.getStatus());
        notice.setArrivalDate(java.time.LocalDateTime.now()); // å°è´§æ¶é´ä¸ºå½åæ¶é´
        notice.setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus());
        arrivalNoticeMapper.insert(notice);

        // 5. éåæç»åå»ºå°è´§éç¥åè¡
        // 6. éåæç»åå»ºå°è´§éç¥åè¡
        boolean hasNeedQc = false;
        for (ErpPurchaseOrderItemRespDTO item : items) {
            MesWmArrivalNoticeLineDO line = new MesWmArrivalNoticeLineDO();
            line.setNoticeId(notice.getId());
            line.setPurchaseOrderItemId(item.getId());
            // æ³¨æï¼è¿ééè¦æ ¹æ® ERP äº§å ID æ å°å° MES ç©æ ID
            // å®éé¡¹ç®ä¸éè¦éè¿æ å°æå¡å¤çï¼è¿éææ¶çç©ºè®©ç¨æ·æå¨éæ©
            line.setArrivalQuantity(item.getCount() != null ? item.getCount().subtract(item.getInCount() != null ? item.getInCount() : BigDecimal.ZERO) : BigDecimal.ZERO);
            line.setItemId(item.getProductId()); // ä»éè´è®¢åæç»å¸¦å¥ç©æç¼å·
            BigDecimal arrivalQuantity = item.getCount() != null ? item.getCount().subtract(item.getInCount() != null ? item.getInCount() : BigDecimal.ZERO) : BigDecimal.ZERO;
            line.setArrivalQuantity(arrivalQuantity);
            // ä»éè´è®¢åæç»å¸¦å¥è´¨æ£æ è¯
            line.setIqcCheckFlag(Boolean.TRUE.equals(item.getQcCheckFlag()));
            boolean needQc = Boolean.TRUE.equals(item.getQcCheckFlag());
            line.setIqcCheckFlag(needQc);
            // å¦æä¸éè¦è´¨æ£ï¼åæ ¼æ°éçäºå°è´§æ°é
            if (!needQc) {
                line.setQualifiedQuantity(arrivalQuantity);
            } else {
                hasNeedQc = true;
            }
            arrivalNoticeLineService.createArrivalNoticeLineFromPurchaseOrderItem(line);
        }

        // 7. å¦ææéè¦è´¨æ£çè¡ï¼æ´æ°ç¶æä¸ºå¾è´¨æ£å¹¶èªå¨åå»º IQC å
        if (hasNeedQc) {
            arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                    .setId(notice.getId()).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus()));
            // ä¸ºéè¦è´¨æ£çè¡èªå¨åå»º IQC æ£éªå
            List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(notice.getId());
            for (MesWmArrivalNoticeLineDO line : lines) {
                if (Boolean.TRUE.equals(line.getIqcCheckFlag())) {
                    Long iqcId = iqcService.createIqcFromArrivalNotice(
                            notice.getId(), line, notice.getCode(), notice.getVendorId());
                    arrivalNoticeLineService.updateArrivalNoticeLineIqcId(line.getId(), iqcId);
                    log.info("[generateArrivalNoticeFromPurchaseOrder][å°è´§éç¥å({}) è¡({}) èªå¨åå»º IQC æ£éªå({})]",
                            notice.getId(), line.getId(), iqcId);
                }
            }
        }

        return notice.getId();
    }


 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java

@@ -11,6 +11,7 @@
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
@@ -42,6 +43,7 @@
    private MesWmMaterialStockService materialStockService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createItemReceiptDetail(MesWmItemReceiptDetailSaveReqVO createReqVO) {
        // 1. æ ¡éªæ°æ®
        itemReceiptService.validateItemReceiptEditable(createReqVO.getReceiptId());
@@ -57,6 +59,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateItemReceiptDetail(MesWmItemReceiptDetailSaveReqVO updateReqVO) {
        // 1.1 æ ¡éªåå¨
        MesWmItemReceiptDetailDO detail = validateItemReceiptDetailExists(updateReqVO.getId());

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java

@@ -17,7 +17,6 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmItemReceiptStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeLineService;
@@ -27,6 +26,9 @@
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import jakarta.annotation.Resource;
@@ -39,6 +41,7 @@
import java.math.BigDecimal;
import java.util.Collection;
import java.util.List;
import java.util.Map;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -63,7 +66,8 @@
    @Lazy
    private MesWmArrivalNoticeService arrivalNoticeService;
    @Resource
    private MesMdVendorService vendorService;
    @Lazy
    private ErpSupplierApi supplierApi;
    @Resource
    @Lazy
    private MesQcIqcService iqcService;
@@ -78,6 +82,9 @@

    @Resource
    private ErpPurchaseOrderApi purchaseOrderApi;

    @Resource
    private MdmItemApi mdmItemApi;

    @Override
    public Long createItemReceipt(MesWmItemReceiptSaveReqVO createReqVO) {
@@ -106,8 +113,8 @@
    private void validateItemReceiptSaveData(MesWmItemReceiptSaveReqVO reqVO) {
        // æ ¡éªç¼ç å¯ä¸
        validateCodeUnique(reqVO.getId(), reqVO.getCode());
        // æ ¡éªä¾åºååå¨
        vendorService.validateVendorExistsAndEnable(reqVO.getVendorId());
        // æ ¡éªä¾åºååå¨ï¼éè´å¥åºä½¿ç¨ ERP ä¾åºåï¼
        supplierApi.validateSupplier(reqVO.getVendorId());
        // æ ¡éªå°è´§éç¥ååå¨
        if (reqVO.getNoticeId() != null) {
            MesWmArrivalNoticeDO notice = arrivalNoticeService.validateArrivalNoticeReadyForReceipt(reqVO.getNoticeId());
@@ -155,9 +162,33 @@
            throw exception(WM_ITEM_RECEIPT_NO_LINE);
        }

        // æ ¡éªç©ææ¹æ¬¡ç®¡çï¼å¦æç©æå¼å¯æ¹æ¬¡ç®¡çï¼åæç»çæ¹æ¬¡å·ä¸è½ä¸ºç©º
        validateBatchManagement(lines);

        // æäº¤ï¼èç¨¿ â å¾ä¸æ¶ï¼
        itemReceiptMapper.updateById(new MesWmItemReceiptDO()
                .setId(id).setStatus(MesWmItemReceiptStatusEnum.APPROVING.getStatus()));
    }

    /**
     * æ ¡éªç©ææ¹æ¬¡ç®¡çï¼å¦æç©æå¼å¯æ¹æ¬¡ç®¡çï¼åè¡çæ¹æ¬¡å·ä¸è½ä¸ºç©º
     */
    private void validateBatchManagement(List<MesWmItemReceiptLineDO> lines) {
        // è·åææç©æID
        List<Long> itemIds = CollectionUtils.convertList(lines, MesWmItemReceiptLineDO::getItemId);
        Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(itemIds);

        // éåæ¯ä¸è¡ï¼æ£æ¥ç©ææ¯å¦å¼å¯æ¹æ¬¡ç®¡ç
        for (MesWmItemReceiptLineDO line : lines) {
            MdmItemRespDTO item = itemMap.get(line.getItemId());
            if (item == null) {
                continue;
            }
            // å¦æç©æå¼å¯æ¹æ¬¡ç®¡çï¼æ£æ¥è¡ä¸çæ¹æ¬¡å·æ¯å¦ä¸ºç©º
            if (Boolean.TRUE.equals(item.getIsBatchManaged()) && line.getBatchId() == null) {
                throw exception(WM_ITEM_RECEIPT_BATCH_REQUIRED, item.getCode(), item.getName());
            }
        }
    }

    @Override
@@ -245,14 +276,26 @@

    private void createTransactionList(MesWmItemReceiptDO receipt) {
        List<MesWmItemReceiptDetailDO> details = itemReceiptDetailService.getItemReceiptDetailListByReceiptId(receipt.getId());
        wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO()
                .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId())
                .setQuantity(detail.getQuantity()) // å¥åºæ°éä¸ºæ£æ°
                .setBatchId(detail.getBatchId())
                .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
                .setVendorId(receipt.getVendorId()).setReceiptTime(receipt.getReceiptDate())
                .setBizType(MesBizTypeConstants.WM_ITEM_RECEIPT_IN).setBizId(receipt.getId())
                .setBizCode(receipt.getCode()).setBizLineId(detail.getLineId())));
        // è·åææè¡ä¿¡æ¯ï¼ç¨äºè·åæ¹æ¬¡å·
        List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(receipt.getId());
        Map<Long, MesWmItemReceiptLineDO> lineMap = CollectionUtils.convertMap(lines, MesWmItemReceiptLineDO::getId);

        wmTransactionService.createTransactionList(convertList(details, detail -> {
            // ä»è¡ä¸è·åæ¹æ¬¡ä¿¡æ¯ï¼å¦ææç»æ²¡ææ¹æ¬¡å·ï¼
            MesWmItemReceiptLineDO line = lineMap.get(detail.getLineId());
            Long batchId = detail.getBatchId() != null ? detail.getBatchId() :
                    (line != null ? line.getBatchId() : null);
            String batchCode = line != null ? line.getBatchCode() : null;

            return new MesWmTransactionSaveReqDTO()
                    .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId())
                    .setQuantity(detail.getQuantity())
                    .setBatchId(batchId).setBatchCode(batchCode)
                    .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
                    .setVendorId(receipt.getVendorId()).setReceiptTime(receipt.getReceiptDate())
                    .setBizType(MesBizTypeConstants.WM_ITEM_RECEIPT_IN).setBizId(receipt.getId())
                    .setBizCode(receipt.getCode()).setBizLineId(detail.getLineId());
        }));
    }

    @Override
@@ -331,26 +374,33 @@
        // 1. æ ¡éªå°è´§éç¥ååå¨ä¸ç¶æä¸ºå¾å¥åº
        MesWmArrivalNoticeDO notice = arrivalNoticeService.validateArrivalNoticeReadyForReceipt(arrivalNoticeId);

        // 2. è·åå°è´§éç¥åè¡
        // 2. æ ¡éªæ¯å¦å·²çæè¿å¥åºåï¼é²æ¢éå¤çæï¼
        MesWmItemReceiptDO existReceipt = itemReceiptMapper.selectByNoticeId(arrivalNoticeId);
        if (existReceipt != null) {
            throw exception(WM_ITEM_RECEIPT_ALREADY_EXISTS);
        }

        // 3. è·åå°è´§éç¥åè¡
        List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(arrivalNoticeId);
        if (CollUtil.isEmpty(lines)) {
            throw exception(WM_ARRIVAL_NOTICE_NO_LINE);
        }

        // 3. çæå¥åºåç¼ç 
        // 4. çæå¥åºåç¼ç 
        String code = generateItemReceiptCode();

        // 4. åå»ºå¥åºåä¸»è¡¨
        // 5. åå»ºå¥åºåä¸»è¡¨
        MesWmItemReceiptDO receipt = new MesWmItemReceiptDO();
        receipt.setCode(code);
        receipt.setName(notice.getName() + "å¥åºå");
        receipt.setNoticeId(arrivalNoticeId);
        receipt.setPurchaseOrderCode(notice.getPurchaseOrderCode());
        receipt.setVendorId(notice.getVendorId());
        receipt.setReceiptDate(java.time.LocalDateTime.now()); // å¥åºæ¶é´ä¸ºå½åæ¶é´
        receipt.setStatus(MesWmItemReceiptStatusEnum.PREPARE.getStatus());
        itemReceiptMapper.insert(receipt);

        // 5. éåè¡åå»ºå¥åºåè¡
        // 6. éåè¡åå»ºå¥åºåè¡
        for (MesWmArrivalNoticeLineDO noticeLine : lines) {
            MesWmItemReceiptLineDO receiptLine = new MesWmItemReceiptLineDO();
            receiptLine.setReceiptId(receipt.getId());

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java

@@ -204,7 +204,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void updateProductSalesLineWhenOqcFinish(Long id, Long oqcId, Integer checkResult) {
        // 1. æ´æ°è¡ç oqcId + qualityStatus
        Integer qualityStatus = Objects.equals(checkResult, MesQcCheckResultEnum.PASS.getType())
        Integer qualityStatus = Objects.equals(checkResult, MesQcCheckResultEnum.QUALIFIED.getType())
                ? MesWmQualityStatusEnum.PASS.getStatus() : MesWmQualityStatusEnum.FAIL.getStatus();
        productSalesLineMapper.updateById(new MesWmProductSalesLineDO()
                .setId(id).setOqcId(oqcId).setQualityStatus(qualityStatus));

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java

@@ -183,22 +183,28 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long generateSalesNoticeFromSaleOrder(Long saleOrderId) {
        // 1. è·åéå®è®¢åä¿¡æ¯
        // 1. æ ¡éªæ¯å¦å·²çæè¿åè´§éç¥åï¼é²æ¢éå¤çæï¼
        MesWmSalesNoticeDO existNotice = salesNoticeMapper.selectBySaleOrderId(saleOrderId);
        if (existNotice != null) {
            throw exception(WM_SALES_NOTICE_ALREADY_EXISTS);
        }

        // 2. è·åéå®è®¢åä¿¡æ¯
        ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(saleOrderId).getCheckedData();
        if (saleOrder == null) {
            throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
        }

        // 2. è·åéå®è®¢åæç»
        // 3. è·åéå®è®¢åæç»
        List<ErpSaleOrderItemRespDTO> saleOrderItems = saleOrderApi.getSaleOrderItemList(saleOrderId).getCheckedData();
        if (CollUtil.isEmpty(saleOrderItems)) {
            throw exception(WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY);
        }

        // 3. çæåè´§éç¥åç¼ç 
        // 4. çæåè´§éç¥åç¼ç 
        String code = autoCodeRecordService.generateAutoCode("SALESNOTICE_CODE", null);

        // 4. åå»ºåè´§éç¥åä¸»è¡¨
        // 5. åå»ºåè´§éç¥åä¸»è¡¨
        MesWmSalesNoticeDO notice = new MesWmSalesNoticeDO();
        notice.setCode(code);
        notice.setName("éå®è®¢å[" + saleOrder.getNo() + "]åè´§éç¥");
@@ -209,7 +215,7 @@
        notice.setStatus(PREPARE.getStatus());
        salesNoticeMapper.insert(notice);

        // 5. éåæç»åå»ºåè´§éç¥åè¡
        // 6. éåæç»åå»ºåè´§éç¥åè¡
        for (ErpSaleOrderItemRespDTO saleOrderItem : saleOrderItems) {
            MesWmSalesNoticeLineDO line = new MesWmSalesNoticeLineDO();
            line.setNoticeId(notice.getId());
@@ -315,16 +321,21 @@
            throw exception(WM_SALES_NOTICE_STATUS_NOT_APPROVED);
        }

        // 2. è·ååè´§éç¥åè¡
        // 2. æ ¡éªæ¯å¦å·²çæè¿éå®åºåºåï¼é²æ¢éå¤çæï¼
        if (productSalesMapper.selectByNoticeId(noticeId) != null) {
            throw exception(WM_PRODUCT_SALES_ALREADY_EXISTS);
        }

        // 3. è·ååè´§éç¥åè¡
        List<MesWmSalesNoticeLineDO> noticeLines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(noticeId);
        if (CollUtil.isEmpty(noticeLines)) {
            throw exception(WM_SALES_NOTICE_LINE_EMPTY);
        }

        // 3. çæéå®åºåºåç¼ç 
        // 4. çæéå®åºåºåç¼ç 
        String code = autoCodeRecordService.generateAutoCode("WM_PRODUCT_SALES_CODE", null);

        // 4. åå»ºéå®åºåºåä¸»è¡¨
        // 5. åå»ºéå®åºåºåä¸»è¡¨
        MesWmProductSalesDO productSales = new MesWmProductSalesDO();
        productSales.setCode(code);
        productSales.setName("åè´§éç¥å[" + notice.getCode() + "]åºåº");
@@ -340,7 +351,7 @@
        productSales.setStatus(MesWmProductSalesStatusEnum.PREPARE.getStatus());
        productSalesMapper.insert(productSales);

        // 5. éååè´§éç¥åè¡åå»ºéå®åºåºåè¡
        // 6. éååè´§éç¥åè¡åå»ºéå®åºåºåè¡
        for (MesWmSalesNoticeLineDO noticeLine : noticeLines) {
            MesWmProductSalesLineDO salesLine = new MesWmProductSalesLineDO();
            salesLine.setSalesId(productSales.getId());

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wms/approval/listener/WmsInboundStatusListener.java

@@ -4,7 +4,6 @@
import cn.iocoder.yudao.module.mes.service.wms.approval.WmsApprovalService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;

/**
@@ -14,29 +13,38 @@
 */
@Component
@Slf4j
public class WmsInboundStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
public class WmsInboundStatusListener extends cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener {

    /**
     * éè´å¥åºå®¡æ¹æµç¨å®ä¹ Key
     */
    private static final String PROCESS_DEFINITION_KEY = "wms_inbound_approve";

    @Resource
    private WmsApprovalService approvalService;

    @Override
    public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
        // éè¿ businessKey æ¥è¯¢å¥åºå
    protected String getProcessDefinitionKey() {
        return PROCESS_DEFINITION_KEY;
    }

    @Override
    protected void onEvent(BpmProcessInstanceStatusEvent event) {
        Long orderId;
        try {
            orderId = Long.parseLong(event.getBusinessKey());
        } catch (NumberFormatException e) {
            return; // businessKey ä¸æ¯æ°åï¼å¿½ç¥
            log.warn("[onEvent] businessKey({}) ä¸æ¯ææçæ°å", event.getBusinessKey());
            return;
        }

        log.info("[onApplicationEvent] æ¶å°BPMå®¡æ¹äºä»¶ï¼businessKey={}, status={}",
        log.info("[onEvent] æ¶å°BPMå®¡æ¹äºä»¶ï¼businessKey={}, status={}",
                event.getBusinessKey(), event.getStatus());

        // è°ç¨å®¡æ¹æå¡æ´æ°ç¶æ
        try {
            approvalService.updateAuditStatus(orderId, "INBOUND", event.getStatus());
        } catch (Exception e) {
            log.error("[onApplicationEvent] æ´æ°å¥åºåå®¡æ¹ç¶æå¤±è´¥ï¼orderId={}", orderId, e);
            log.error("[onEvent] æ´æ°å¥åºåå®¡æ¹ç¶æå¤±è´¥ï¼orderId={}", orderId, e);
        }
    }


 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wms/approval/listener/WmsOutboundStatusListener.java

@@ -4,7 +4,6 @@
import cn.iocoder.yudao.module.mes.service.wms.approval.WmsApprovalService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;

/**
@@ -14,29 +13,38 @@
 */
@Component
@Slf4j
public class WmsOutboundStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
public class WmsOutboundStatusListener extends cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener {

    /**
     * éå®åºåºå®¡æ¹æµç¨å®ä¹ Key
     */
    private static final String PROCESS_DEFINITION_KEY = "wms_outbound_approve";

    @Resource
    private WmsApprovalService approvalService;

    @Override
    public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
        // éè¿ businessKey æ¥è¯¢åºåºå
    protected String getProcessDefinitionKey() {
        return PROCESS_DEFINITION_KEY;
    }

    @Override
    protected void onEvent(BpmProcessInstanceStatusEvent event) {
        Long orderId;
        try {
            orderId = Long.parseLong(event.getBusinessKey());
        } catch (NumberFormatException e) {
            return; // businessKey ä¸æ¯æ°åï¼å¿½ç¥
            log.warn("[onEvent] businessKey({}) ä¸æ¯ææçæ°å", event.getBusinessKey());
            return;
        }

        log.info("[onApplicationEvent] æ¶å°BPMå®¡æ¹äºä»¶ï¼businessKey={}, status={}",
        log.info("[onEvent] æ¶å°BPMå®¡æ¹äºä»¶ï¼businessKey={}, status={}",
                event.getBusinessKey(), event.getStatus());

        // è°ç¨å®¡æ¹æå¡æ´æ°ç¶æ
        try {
            approvalService.updateAuditStatus(orderId, "OUTBOUND", event.getStatus());
        } catch (Exception e) {
            log.error("[onApplicationEvent] æ´æ°åºåºåå®¡æ¹ç¶æå¤±è´¥ï¼orderId={}", orderId, e);
            log.error("[onEvent] æ´æ°åºåºåå®¡æ¹ç¶æå¤±è´¥ï¼orderId={}", orderId, e);
        }
    }


 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wms/approval/listener/WmsTransferStatusListener.java

@@ -4,7 +4,6 @@
import cn.iocoder.yudao.module.mes.service.wms.approval.WmsApprovalService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;

/**
@@ -14,29 +13,38 @@
 */
@Component
@Slf4j
public class WmsTransferStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
public class WmsTransferStatusListener extends cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener {

    /**
     * è°æ¨å®¡æ¹æµç¨å®ä¹ Key
     */
    private static final String PROCESS_DEFINITION_KEY = "wms_transfer_approve";

    @Resource
    private WmsApprovalService approvalService;

    @Override
    public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
        // éè¿ businessKey æ¥è¯¢è°æ¨å
    protected String getProcessDefinitionKey() {
        return PROCESS_DEFINITION_KEY;
    }

    @Override
    protected void onEvent(BpmProcessInstanceStatusEvent event) {
        Long orderId;
        try {
            orderId = Long.parseLong(event.getBusinessKey());
        } catch (NumberFormatException e) {
            return; // businessKey ä¸æ¯æ°åï¼å¿½ç¥
            log.warn("[onEvent] businessKey({}) ä¸æ¯ææçæ°å", event.getBusinessKey());
            return;
        }

        log.info("[onApplicationEvent] æ¶å°BPMå®¡æ¹äºä»¶ï¼businessKey={}, status={}",
        log.info("[onEvent] æ¶å°BPMå®¡æ¹äºä»¶ï¼businessKey={}, status={}",
                event.getBusinessKey(), event.getStatus());

        // è°ç¨å®¡æ¹æå¡æ´æ°ç¶æ
        try {
            approvalService.updateAuditStatus(orderId, "TRANSFER", event.getStatus());
        } catch (Exception e) {
            log.error("[onApplicationEvent] æ´æ°è°æ¨åå®¡æ¹ç¶æå¤±è´¥ï¼orderId={}", orderId, e);
            log.error("[onEvent] æ´æ°è°æ¨åå®¡æ¹ç¶æå¤±è´¥ï¼orderId={}", orderId, e);
        }
    }

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,117 @@
			# ç¡®è®¤æ¶è´§ä¸è´¨æ£æµç¨ - åç«¯èè°æ¹æ¡

			## æ¶åé¡µé¢

			- éè´è®¢ååè¡¨é¡µ
			- éè´è®¢åè¯¦æé¡µ
			- å°è´§éç¥ååè¡¨é¡µ
			- å°è´§éç¥åè¯¦æé¡µ
			- IQC æ¥ææ£éªåé¡µé¢

			## ä¸å¡æµç¨ä¸æ°æ®å¸¦å¥

			```
			éè´ç³è¯·å®¡æ¹éè¿ â çæéè´è®¢åï¼å·²å®¡æ ¸ï¼ â ç¡®è®¤æ¶è´§
			â å¤ææ¯å¦åå¨éè´¨æ£ç©æ
			âââ æ¯ â çæå°è´§éç¥åï¼å¾è´¨æ£ï¼â èªå¨åå»º IQC å â IQC æ¥æè´¨æ£
			â âââ åæ ¼ â çå¾ææè´¨æ£å®æ
			â âââ ç¹é â çå¾ææè´¨æ£å®æ
			â âââ ä¸åæ ¼ï¼éè´§ï¼â ç¶æä¿æå¾è´¨æ£
			â âââ ä¸åæ ¼ï¼æ¥åºï¼â ç¶æä¿æå¾è´¨æ£
			â â
			â ææéæ£ç©æè´¨æ£å®æä¸å¯å¥åºï¼åæ ¼/ç¹éï¼â å°è´§éç¥åï¼å¾å¥åºï¼
			âââ å¦ â çæå°è´§éç¥åï¼å¾å¥åºï¼
			```

			åæ®µå¸¦å¥è¯´æï¼

			\| æºåæ® \| ç®æ åæ® \| å¸¦å¥åæ®µ \|
			\|--------\|----------\|----------\|
			\| éè´è®¢å \| å°è´§éç¥å \| ä¾åºåãéè´è®¢åå· \|
			\| éè´è®¢åæç» \| å°è´§éç¥åè¡ \| ç©æãå°è´§æ°éãè´¨æ£æ è¯(qcCheckFlag) \|
			\| å°è´§éç¥åè¡ \| IQC æ£éªå \| ç©æãå°è´§æ°éãä¾åºå \|

			## API

			\| æ¹æ³ \| è·¯å¾ \| è¯´æ \|
			\|------\|------\|------\|
			\| POST \| /erp/purchase-order/confirm-receipt \| ç¡®è®¤æ¶è´§ \|

			è¯·æ±åæ°ï¼

			\| åæ° \| ç±»å \| å¿å¡« \| è¯´æ \|
			\|------\|------\|------\|------\|
			\| id \| Long \| æ¯ \| éè´è®¢åç¼å· \|

			ååºï¼

			```json
			{
			"code": 0,
			"data": 123, // çæçå°è´§éç¥åç¼å·
			"msg": "æä½æå"
			}
			```

			## åæ®µå±ç¤ºè§å

			### éè´è®¢åæç»æ°å¢åæ®µ

			\| åæ®µ \| ç±»å \| å±ç¤ºä½ç½® \| è¯´æ \|
			\|------\|------\|----------\|------\|
			\| qcCheckFlag \| Boolean \| åè¡¨ãè¯¦æãè¡¨å \| æ¯å¦éè¦æ¥ææ£éªï¼é»è®¤ false \|

			### å°è´§éç¥åè¡æ°å¢åæ®µ

			\| åæ®µ \| ç±»å \| å±ç¤ºä½ç½® \| è¯´æ \|
			\|------\|------\|----------\|------\|
			\| iqcCheckFlag \| Boolean \| åè¡¨ãè¯¦æ \| æ¯å¦éè¦æ¥ææ£éªï¼ä»éè´è®¢åå¸¦å¥ï¼ \|
			\| iqcId \| Long \| è¯¦æ \| å³èç IQC æ£éªåç¼å·ï¼èªå¨åå»ºåååï¼ \|
			\| iqcCheckResult \| Integer \| åè¡¨ãè¯¦æ \| è´¨æ£ç»æï¼1åæ ¼ 2ç¹é 3ä¸åæ ¼éè´§ 4ä¸åæ ¼æ¥åº \|
			\| qualifiedQuantity \| BigDecimal \| åè¡¨ãè¯¦æ \| åæ ¼æ°éï¼è´¨æ£å®æåååï¼ \|

			### å°è´§éç¥åç¶ææµè½¬

			\| ç¶æå¼ \| ç¶æå \| è¯´æ \|
			\|--------\|--------\|------\|
			\| 0 \| èç¨¿ \| æ°å»ºç¶æ \|
			\| 10 \| å¾è´¨æ£ \| åå¨éè´¨æ£ç©æï¼çå¾ IQC å®æ \|
			\| 20 \| å¾å¥åº \| æ éè´¨æ£æææè´¨æ£å®æä¸å¯å¥åº \|
			\| 30 \| å·²å®æ \| å¥åºå®æ \|

			## ä¸å¡è§åè¯´æ

			### ç¡®è®¤æ¶è´§æé®å±ç¤º

			\| åºæ¯ \| è§å \|
			\|------\|------\|
			\| æ¾ç¤ºæ¡ä»¶ \| è®¢åç¶æ=å·²å®¡æ ¸(20) ä¸ å¥åºç¶æâ å¨é¨å¥åº(2) \|
			\| ç¹å»å \| è°ç¨ confirmReceipt æ¥å£ï¼è¿åå°è´§éç¥åç¼å· \|
			\| æåå \| æç¤º"ç¡®è®¤æ¶è´§æåï¼å·²çæå°è´§éç¥å"ï¼å·æ°åè¡¨ \|

			### è´¨æ£ç»æå¯¹å¥åºçå½±å

			\| è´¨æ£ç»æ \| å¼ \| æ¯å¦å¯å¥åº \| è¯´æ \|
			\|----------\|-----\|------------\|------\|
			\| åæ ¼ \| 1 \| â æ¯ \| æ£å¸¸å¥åº \|
			\| ç¹é \| 2 \| â æ¯ \| ç¹æ®æ¹åå¥åº \|
			\| ä¸åæ ¼éè´§ \| 3 \| â å¦ \| éåä¾åºåï¼ä¸å¯å¥åº \|
			\| ä¸åæ ¼æ¥åº \| 4 \| â å¦ \| æ¥åºå¤çï¼ä¸å¯å¥åº \|

			### å°è´§éç¥åç¶ææ¨è¿è§å

			\| å½åç¶æ \| æ¨è¿æ¡ä»¶ \| ç®æ ç¶æ \|
			\|----------\|----------\|----------\|
			\| èç¨¿ \| æäº¤æ¶åå¨éè´¨æ£è¡ \| å¾è´¨æ£ \|
			\| èç¨¿ \| æäº¤æ¶æ éè´¨æ£è¡ \| å¾å¥åº \|
			\| å¾è´¨æ£ \| ææéæ£è¡å®æè´¨æ£ï¼ä¸é½ä¸ºåæ ¼/ç¹é \| å¾å¥åº \|
			\| å¾è´¨æ£ \| åå¨éè´§/æ¥åºç»æçè¡ \| ä¿æå¾è´¨æ£ \|
			\| å¾å¥åº \| æå¨å®ææä½ \| å·²å®æ \|

			## æ³¨æäºé¡¹

			1. èªå¨åå»º IQC åï¼ç¡®è®¤æ¶è´§æ¶ï¼å¦æéè´è®¢åæç»è®¾ç½®äº `qcCheckFlag=true`ï¼ç³»ç»ä¼èªå¨åå»ºå¯¹åºç IQC æ£éªåï¼æ éæå¨åå»ºã
			2. è´¨æ£ç»æååï¼IQC æ£éªå®æåï¼ä¼èªå¨ååå°è´§éç¥åè¡ç `iqcCheckResult` å `qualifiedQuantity` åæ®µã
			3. é¨åæ¶è´§ï¼ä¸ä¸ªéè´è®¢åå¯ä»¥å¤æ¬¡ç¡®è®¤æ¶è´§ï¼é¨åæ¶è´§åºæ¯ï¼ï¼æ¯æ¬¡çæç¬ç«çå°è´§éç¥åã
			4. å¥åºåææ¡ä»¶ï¼åªæå°è´§éç¥åç¶æä¸º"å¾å¥åº"æ¶æè½æ§è¡éè´å¥åºæä½ã
			5. è´¨æ£å¤±è´¥å¤çï¼å¦æè´¨æ£ç»æä¸ºéè´§ææ¥åºï¼å°è´§éç¥åç¶æä¿æ"å¾è´¨æ£"ï¼éè¦äººå·¥ä»å¥å¤çï¼å¦éæ°å®ææ¶è´§ï¼ã

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,202 @@
			# éè´æµç¨åç«¯èè°æ¹æ¡

			## æ¶åé¡µé¢

			- éè´è®¢ååè¡¨é¡µ
			- éè´è®¢åè¯¦æé¡µ
			- å°è´§éç¥ååè¡¨é¡µ
			- å°è´§éç¥åè¯¦æé¡µ

			## ä¸å¡æµç¨

			```
			éè´ç³è¯·å®¡æ¹éè¿ â èªå¨çæéè´è®¢å(å·²å®¡æ ¸)
			â ç¹å»"ç¡®è®¤æ¶è´§" â çæå°è´§éç¥å(å¾å¥åº/å¾è´¨æ£)
			â IQCè´¨æ£(å¦éè¦) â éè´å¥åº
			```

			---

			## ä¸ãéè´è®¢åæ¨¡å

			### 1. æ°å¢æé®ï¼ç¡®è®¤æ¶è´§

			ä½ç½®ï¼ éè´è®¢ååè¡¨é¡µãè¯¦æé¡µ

			å±ç¤ºæ¡ä»¶ï¼
			- è®¢åç¶æ = å·²å®¡æ ¸(20)
			- å¥åºç¶æ â å¨é¨å¥åº(2)

			APIï¼

			\| æ¹æ³ \| è·¯å¾ \| è¯´æ \|
			\|------\|------\|------\|
			\| POST \| /erp/purchase-order/confirm-receipt \| ç¡®è®¤æ¶è´§ \|

			è¯·æ±åæ°ï¼

			\| åæ° \| ç±»å \| å¿å¡« \| è¯´æ \|
			\|------\|------\|------\|------\|
			\| id \| Long \| æ¯ \| éè´è®¢åç¼å· \|

			ååºï¼

			```json
			{
			"code": 0,
			"data": 123, // çæçå°è´§éç¥åç¼å·
			"msg": "æä½æå"
			}
			```

			### 2. æ°å¢åæ®µï¼éè´è®¢åæç»

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| qcCheckFlag \| Boolean \| æ¯å¦éè¦æ¥ææ£éªï¼é»è®¤ false \|

			å±ç¤ºä½ç½®ï¼ éè´è®¢åæç»è¡¨æ ¼

			---

			## äºãéè´ç³è¯·æ¨¡å

			### æ°å¢åæ®µï¼éè´ç³è¯·æç»

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| qcCheckFlag \| Boolean \| æ¯å¦éè¦æ¥ææ£éªï¼é»è®¤ false \|

			å±ç¤ºä½ç½®ï¼ éè´ç³è¯·æç»è¡¨æ ¼

			### æ°å¢åæ®µï¼éè´ç³è¯·ä¸»è¡¨

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| depositPrice \| BigDecimal \| å®ééé¢ï¼é»è®¤ 0 \|

			å±ç¤ºä½ç½®ï¼ éè´ç³è¯·è¡¨å

			---

			## ä¸ãå°è´§éç¥åæ¨¡å

			### 1. ç¶ææµè½¬è¯´æ

			\| ç¶æå¼ \| ç¶æå \| è¯´æ \|
			\|--------\|--------\|------\|
			\| 0 \| èç¨¿ \| æ°å»ºç¶æ \|
			\| 2 \| å¾è´¨æ£ \| åå¨éè´¨æ£ç©æï¼çå¾ IQC å®æ \|
			\| 3 \| å¾å¥åº \| æ éè´¨æ£æææè´¨æ£å®æä¸å¯å¥åº \|
			\| 4 \| å·²å®æ \| å¥åºå®æ \|

			### 2. æ°å¢åæ®µï¼å°è´§éç¥åè¡

			\| åæ®µ \| ç±»å \| å±ç¤ºä½ç½® \| è¯´æ \|
			\|------\|------\|----------\|------\|
			\| iqcCheckFlag \| Boolean \| åè¡¨ãè¯¦æ \| æ¯å¦éè¦æ¥ææ£éª \|
			\| iqcId \| Long \| è¯¦æ \| å³èç IQC æ£éªåç¼å· \|
			\| iqcCheckResult \| Integer \| åè¡¨ãè¯¦æ \| è´¨æ£ç»æ \|
			\| qualifiedQuantity \| BigDecimal \| åè¡¨ãè¯¦æ \| åæ ¼æ°é \|

			### 3. è´¨æ£ç»ææä¸¾

			\| å¼ \| åç§° \| æ¯å¦å¯å¥åº \|
			\|-----\|------\|------------\|
			\| 1 \| åæ ¼ \| â æ¯ \|
			\| 2 \| ç¹é \| â æ¯ \|
			\| 3 \| ä¸åæ ¼éè´§ \| â å¦ \|
			\| 4 \| ä¸åæ ¼æ¥åº \| â å¦ \|

			### 4. æ°å¢æ¥å£ï¼æ ¹æ®éè´è®¢åçæå°è´§éç¥å

			\| æ¹æ³ \| è·¯å¾ \| è¯´æ \|
			\|------\|------\|------\|
			\| POST \| /mes/wm/arrival-notice/generate-from-purchase-order \| æ ¹æ®éè´è®¢åçæå°è´§éç¥å \|

			è¯·æ±åæ°ï¼

			\| åæ° \| ç±»å \| å¿å¡« \| è¯´æ \|
			\|------\|------\|------\|------\|
			\| purchaseOrderId \| Long \| æ¯ \| éè´è®¢åç¼å· \|

			ååºï¼

			```json
			{
			"code": 0,
			"data": 123, // çæçå°è´§éç¥åç¼å·
			"msg": "æä½æå"
			}
			```

			---

			## åãåæ®µå¸¦å¥è¯´æ

			### æ°æ®æµè½¬æ å°

			\| æºåæ® \| ç®æ åæ® \| å¸¦å¥åæ®µ \|
			\|--------\|----------\|----------\|
			\| éè´ç³è¯·æç» \| éè´è®¢åæç» \| qcCheckFlagï¼è´¨æ£æ è¯ï¼ \|
			\| éè´ç³è¯·ä¸»è¡¨ \| éè´è®¢åä¸»è¡¨ \| depositPriceï¼å®ééé¢ï¼ \|
			\| éè´è®¢å \| å°è´§éç¥å \| ä¾åºåãéè´è®¢åå· \|
			\| éè´è®¢åæç» \| å°è´§éç¥åè¡ \| ç©æãå°è´§æ°éãqcCheckFlag \|
			\| å°è´§éç¥åè¡ \| IQC æ£éªå \| ç©æãå°è´§æ°éãä¾åºå \|

			---

			## äºãæé®å±ç¤ºè§åæ±æ»

			### éè´è®¢ååè¡¨/è¯¦æé¡µ

			\| æé® \| æ¾ç¤ºæ¡ä»¶ \|
			\|------\|----------\|
			\| ç¡®è®¤æ¶è´§ \| è®¢åç¶æ=å·²å®¡æ ¸(20) ä¸ å¥åºç¶æâ å¨é¨å¥åº(2) \|

			### éè´ç³è¯·æç»è¡¨æ ¼

			\| å \| è¯´æ \|
			\|----\|------\|
			\| æ¯å¦è´¨æ£ \| å¼å³ç»ä»¶ï¼é»è®¤å³é \|

			### éè´è®¢åæç»è¡¨æ ¼

			\| å \| è¯´æ \|
			\|----\|------\|
			\| æ¯å¦è´¨æ£ \| åªè¯»å±ç¤ºï¼ä»éè´ç³è¯·å¸¦å¥ \|

			### å°è´§éç¥åè¡è¡¨æ ¼

			\| å \| è¯´æ \|
			\|----\|------\|
			\| è´¨æ£æ è¯ \| åªè¯»å±ç¤º \|
			\| è´¨æ£ç»æ \| åªè¯»å±ç¤ºï¼è´¨æ£å®æååå \|
			\| åæ ¼æ°é \| åªè¯»å±ç¤ºï¼è´¨æ£å®æååå \|

			---

			## åãæ³¨æäºé¡¹

			1. ç¡®è®¤æ¶è´§æååï¼è¿åå°è´§éç¥åç¼å·ï¼åç«¯å¯æç¤ºå¹¶å·æ°åè¡¨ï¼æè·³è½¬å°è´§éç¥åè¯¦æ
			2. ä¸ä¸ªéè´è®¢åå¯å¤æ¬¡ç¡®è®¤æ¶è´§ï¼æ¯æé¨åæ¶è´§åºæ¯ï¼æ¯æ¬¡çæç¬ç«çå°è´§éç¥å
			3. è´¨æ£èªå¨åå»ºï¼ç¡®è®¤æ¶è´§æ¶ï¼ç³»ç»èªå¨åå»º IQC æ£éªåï¼æ éæå¨åå»º
			4. å¥åºåææ¡ä»¶ï¼åªæå°è´§éç¥åç¶æä¸º"å¾å¥åº"æ¶æè½æ§è¡éè´å¥åº
			5. è´¨æ£å¤±è´¥å¤çï¼å¦æè´¨æ£ç»æä¸ºéè´§ææ¥åºï¼å°è´§éç¥åç¶æä¿æ"å¾è´¨æ£"ï¼éäººå·¥å¤ç

			---

			## ä¸ãæééç½®

			\| æéæ è¯ \| è¯´æ \|
			\|----------\|------\|
			\| erp:purchase-order:confirm-receipt \| ç¡®è®¤æ¶è´§æé \|

			---

			## å«ãAPI æ±æ»

			\| æ¨¡å \| æ¹æ³ \| è·¯å¾ \| è¯´æ \|
			\|------\|------\|------\|------\|
			\| éè´è®¢å \| POST \| /erp/purchase-order/confirm-receipt \| ç¡®è®¤æ¶è´§ \|
			\| å°è´§éç¥å \| POST \| /mes/wm/arrival-notice/generate-from-purchase-order \| æ ¹æ®éè´è®¢åçæ \|

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,160 @@
			# éè´è®¢åç¡®è®¤æ¶è´§ - åç«¯èè°æ¹æ¡

			## æ¶åé¡µé¢

			- éè´è®¢ååè¡¨é¡µ
			- éè´è®¢åè¯¦æé¡µ

			## ä¸å¡æµç¨

			```
			éè´ç³è¯·å®¡æ¹éè¿ â çæéè´è®¢å(å·²å®¡æ ¸) â ç¡®è®¤æ¶è´§ â çæå°è´§éç¥å(å¾å¥åº/å¾è´¨æ£) â æ§è¡å¥åº
			```

			ç¡®è®¤æ¶è´§åçèªå¨å¤çï¼
			- å¦æéè´è®¢åæç»è®¾ç½®äº `qcCheckFlag=true`ï¼éè¦è´¨æ£ï¼ï¼å°è´§éç¥åèªå¨è¿å¥"å¾è´¨æ£"ç¶æï¼å¹¶åå»º IQC æ£éªå
			- å¦æéè´è®¢åæç»è®¾ç½®äº `qcCheckFlag=false`ï¼æ éè´¨æ£ï¼ï¼å°è´§éç¥åç´æ¥è¿å¥"å¾å¥åº"ç¶æ

			## æ°å¢ API

			\| æ¹æ³ \| è·¯å¾ \| è¯´æ \|
			\|------\|------\|------\|
			\| POST \| /erp/purchase-order/confirm-receipt \| ç¡®è®¤æ¶è´§ \|

			è¯·æ±åæ°ï¼

			\| åæ° \| ç±»å \| å¿å¡« \| è¯´æ \|
			\|------\|------\|------\|------\|
			\| id \| Long \| æ¯ \| éè´è®¢åç¼å· \|

			ååºï¼

			```json
			{
			"code": 0,
			"data": 123, // çæçå°è´§éç¥åç¼å·
			"msg": "æä½æå"
			}
			```

			ä¸å¡è§åï¼
			- åªæå·²å®¡æ ¸ç¶æçéè´è®¢åæè½ç¡®è®¤æ¶è´§
			- å·²å¨é¨å¥åºçéè´è®¢åä¸è½ç¡®è®¤æ¶è´§
			- ç¡®è®¤æ¶è´§åè¿åçæçå°è´§éç¥åç¼å·ï¼åç«¯å¯è·³è½¬å°è´§éç¥åè¯¦æ

			## åæ®µåæ´

			### éè´ç³è¯·æç»æ°å¢åæ®µ

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| qcCheckFlag \| Boolean \| æ¯å¦éè¦æ¥ææ£éªï¼é»è®¤ false \|

			### éè´è®¢åæç»æ°å¢åæ®µ

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| qcCheckFlag \| Boolean \| æ¯å¦éè¦æ¥ææ£éªï¼ä»éè´ç³è¯·å¸¦å¥ \|

			### éè´ç³è¯·æ°å¢åæ®µ

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| depositPrice \| BigDecimal \| å®ééé¢ï¼é»è®¤ 0 \|

			### éè´è®¢åæ°å¢åæ®µ

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| depositPrice \| BigDecimal \| å®ééé¢ï¼ä»éè´ç³è¯·å¸¦å¥ \|

			## æé®å±ç¤ºè§å

			### éè´è®¢ååè¡¨/è¯¦æé¡µ

			\| æé® \| æ¾ç¤ºæ¡ä»¶ \|
			\|------\|----------\|
			\| ç¡®è®¤æ¶è´§ \| è®¢åç¶æ=å·²å®¡æ ¸(20) ä¸ å¥åºç¶æâ å¨é¨å¥åº(2) \|

			## åç«¯ä¿®æ¹ç¹

			### 1. éè´è®¢ååè¡¨é¡µ - æ·»å ç¡®è®¤æ¶è´§æé®

			```html
			<el-button
			type="success"
			v-if="scope.row.status === 20 && scope.row.inStatus !== 2"
			@click="handleConfirmReceipt(scope.row)"
			v-hasPermi="['erp:purchase-order:confirm-receipt']">
			ç¡®è®¤æ¶è´§
			</el-button>
			```

			### 2. æ¹æ³å®ç°

			```js
			// ç¡®è®¤æ¶è´§
			async handleConfirmReceipt(row) {
			try {
			await this.$modal.confirm(`ç¡®è®¤å¯¹éè´è®¢åã${row.no}ãè¿è¡æ¶è´§æä½ï¼`);
			const res = await confirmReceipt(row.id);
			this.$modal.msgSuccess('ç¡®è®¤æ¶è´§æåï¼å·²çæå°è´§éç¥å');
			// å¯éï¼è·³è½¬å°è´§éç¥åè¯¦æ
			// this.$router.push({ path: '/mes/wm/arrival-notice/detail', query: { id: res.data } });
			this.getList();
			} catch (e) {
			// åæ¶æå¤±è´¥
			}
			}
			```

			### 3. API æ¥å£

			```js
			// api/erp/purchase/order.js
			export function confirmReceipt(id) {
			return request({
			url: '/erp/purchase-order/confirm-receipt',
			method: 'post',
			params: { id }
			})
			}
			```

			### 4. éè´ç³è¯·è¡¨å - æ·»å è´¨æ£æ è¯åæ®µ

			å¨éè´ç³è¯·æç»è¡¨æ ¼ä¸æ·»å "æ¯å¦è´¨æ£"åï¼

			```html
			<el-table-column label="æ¯å¦è´¨æ£" prop="qcCheckFlag" width="100">
			<template #default="scope">
			<el-switch v-model="scope.row.qcCheckFlag" />
			</template>
			</el-table-column>
			```

			### 5. éè´ç³è¯·è¡¨å - æ·»å å®éåæ®µ

			```html
			<el-form-item label="å®ééé¢" prop="depositPrice">
			<el-input-number
			v-model="form.depositPrice"
			:min="0"
			:precision="2"
			:controls="false"
			placeholder="è¯·è¾å¥å®ééé¢" />
			</el-form-item>
			```

			## æééç½®

			\| æéæ è¯ \| è¯´æ \|
			\|----------\|------\|
			\| erp:purchase-order:confirm-receipt \| ç¡®è®¤æ¶è´§æé \|

			## æ³¨æäºé¡¹

			1. ç¡®è®¤æ¶è´§æä½ä¼èªå¨çæå°è´§éç¥åï¼æ éæå¨åå»º
			2. è´¨æ£æ è¯ä»éè´ç³è¯· â éè´è®¢å â å°è´§éç¥åå¨ç¨ä¼ é
			3. å®ééé¢ä»éè´ç³è¯·èªå¨å¸¦å¥éè´è®¢å
			4. ä¸ä¸ªéè´è®¢åå¯ä»¥å¤æ¬¡ç¡®è®¤æ¶è´§ï¼é¨åæ¶è´§åºæ¯ï¼

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,97 @@
			# éè´å¥åºç¶æåå - åç«¯èè°æ¹æ¡

			## æ¶åé¡µé¢

			- éè´ç³è¯·åè¡¨é¡µ
			- éè´ç³è¯·è¯¦æé¡µ
			- éè´è®¢ååè¡¨é¡µ
			- éè´è®¢åè¯¦æé¡µ

			## ä¸å¡æµç¨ä¸æ°æ®å¸¦å¥

			```
			éè´ç³è¯·å®¡æ¹éè¿ â çæéè´è®¢å(å·²å®¡æ ¸) â ç¡®è®¤æ¶è´§ â çæå°è´§éç¥å(å¾å¥åº) â æ§è¡å¥åº
			â â â
			order_id/order_no request_item_id å³è in_status åå
			```

			ç¶æååæµç¨ï¼
			1. å¥åºåå®æ â ååéè´è®¢åæç»å¥åºæ°éï¼in_countï¼
			2. å¥åºåå®æ â ååéè´è®¢åå¥åºç¶æï¼in_statusï¼
			3. å¥åºåå®æ â ååéè´ç³è¯·æç»å¥åºæ°éï¼in_countï¼
			4. å¥åºåå®æ â ååéè´ç³è¯·å¥åºç¶æï¼in_statusï¼

			## åæ®µåæ´

			### éè´ç³è¯·æ°å¢åæ®µ

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| inStatus \| Integer \| å¥åºç¶æï¼0:æªå¥åº 1:é¨åå¥åº 2:å¨é¨å¥åºï¼ \|

			### éè´ç³è¯·æç»æ°å¢åæ®µ

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| inCount \| BigDecimal \| å¥åºæ°é \|

			### éè´è®¢åæç»æ°å¢åæ®µ

			\| åæ®µ \| ç±»å \| è¯´æ \|
			\|------\|------\|------\|
			\| requestItemId \| Long \| éè´ç³è¯·æç»ç¼å·ï¼ç³»ç»èªå¨å³èï¼ \|

			## ååºåæ®µåæ´

			### éè´ç³è¯·è¯¦æååºæ°å¢

			```json
			{
			"inStatus": 0
			}
			```

			### éè´ç³è¯·æç»ååºæ°å¢

			```json
			{
			"items": [
			{
			"inCount": 0
			}
			]
			}
			```

			### éè´è®¢åè¯¦æååºæ°å¢

			æ ååï¼`requestItemId` ä¸ºç³»ç»åé¨å³èï¼åç«¯æ éå±ç¤ºï¼

			## åæ®µå±ç¤ºè§å

			\| åæ®µ \| å±ç¤ºä½ç½® \| è¯´æ \|
			\|------\|----------\|------\|
			\| å¥åºç¶æ \| éè´ç³è¯·åè¡¨ãè¯¦æ \| ä½¿ç¨æ ç¾å±ç¤ºï¼æªå¥åº/é¨åå¥åº/å¨é¨å¥åº \|
			\| å¥åºæ°é \| éè´ç³è¯·æç»è¡¨æ ¼ \| æ°å¼å±ç¤ºï¼ä¿ç6ä½å°æ° \|

			## ä¸å¡è§åè¯´æ

			\| åºæ¯ \| è§å \|
			\|------\|------\|
			\| éè´ç³è¯·å¥åºç¶æ \| æ ¹æ®éè´è®¢åå¥åºç¶æèªå¨æ´æ°ï¼æ éæå¨æä½ \|
			\| éè´ç³è¯·æç»å¥åºæ°é \| æ ¹æ®éè´è®¢åæç»å¥åºæ°éç´¯å æ´æ° \|
			\| å¤æ¬¡å¥åº \| æ¯æé¨åå¥åºï¼å¥åºç¶æèªå¨æµè½¬ \|

			## å¥åºç¶ææä¸¾

			\| å¼ \| åç§° \| é¢è²å»ºè®® \|
			\|----\|------\|----------\|
			\| 0 \| æªå¥åº \| infoï¼ç°è²ï¼ \|
			\| 1 \| é¨åå¥åº \| warningï¼æ©è²ï¼ \|
			\| 2 \| å¨é¨å¥åº \| successï¼ç»¿è²ï¼ \|

			## æ³¨æäºé¡¹

			1. å¥åºç¶æç±ç³»ç»èªå¨ååï¼æ éæå¨ç»´æ¤
			2. ä¸ä¸ªéè´ç³è¯·å¯¹åºä¸ä¸ªéè´è®¢åï¼å¥åºç¶æåæ¥
			3. å¦æéè´ç³è¯·æªæå®ä¾åºåï¼å®¡æ¹éè¿åéè¦æå¨éæ©ä¾åºåçæè®¢å

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,40 @@
			package cn.iocoder.yudao.module.erp.api.purchase;

			import cn.iocoder.yudao.framework.common.pojo.CommonResult;
			import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;

			import java.util.Collection;
			import java.util.List;

			/**
			* ERP ä¾åºå API æ¥å£
			*/
			public interface ErpSupplierApi {

			String PREFIX = "/rpc-api/erp/supplier";

			/**
			* è·åä¾åºå
			*
			* @param id ä¾åºåç¼å·
			* @return ä¾åºå
			*/
			CommonResult<ErpSupplierRespDTO> getSupplier(Long id);

			/**
			* æ ¡éªä¾åºååå¨
			*
			* @param id ä¾åºåç¼å·
			* @return ä¾åºå
			*/
			CommonResult<ErpSupplierRespDTO> validateSupplier(Long id);

			/**
			* è·åä¾åºååè¡¨
			*
			* @param ids ç¼å·åè¡¨
			* @return ä¾åºååè¡¨
			*/
			CommonResult<List<ErpSupplierRespDTO>> getSupplierList(Collection<Long> ids);

			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,48 @@
			package cn.iocoder.yudao.module.erp.api.purchase.dto;

			import lombok.Data;

			/**
			* ERP ä¾åºå Response DTO
			*/
			@Data
			public class ErpSupplierRespDTO {

			/**
			* ä¾åºåç¼å·
			*/
			private Long id;
			/**
			* ä¾åºååç§°
			*/
			private String name;
			/**
			* èç³»äºº
			*/
			private String contact;
			/**
			* ææºå·ç
			*/
			private String mobile;
			/**
			* èç³»çµè¯
			*/
			private String telephone;
			/**
			* çµåé®ç®±
			*/
			private String email;
			/**
			* å¼å¯ç¶æ
			*/
			private Integer status;
			/**
			* çº³ç¨äººè¯å«å·
			*/
			private String taxNo;
			/**
			* ç¨ç
			*/
			private java.math.BigDecimal taxPercent;

			}

			@@ -52,6 +52,13 @@
			<version>${revision}</version>
			</dependency>

			<!-- MES å¶é æ§è¡ç³»ç» API -->
			<dependency>
			<groupId>cn.iocoder.boot</groupId>
			<artifactId>yudao-module-mes-api</artifactId>
			<version>${revision}</version>
			</dependency>

			<!-- ä¸å¡ç»ä»¶ -->

			<!-- Web ç¸å³ -->

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,45 @@
			package cn.iocoder.yudao.module.erp.api.purchase;

			import cn.iocoder.yudao.framework.common.pojo.CommonResult;
			import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
			import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
			import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
			import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
			import jakarta.annotation.Resource;
			import org.springframework.stereotype.Service;
			import org.springframework.validation.annotation.Validated;

			import java.util.Collection;
			import java.util.List;

			import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

			/**
			* ERP ä¾åºå API å®ç°ç±»
			*/
			@Service
			@Validated
			public class ErpSupplierApiImpl implements ErpSupplierApi {

			@Resource
			private ErpSupplierService supplierService;

			@Override
			public CommonResult<ErpSupplierRespDTO> getSupplier(Long id) {
			ErpSupplierDO supplier = supplierService.getSupplier(id);
			return success(BeanUtils.toBean(supplier, ErpSupplierRespDTO.class));
			}

			@Override
			public CommonResult<ErpSupplierRespDTO> validateSupplier(Long id) {
			ErpSupplierDO supplier = supplierService.validateSupplier(id);
			return success(BeanUtils.toBean(supplier, ErpSupplierRespDTO.class));
			}

			@Override
			public CommonResult<List<ErpSupplierRespDTO>> getSupplierList(Collection<Long> ids) {
			List<ErpSupplierDO> list = supplierService.getSupplierList(ids);
			return success(BeanUtils.toBean(list, ErpSupplierRespDTO.class));
			}

			}

			@@ -148,6 +148,14 @@
			ExcelUtils.write(response, "éè´è®¢å.xls", "æ°æ®", ErpPurchaseOrderRespVO.class, list);
			}

			@PostMapping("/confirm-receipt")
			@Operation(summary = "ç¡®è®¤æ¶è´§")
			@Parameter(name = "id", description = "éè´è®¢åç¼å·", required = true)
			@PreAuthorize("@ss.hasPermission('erp:purchase-order:confirm-receipt')")
			public CommonResult<Long> confirmReceipt(@RequestParam("id") Long id) {
			return success(purchaseOrderService.confirmReceipt(id));
			}

			private PageResult<ErpPurchaseOrderRespVO> buildPurchaseOrderVOPageResult(PageResult<ErpPurchaseOrderDO> pageResult) {
			if (CollUtil.isEmpty(pageResult.getList())) {
			return PageResult.empty(pageResult.getTotal());

			@@ -43,6 +43,9 @@
			@Schema(description = "ä¾åºååç§°", example = "ä¾åºåA")
			private String supplierName;

			@Schema(description = "å®ééé¢", example = "1000.00")
			private BigDecimal depositPrice;

			@Schema(description = "åè®¡æ°é", requiredMode = Schema.RequiredMode.REQUIRED)
			private BigDecimal totalCount;

			@@ -113,6 +116,9 @@
			@Schema(description = "å¤æ³¨", example = "å¤æ³¨")
			private String remark;

			@Schema(description = "æ¯å¦éè¦æ¥ææ£éª", example = "true")
			private Boolean qcCheckFlag;

			}

			}

			@@ -30,6 +30,9 @@
			@Schema(description = "ä¼æ çï¼ç¾åæ¯", example = "10")
			private BigDecimal discountPercent;

			@Schema(description = "å®ééé¢", example = "1000.00")
			private BigDecimal depositPrice;

			@Schema(description = "éä»¶å°å", example = "https://xxx.com/xxx.pdf")
			private String fileUrl;

			@@ -72,6 +75,9 @@
			@Schema(description = "å¤æ³¨", example = "å¤æ³¨")
			private String remark;

			@Schema(description = "æ¯å¦éè¦æ¥ææ£éª", example = "true")
			private Boolean qcCheckFlag;

			@Schema(description = "äº§ååç§°ï¼åç«¯å±ç¤ºç¨ï¼åç«¯å¿½ç¥ï¼", example = "äº§åA")
			private String productName;

			@@ -35,6 +35,12 @@
			*/
			private Long orderId;
			/**
			* éè´ç³è¯·æç»ç¼å·
			*
			* å³è {@link ErpPurchaseRequestItemDO#getId()}
			*/
			private Long requestItemId;
			/**
			* ç©æç¼å·
			*
			* å³è {@link cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO#getId()}

			@@ -100,6 +100,11 @@
			private BigDecimal discountPrice;

			/**
			* å®ééé¢
			*/
			private BigDecimal depositPrice;

			/**
			* éä»¶å°å
			*/
			private String fileUrl;
			@@ -124,4 +129,13 @@
			*/
			private String orderNo;

			/**
			* å¥åºç¶æ
			*
			* 0: æªå¥åº
			* 1: é¨åå¥åº
			* 2: å¨é¨å¥åº
			*/
			private Integer inStatus;

			}

			@@ -78,4 +78,14 @@
			*/
			private String remark;

			/**
			* æ¯å¦éè¦æ¥ææ£éª
			*/
			private Boolean qcCheckFlag;

			/**
			* å¥åºæ°é
			*/
			private BigDecimal inCount;

			}

			@@ -28,6 +28,7 @@
			ErrorCode PURCHASE_ORDER_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_101_011, "éè´å®¡æ ¸åç±»ä¸åå¨ï¼è¯·åå¨BPMæ¨¡ååå»ºéè´å®¡æ ¸æµç¨åç±»");
			ErrorCode PURCHASE_ORDER_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_030_101_012, "éè´å®¡æ ¸åç±»ä¸æ²¡æå¯ç¨çæµç¨æ¨¡åï¼è¯·ååå»ºå¹¶åå¸æµç¨");
			ErrorCode PURCHASE_ORDER_SUBMIT_FAIL_STATUS = new ErrorCode(1_030_101_013, "æäº¤å®¡æ¹å¤±è´¥ï¼åªææªå®¡æ ¸ç¶æçéè´è®¢åæè½æäº¤");
			ErrorCode PURCHASE_ORDER_ALL_IN = new ErrorCode(1_030_101_014, "éè´è®¢åå·²å¨é¨å¥åºï¼æ éç¡®è®¤æ¶è´§");

			// ========== ERP éè´å¥åºï¼1-030-102-000ï¼ ==========
			ErrorCode PURCHASE_IN_NOT_EXISTS = new ErrorCode(1_030_102_000, "éè´å¥åºåä¸åå¨");

			@@ -160,4 +160,14 @@
			*/
			void updatePurchaseOrderInStatus(Long orderId);

			/**
			* ç¡®è®¤æ¶è´§
			*
			* çæå°è´§éç¥åï¼ç¶æä¸ºå¾å¥åº
			*
			* @param id éè´è®¢åç¼å·
			* @return å°è´§éç¥åç¼å·
			*/
			Long confirmReceipt(Long id);

			}

			@@ -16,15 +16,21 @@
			import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
			import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
			import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
			import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
			import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
			import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
			import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
			import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestItemMapper;
			import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestMapper;
			import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
			import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
			import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum;
			import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
			import cn.iocoder.yudao.module.mes.api.arrivalnotice.MesArrivalNoticeApi;
			import jakarta.annotation.Resource;
			import lombok.extern.slf4j.Slf4j;
			import org.flowable.engine.repository.ProcessDefinition;
			import org.springframework.context.annotation.Lazy;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.validation.annotation.Validated;
			@@ -70,6 +76,15 @@
			private BpmCategoryService bpmCategoryService;
			@Resource
			private BpmProcessDefinitionService bpmProcessDefinitionService;

			@Resource
			@Lazy
			private MesArrivalNoticeApi arrivalNoticeApi;

			@Resource
			private ErpPurchaseRequestItemMapper purchaseRequestItemMapper;
			@Resource
			private ErpPurchaseRequestMapper purchaseRequestMapper;

			@Override
			@Transactional(rollbackFor = Exception.class)
			@@ -436,6 +451,51 @@
			// 4. æ´æ°éè´è®¢åå¥åºç¶æ
			purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
			.setId(orderId).setInStatus(inStatus));

			// 5. ååéè´ç³è¯·æç»çå¥åºæ°éåéè´ç³è¯·çå¥åºç¶æ
			updatePurchaseRequestInStatus(items, inStatus);
			}

			/**
			* ååéè´ç³è¯·å¥åºæ°éåå¥åºç¶æ
			*
			* @param orderItems éè´è®¢åæç»åè¡¨
			* @param orderInStatus éè´è®¢åå¥åºç¶æ
			*/
			private void updatePurchaseRequestInStatus(List<ErpPurchaseOrderItemDO> orderItems, int orderInStatus) {
			// è·åææå³èçéè´ç³è¯·æç» ID
			Set<Long> requestItemIds = new HashSet<>();
			for (ErpPurchaseOrderItemDO item : orderItems) {
			if (item.getRequestItemId() != null) {
			requestItemIds.add(item.getRequestItemId());
			}
			}
			if (requestItemIds.isEmpty()) {
			return;
			}

			// æ´æ°éè´ç³è¯·æç»çå¥åºæ°é
			for (ErpPurchaseOrderItemDO orderItem : orderItems) {
			if (orderItem.getRequestItemId() != null && orderItem.getInCount() != null) {
			purchaseRequestItemMapper.updateById(new ErpPurchaseRequestItemDO()
			.setId(orderItem.getRequestItemId())
			.setInCount(orderItem.getInCount()));
			}
			}

			// è·åéè´ç³è¯·æç»ï¼æ¾å°å¯¹åºçéè´ç³è¯· ID
			List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectBatchIds(requestItemIds);
			if (CollUtil.isEmpty(requestItems)) {
			return;
			}
			Set<Long> requestIds = convertSet(requestItems, ErpPurchaseRequestItemDO::getRequestId);

			// æ´æ°éè´ç³è¯·çå¥åºç¶æ
			for (Long requestId : requestIds) {
			purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
			.setId(requestId)
			.setInStatus(orderInStatus));
			}
			}

			/**
			@@ -469,4 +529,22 @@
			}
			}

			@Override
			@Transactional(rollbackFor = Exception.class)
			public Long confirmReceipt(Long id) {
			// 1. æ ¡éªéè´è®¢ååå¨ä¸å·²å®¡æ ¸
			ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrder(id);

			// 2. æ ¡éªéè´è®¢åæªå¨é¨å¥åº
			if (ErpPurchaseOrderInStatusEnum.ALL_IN.getStatus().equals(purchaseOrder.getInStatus())) {
			throw exception(PURCHASE_ORDER_ALL_IN);
			}

			// 3. è°ç¨ MES æ¥å£çæå°è´§éç¥å
			Long arrivalNoticeId = arrivalNoticeApi.generateArrivalNoticeFromPurchaseOrder(id);
			log.info("[confirmReceipt] éè´è®¢å({}) ç¡®è®¤æ¶è´§ï¼çæå°è´§éç¥å({})", id, arrivalNoticeId);

			return arrivalNoticeId;
			}

			}

			@@ -309,6 +309,19 @@
			purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
			.setId(id).setStatus(newStatus));
			}

			// 3. å®¡æ¹éè¿ä¸æä¾åºåï¼èªå¨çæéè´è®¢å
			if (ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(newStatus)
			&& purchaseRequest.getSupplierId() != null
			&& purchaseRequest.getOrderId() == null) {
			try {
			Long orderId = doGeneratePurchaseOrder(purchaseRequest);
			log.info("[updatePurchaseRequestAuditStatus] éè´ç³è¯·({}) èªå¨çæéè´è®¢å({})", id, orderId);
			} catch (Exception e) {
			log.error("[updatePurchaseRequestAuditStatus] éè´ç³è¯·({}) èªå¨çæéè´è®¢åå¤±è´¥", id, e);
			// ä¸æåºå¼å¸¸ï¼é¿åå½±åç¶ææ´æ°
			}
			}
			}

			@Override
			@@ -326,23 +339,37 @@
			// 3. æ ¡éªä¾åºå
			supplierService.validateSupplier(supplierId);

			// 4. è·åç³è¯·æç»
			// 4. è®¾ç½®ä¾åºåå¹¶çæè®¢å
			purchaseRequest.setSupplierId(supplierId);
			return doGeneratePurchaseOrder(purchaseRequest);
			}

			/**
			* æ§è¡çæéè´è®¢å
			*
			* @param purchaseRequest éè´ç³è¯·ï¼éåå« supplierIdï¼
			* @return éè´è®¢å ID
			*/
			private Long doGeneratePurchaseOrder(ErpPurchaseRequestDO purchaseRequest) {
			Long id = purchaseRequest.getId();

			// 1. è·åç³è¯·æç»
			List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectListByRequestId(id);
			if (CollUtil.isEmpty(requestItems)) {
			throw exception(PURCHASE_REQUEST_NOT_EXISTS);
			}

			// 5. çæéè´è®¢åå·
			// 2. çæéè´è®¢åå·
			String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
			if (purchaseOrderMapper.selectByNo(orderNo) != null) {
			throw exception(PURCHASE_ORDER_NO_EXISTS);
			}

			// 6. åå»ºéè´è®¢å
			// 3. åå»ºéè´è®¢å
			ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
			purchaseOrder.setNo(orderNo);
			purchaseOrder.setStatus(ErpAuditStatus.APPROVE.getStatus()); // éè´è®¢åç´æ¥ä¸ºå·²å®¡æ ¸ç¶æ
			purchaseOrder.setSupplierId(supplierId);
			purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
			purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
			purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
			purchaseOrder.setTotalPrice(purchaseRequest.getTotalPrice());
			@@ -350,15 +377,17 @@
			purchaseOrder.setTotalTaxPrice(purchaseRequest.getTotalTaxPrice());
			purchaseOrder.setDiscountPercent(purchaseRequest.getDiscountPercent());
			purchaseOrder.setDiscountPrice(purchaseRequest.getDiscountPrice());
			purchaseOrder.setDepositPrice(purchaseRequest.getDepositPrice() != null ? purchaseRequest.getDepositPrice() : BigDecimal.ZERO);
			purchaseOrder.setRemark(purchaseRequest.getRemark());
			purchaseOrder.setInCount(BigDecimal.ZERO);
			purchaseOrder.setInStatus(0);
			purchaseOrderMapper.insert(purchaseOrder);

			// 7. åå»ºéè´è®¢åæç»
			// 4. åå»ºéè´è®¢åæç»
			List<ErpPurchaseOrderItemDO> orderItems = convertList(requestItems, item -> {
			ErpPurchaseOrderItemDO orderItem = new ErpPurchaseOrderItemDO();
			orderItem.setOrderId(purchaseOrder.getId());
			orderItem.setRequestItemId(item.getId()); // å³èéè´ç³è¯·æç»
			orderItem.setProductId(item.getProductId());
			orderItem.setProductUnitId(item.getProductUnitId());
			orderItem.setProductPrice(item.getProductPrice());
			@@ -368,12 +397,12 @@
			orderItem.setTaxPrice(item.getTaxPrice());
			orderItem.setRemark(item.getRemark());
			orderItem.setInCount(BigDecimal.ZERO);
			orderItem.setQcCheckFlag(false); // é»è®¤ä¸éè¦è´¨æ£
			orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : false);
			return orderItem;
			});
			purchaseOrderItemMapper.insertBatch(orderItems);

			// 8. æ´æ°éè´ç³è¯·çè®¢åä¿¡æ¯
			// 5. æ´æ°éè´ç³è¯·çè®¢åä¿¡æ¯
			purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
			.setId(id)
			.setOrderId(purchaseOrder.getId())

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,51 @@
			package cn.iocoder.yudao.module.erp.service.purchase.listener;

			import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
			import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseRequestService;
			import jakarta.annotation.Resource;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.stereotype.Component;

			/**
			* éè´ç³è¯·å®¡æ¹ç¶æçå¬å¨
			*
			* çå¬ BPM æµç¨å®ä¾ç¶æåæ´äºä»¶ï¼æ´æ°éè´ç³è¯·çå®¡æ¹ç¶æ
			*/
			@Component
			@Slf4j
			public class ErpPurchaseRequestStatusListener extends cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener {

			/**
			* éè´ç³è¯·å®¡æ¹æµç¨å®ä¹ Key
			*/
			private static final String PROCESS_DEFINITION_KEY = "purchase_request_approve";

			@Resource
			private ErpPurchaseRequestService purchaseRequestService;

			@Override
			protected String getProcessDefinitionKey() {
			return PROCESS_DEFINITION_KEY;
			}

			@Override
			protected void onEvent(BpmProcessInstanceStatusEvent event) {
			Long requestId;
			try {
			requestId = Long.parseLong(event.getBusinessKey());
			} catch (NumberFormatException e) {
			log.warn("[onEvent] businessKey({}) ä¸æ¯ææçéè´ç³è¯·ç¼å·", event.getBusinessKey());
			return;
			}

			log.info("[onEvent] æ¶å°BPMå®¡æ¹äºä»¶ï¼requestId={}, status={}", requestId, event.getStatus());

			try {
			purchaseRequestService.updatePurchaseRequestAuditStatus(requestId, event.getStatus());
			log.info("[onEvent] éè´ç³è¯·({}) å®¡æ¹ç¶ææ´æ°å®æ", requestId);
			} catch (Exception e) {
			log.error("[onEvent] æ´æ°éè´ç³è¯·å®¡æ¹ç¶æå¤±è´¥ï¼requestId={}", requestId, e);
			}
			}

			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,16 @@
			package cn.iocoder.yudao.module.mes.api.arrivalnotice;

			/**
			* MES å°è´§éç¥å API æ¥å£
			*/
			public interface MesArrivalNoticeApi {

			/**
			* æ ¹æ®éè´è®¢åçæå°è´§éç¥åï¼å¾å¥åºç¶æï¼
			*
			* @param purchaseOrderId éè´è®¢åç¼å·
			* @return çæçå°è´§éç¥åç¼å·
			*/
			Long generateArrivalNoticeFromPurchaseOrder(Long purchaseOrderId);

			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,21 @@
			package cn.iocoder.yudao.module.mes.api.arrivalnotice;

			import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
			import jakarta.annotation.Resource;
			import org.springframework.stereotype.Service;

			/**
			* MES å°è´§éç¥å API å®ç°ç±»
			*/
			@Service
			public class MesArrivalNoticeApiImpl implements MesArrivalNoticeApi {

			@Resource
			private MesWmArrivalNoticeService arrivalNoticeService;

			@Override
			public Long generateArrivalNoticeFromPurchaseOrder(Long purchaseOrderId) {
			return arrivalNoticeService.generateArrivalNoticeFromPurchaseOrder(purchaseOrderId);
			}

			}

			@@ -11,12 +11,12 @@
			import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticePageReqVO;
			import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeRespVO;
			import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeSaveReqVO;
			import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
			import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
			import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
			import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
			import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
			import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
			import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
			import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
			import io.swagger.v3.oas.annotations.Operation;
			import io.swagger.v3.oas.annotations.Parameter;
			import io.swagger.v3.oas.annotations.tags.Tag;
			@@ -45,7 +45,7 @@
			@Resource
			private MesWmArrivalNoticeService arrivalNoticeService;
			@Resource
			private MesMdVendorService vendorService;
			private ErpSupplierApi supplierApi;
			@Resource
			private ErpPurchaseOrderApi purchaseOrderApi;

			@@ -129,9 +129,10 @@
			if (CollUtil.isEmpty(list)) {
			return Collections.emptyList();
			}
			// 1. è·å¾å³èæ°æ®
			Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
			convertSet(list, MesWmArrivalNoticeDO::getVendorId));
			// 1. è·å¾ä¾åºåä¿¡æ¯ï¼ERP éè´ä¾åºåï¼
			Map<Long, ErpSupplierRespDTO> supplierMap = supplierApi.getSupplierList(
			convertSet(list, MesWmArrivalNoticeDO::getVendorId)).getCheckedData().stream()
			.collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, v -> v, (a, b) -> a));
			// 2. è·å¾éè´è®¢åä¿¡æ¯
			List<Long> purchaseOrderIds = list.stream()
			.map(MesWmArrivalNoticeDO::getPurchaseOrderId)
			@@ -143,8 +144,8 @@
			.collect(java.util.stream.Collectors.toMap(ErpPurchaseOrderRespDTO::getId, v -> v, (a, b) -> a));
			// 3. æå»ºç»æ
			return BeanUtils.toBean(list, MesWmArrivalNoticeRespVO.class, vo -> {
			MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor ->
			vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()));
			MapUtils.findAndThen(supplierMap, vo.getVendorId(), supplier ->
			vo.setVendorName(supplier.getName()));
			MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder ->
			vo.setPurchaseOrderNo(purchaseOrder.getNo()));
			});

			@@ -11,14 +11,14 @@
			import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
			import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptRespVO;
			import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO;
			import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
			import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO;
			import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
			import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
			import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
			import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
			import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
			import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
			import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
			import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
			import io.swagger.v3.oas.annotations.Operation;
			import io.swagger.v3.oas.annotations.Parameter;
			import io.swagger.v3.oas.annotations.tags.Tag;
			@@ -47,7 +47,7 @@
			@Resource
			private MesWmItemReceiptService itemReceiptService;
			@Resource
			private MesMdVendorService vendorService;
			private ErpSupplierApi supplierApi;
			@Resource
			private MesQcIqcService iqcService;
			@Resource
			@@ -171,17 +171,18 @@
			if (CollUtil.isEmpty(list)) {
			return Collections.emptyList();
			}
			// 1. è·å¾å³èæ°æ®
			Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
			convertSet(list, MesWmItemReceiptDO::getVendorId));
			// 1. è·å¾å³èæ°æ®ï¼éè´å¥åºä½¿ç¨ ERP ä¾åºåï¼
			Map<Long, ErpSupplierRespDTO> supplierMap = supplierApi.getSupplierList(
			convertSet(list, MesWmItemReceiptDO::getVendorId)).getCheckedData().stream()
			.collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, v -> v, (a, b) -> a));
			Map<Long, MesQcIqcDO> iqcMap = iqcService.getIqcMap(
			convertSet(list, MesWmItemReceiptDO::getIqcId));
			Map<Long, MesWmArrivalNoticeDO> noticeMap = arrivalNoticeService.getArrivalNoticeMap(
			convertSet(list, MesWmItemReceiptDO::getNoticeId));
			// 2. æå»ºç»æ
			return BeanUtils.toBean(list, MesWmItemReceiptRespVO.class, vo -> {
			MapUtils.findAndThen(vendorMap, vo.getVendorId(),
			vendor -> vo.setVendorName(vendor.getName()));
			MapUtils.findAndThen(supplierMap, vo.getVendorId(),
			supplier -> vo.setVendorName(supplier.getName()));
			MapUtils.findAndThen(iqcMap, vo.getIqcId(),
			iqc -> vo.setIqcCode(iqc.getCode()));
			MapUtils.findAndThen(noticeMap, vo.getNoticeId(), notice ->

			@@ -64,6 +64,15 @@
			* å³è {@link MesQcIqcDO#getId()}
			*/
			private Long iqcId;

			/**
			* è´¨æ£ç»æ
			*
			* æä¸¾ {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum}
			* 1-åæ ¼ 2-ç¹é 3-ä¸åæ ¼éè´§ 4-ä¸åæ ¼æ¥åº
			*/
			private Integer iqcCheckResult;

			/**
			* å¤æ³¨
			*/

			@@ -32,4 +32,8 @@
			return selectCount(MesWmArrivalNoticeDO::getVendorId, vendorId);
			}

			default MesWmArrivalNoticeDO selectByPurchaseOrderId(Long purchaseOrderId) {
			return selectOne(MesWmArrivalNoticeDO::getPurchaseOrderId, purchaseOrderId);
			}

			}

			@@ -36,4 +36,8 @@
			return selectList(MesWmItemReceiptDO::getVendorId, vendorId);
			}

			default MesWmItemReceiptDO selectByNoticeId(Long noticeId) {
			return selectOne(MesWmItemReceiptDO::getNoticeId, noticeId);
			}

			}

			@@ -31,6 +31,10 @@
			return selectOne(MesWmProductSalesDO::getCode, code);
			}

			default MesWmProductSalesDO selectByNoticeId(Long noticeId) {
			return selectOne(MesWmProductSalesDO::getNoticeId, noticeId);
			}

			default List<MesWmProductSalesDO> selectListByClientId(Long clientId) {
			return selectList(MesWmProductSalesDO::getClientId, clientId);
			}

			@@ -27,4 +27,8 @@
			return selectOne(MesWmSalesNoticeDO::getCode, code);
			}

			default MesWmSalesNoticeDO selectBySaleOrderId(Long saleOrderId) {
			return selectOne(MesWmSalesNoticeDO::getSaleOrderId, saleOrderId);
			}

			}

			@@ -341,6 +341,7 @@
			ErrorCode QC_IQC_NOT_PREPARE = new ErrorCode(1_040_603_002, "åªæèç¨¿ç¶æçæ£éªåæå¯æä½");
			ErrorCode QC_IQC_QUANTITY_MISMATCH = new ErrorCode(1_040_603_004, "åæ ¼åä¸ä¸åæ ¼åæ°éä¹åé¡»çäºæ£æµæ°é");
			ErrorCode QC_NO_TEMPLATE = new ErrorCode(1_040_603_005, "å½åäº§åæªéç½®æ£æµæ¨¡æ¿");
			ErrorCode QC_NO_TEMPLATE_FOR_ITEM = new ErrorCode(1_040_603_008, "ç©æã{}ãæªéç½® IQC æ£æµæ¨¡æ¿ï¼è¯·åå¨è´¨éç®¡çä¸éç½®");
			ErrorCode QC_IQC_SOURCE_DOC_PARAMS_MISSING = new ErrorCode(1_040_603_006, "æ¥æºåæ®ç±»åéç©ºæ¶ï¼æ¥æºåæ® ID åæ¥æºåæ®è¡ ID ä¸è½ä¸ºç©º");
			ErrorCode QC_IQC_CHECK_RESULT_EMPTY = new ErrorCode(1_040_603_007, "å®ææ£éªååï¼æ£æµç»æå¿é¡»å¡«å");
			// ========== MES è´¨éç®¡ç-æ¥ææ£éªè¡ï¼1-040-603-100ï¼ ==========
			@@ -451,6 +452,7 @@
			ErrorCode WM_ARRIVAL_NOTICE_IQC_PENDING = new ErrorCode(1_040_704_005, "åå¨å¾æ£éªè¡ï¼æ æ³å®¡æ¹éè¿");
			ErrorCode WM_ARRIVAL_NOTICE_NO_LINE = new ErrorCode(1_040_704_006, "è³å°éè¦ä¸æ¡è¡é¡¹ç®");
			ErrorCode WM_ARRIVAL_NOTICE_VENDOR_MISMATCH = new ErrorCode(1_040_704_007, "å°è´§éç¥åçä¾åºåä¸å½ååæ®ä¸ä¸è´");
			ErrorCode WM_ARRIVAL_NOTICE_ALREADY_EXISTS = new ErrorCode(1_040_704_008, "è¯¥éè´è®¢åå·²çæå°è´§éç¥åï¼ä¸è½éå¤çæ");
			ErrorCode WM_ARRIVAL_NOTICE_LINE_NOT_EXISTS = new ErrorCode(1_040_704_100, "å°è´§éç¥åè¡ä¸åå¨");
			ErrorCode WM_ARRIVAL_NOTICE_LINE_NOT_MATCH = new ErrorCode(1_040_704_101, "å°è´§éç¥åè¡ä¸å±äºæå®çå°è´§éç¥å");

			@@ -462,7 +464,8 @@
			ErrorCode WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_705_004, "æç»ä¸æ¶æ»æ°ä¸è¡å¥åºæ°éä¸å¹é");
			ErrorCode WM_ITEM_RECEIPT_STATUS_ERROR = new ErrorCode(1_040_705_005, "å¥åºåç¶æä¸æ£ç¡®");
			ErrorCode WM_ITEM_RECEIPT_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_705_006, "å·²å®ææå·²åæ¶çå¥åºåä¸åè®¸åæ¶");
			ErrorCode WM_PURCHASE_ORDER_NOT_EXISTS = new ErrorCode(1_040_705_007, "éè´è®¢åä¸åå¨");
			ErrorCode WM_ITEM_RECEIPT_ALREADY_EXISTS = new ErrorCode(1_040_705_007, "è¯¥å°è´§éç¥åå·²çæå¥åºåï¼ä¸è½éå¤çæ");
			ErrorCode WM_PURCHASE_ORDER_NOT_EXISTS = new ErrorCode(1_040_705_008, "éè´è®¢åä¸åå¨");
			ErrorCode WM_PURCHASE_ORDER_NO_ITEM = new ErrorCode(1_040_705_008, "éè´è®¢åæ æç»æ°æ®");
			ErrorCode WM_ITEM_RECEIPT_LINE_NOT_EXISTS = new ErrorCode(1_040_705_100, "éè´å¥åºåè¡ä¸åå¨");
			ErrorCode WM_ITEM_RECEIPT_LINE_ARRIVAL_NOTICE_LINE_REQUIRED = new ErrorCode(1_040_705_101,
			@@ -471,6 +474,7 @@
			"å¥åºåæªå³èå°è´§éç¥åï¼ä¸è½éæ©å°è´§éç¥åè¡");
			ErrorCode WM_ITEM_RECEIPT_DETAIL_NOT_EXISTS = new ErrorCode(1_040_705_200, "éè´å¥åºæç»ä¸åå¨");
			ErrorCode WM_ITEM_RECEIPT_DETAIL_QUANTITY_EXCEED = new ErrorCode(1_040_705_202, "ä¸æ¶æç»æ»æ°éä¸è½è¶è¿è¡å¥åºæ°é");
			ErrorCode WM_ITEM_RECEIPT_BATCH_REQUIRED = new ErrorCode(1_040_705_203, "ç©æã{}-{}ãå·²å¼å¯æ¹æ¬¡ç®¡çï¼ä¸æ¶æç»çæ¹æ¬¡å·ä¸è½ä¸ºç©º");

			// ========== MES ä»åºç®¡ç-é¢æç³è¯·åï¼1-040-706-000ï¼ ==========
			ErrorCode WM_MATERIAL_REQUEST_NOT_EXISTS = new ErrorCode(1_040_706_000, "é¢æç³è¯·åä¸åå¨");
			@@ -635,8 +639,9 @@
			ErrorCode WM_PRODUCT_SALES_CANNOT_FINISH = new ErrorCode(1_040_714_007, "å½åç¶æä¸åè®¸æ§è¡åºåº");
			ErrorCode WM_PRODUCT_SALES_CANNOT_CANCEL = new ErrorCode(1_040_714_008, "å½åç¶æä¸åè®¸åæ¶");
			ErrorCode WM_PRODUCT_SALES_CANNOT_CONFIRM = new ErrorCode(1_040_714_009, "å½åç¶æä¸åè®¸ç¡®è®¤æ£éªéè¿");
			ErrorCode WM_PRODUCT_SALES_ALREADY_EXISTS = new ErrorCode(1_040_714_010, "è¯¥åè´§éç¥åå·²çæéå®åºåºåï¼ä¸è½éå¤çæ");
			ErrorCode WM_PRODUCT_SALES_DETAILS_EMPTY = new ErrorCode(1_040_714_020, "æ£è´§æç»ä¸è½ä¸ºç©º");
			ErrorCode WM_PRODUCT_SALES_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_714_010, "æ£è´§æ°éä¸åºåºæ°éä¸å¹é");
			ErrorCode WM_PRODUCT_SALES_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_714_011, "æ£è´§æ°éä¸åºåºæ°éä¸å¹é");
			ErrorCode WM_PRODUCT_SALES_LINE_NOT_EXISTS = new ErrorCode(1_040_714_011, "éå®åºåºåè¡ä¸åå¨");
			ErrorCode WM_PRODUCT_SALES_DETAIL_NOT_EXISTS = new ErrorCode(1_040_714_012, "éå®åºåºæç»ä¸åå¨");
			ErrorCode WM_PRODUCT_SALES_STOCK_INSUFFICIENT = new ErrorCode(1_040_714_013, "åºåä¸è¶³ï¼æ æ³æ£è´§");
			@@ -690,6 +695,7 @@
			ErrorCode WM_SALES_NOTICE_LINE_NOT_MATCH = new ErrorCode(1_040_720_012, "åè´§éç¥åè¡ä¸å±äºæå®çåè´§éç¥å");
			ErrorCode WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS = new ErrorCode(1_040_720_013, "éå®è®¢åä¸åå¨");
			ErrorCode WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY = new ErrorCode(1_040_720_014, "éå®è®¢åæç»ä¸ºç©º");
			ErrorCode WM_SALES_NOTICE_ALREADY_EXISTS = new ErrorCode(1_040_720_015, "è¯¥éå®è®¢åå·²çæåè´§éç¥åï¼ä¸è½éå¤çæ");

			// ========== MES ä»åºç®¡ç-æ¡ç éç½®ï¼1-040-730-000ï¼ ==========
			ErrorCode WM_BARCODE_CONFIG_NOT_EXISTS = new ErrorCode(1_040_730_000, "æ¡ç éç½®ä¸åå¨");

			@@ -8,15 +8,15 @@

			/**
			* MES æ£æµç»ææä¸¾
			*
			* @author èéæºç
			*/
			@Getter
			@AllArgsConstructor
			public enum MesQcCheckResultEnum implements ArrayValuable<Integer> {

			PASS(1, "æ£éªéè¿"),
			FAIL(2, "æ£éªä¸éè¿");
			QUALIFIED(1, "åæ ¼"),
			SPECIAL_APPROVAL(2, "ç¹é"),
			RETURN(3, "ä¸åæ ¼éè´§"),
			SCRAP(4, "ä¸åæ ¼æ¥åº");

			public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesQcCheckResultEnum::getType).toArray(Integer[]::new);

			@@ -34,4 +34,14 @@
			return ARRAYS;
			}

			/**
			* å¤ææ¯å¦å¯ä»¥å¥åº
			*
			* @param type æ£æµç»æ
			* @return true å¯ä»¥å¥åº
			*/
			public static boolean canInbound(Integer type) {
			return QUALIFIED.getType().equals(type) \|\| SPECIAL_APPROVAL.getType().equals(type);
			}

			}