From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 205 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 187 insertions(+), 18 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
index a3b6619..1e28b1d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
@@ -6,6 +6,9 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
@@ -60,6 +63,11 @@
*/
private static final String PURCHASE_REQUEST_APPROVE_BIZ_TYPE = "purchase_request_approve";
+ /**
+ * 閲囪喘鐢宠瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String PURCHASE_REQUEST_PROCESS_KEY = "purchase_request_approve";
+
@Resource
private ErpPurchaseRequestMapper purchaseRequestMapper;
@Resource
@@ -86,6 +94,9 @@
@Resource
private ApprovalConfigApi approvalConfigApi;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private AdminUserApi adminUserApi;
@@ -120,6 +131,10 @@
.setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus())
.setRequestUserId(userId)
.setRequestDeptId(deptId));
+ // 鍏煎鏃у鎴风鏈紶瀹氶噾鐨勬儏鍐碉紝鏁版嵁搴撲笌涓氬姟灞傜粺涓�鎸� 0 澶勭悊
+ if (purchaseRequest.getDepositPrice() == null) {
+ purchaseRequest.setDepositPrice(BigDecimal.ZERO);
+ }
calculateTotalPrice(purchaseRequest, requestItems);
purchaseRequestMapper.insert(purchaseRequest);
@@ -148,6 +163,9 @@
// 4. 鏇存柊鐢宠鍗�
ErpPurchaseRequestDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseRequestDO.class);
+ if (updateObj.getDepositPrice() == null) {
+ updateObj.setDepositPrice(BigDecimal.ZERO);
+ }
calculateTotalPrice(updateObj, requestItems);
purchaseRequestMapper.updateById(updateObj);
@@ -272,6 +290,11 @@
if (purchaseRequestMapper.submitAndResetAuditInfo(id, ErpPurchaseRequestStatusEnum.PROCESS.getStatus()) != 1) {
throw exception(PURCHASE_REQUEST_SUBMIT_FAIL_NOT_ALLOWED);
}
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(PURCHASE_REQUEST_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -331,6 +354,53 @@
}
AdminUserRespDTO user = adminUserApi.getUser(userId);
return user == null ? null : user.getNickname();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseRequestAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // 1. BPM 瀹℃壒缁撴灉鏄犲皠涓洪噰璐敵璇风姸鎬侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer newStatus = convertBpmResultToStatus(bpmStatus);
+ if (newStatus == null) {
+ return;
+ }
+ // 2. 浠呭綋浠嶅浜庛�屽鎵逛腑銆嶆椂鍥炲啓锛岄伩鍏嶉噸澶嶈鐩�
+ if (purchaseRequestMapper.updateAuditStatusByBpm(id, newStatus, reason) != 1) {
+ log.warn("[updatePurchaseRequestAuditStatus] 閲囪喘鐢宠({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ return;
+ }
+ // 3. 瀹℃壒閫氳繃涓旀湁渚涘簲鍟嗐�佹湭鐢熸垚璁㈠崟鏃讹紝鑷姩鐢熸垚閲囪喘璁㈠崟
+ if (!ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(newStatus)) {
+ return;
+ }
+ ErpPurchaseRequestDO purchaseRequest = purchaseRequestMapper.selectById(id);
+ if (purchaseRequest == null || purchaseRequest.getSupplierId() == null
+ || purchaseRequest.getOrderId() != null) {
+ return;
+ }
+ try {
+ Long orderId = doGeneratePurchaseOrder(purchaseRequest);
+ log.info("[updatePurchaseRequestAuditStatus] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟({})", id, orderId);
+ } catch (Exception e) {
+ // 涓嶆姏鍑哄紓甯革紝閬垮厤褰卞搷瀹℃壒缁撴灉钀藉簱锛涚敓鎴愬け璐ュ彲鐢辩敤鎴锋墜鍔ㄨЕ鍙�
+ log.error("[updatePurchaseRequestAuditStatus] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟澶辫触", id, e);
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓洪噰璐敵璇风姸鎬�
+ */
+ private Integer convertBpmResultToStatus(Integer bpmStatus) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ return ErpPurchaseRequestStatusEnum.APPROVE.getStatus();
+ }
+ if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ return ErpPurchaseRequestStatusEnum.REJECT.getStatus();
+ }
+ if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ return ErpPurchaseRequestStatusEnum.CANCEL.getStatus();
+ }
+ return null;
}
@Override
@@ -452,18 +522,48 @@
@Override
public ErpPurchaseRequestImportRespVO importPurchaseRequestList(List<ErpPurchaseRequestImportExcelVO> importRequests,
ErpPurchaseRequestImportReqVO importReqVO) {
- // 1. 鏍￠獙闈炵┖锛堣繃婊ゅ畬鍏ㄧ┖鐧界殑琛岋級
- importRequests = filterList(importRequests, item -> StrUtil.isNotBlank(item.getProductCode()));
+ if (Boolean.TRUE.equals(importReqVO.getUpdateSupport())) throw exception(PURCHASE_REQUEST_IMPORT_INVALID, "浠呮敮鎸佹柊澧烇紝涓嶆敮鎸佽鐩�");
if (CollUtil.isEmpty(importRequests)) {
throw exception(PURCHASE_REQUEST_IMPORT_LIST_IS_EMPTY);
}
+
+ // 1. 閫愯鍒嗙被锛氭湁鏁堣 / 琚烦杩囩殑琛屻��
+ // 杩欓噷涓嶅啀鐢� filterList 闈欓粯涓㈠純銆岀墿鏂欑紪鐮佷负绌恒�嶇殑琛� 鈥斺�� 閭ｄ細璁╃敤鎴风湅鍒般�屽鍏ユ垚鍔熴��
+ // 浣嗘暟鎹棤澹版秷澶便�傝璺宠繃鐨勮蹇呴』甯� Excel 鍘熷琛屽彿杩斿洖缁欏墠绔��
+ ErpPurchaseRequestImportRespVO respVO = ErpPurchaseRequestImportRespVO.builder()
+ .createPurchaseRequestNos(new ArrayList<>())
+ .failurePurchaseRequestNos(new LinkedHashMap<>())
+ .skippedRows(new LinkedHashMap<>())
+ .build();
+ List<ImportRow> validRows = new ArrayList<>();
+ for (int i = 0; i < importRequests.size(); i++) {
+ ErpPurchaseRequestImportExcelVO row = importRequests.get(i);
+ int excelRowNo = i + 2; // +1 杞� 1 鍩猴紝+1 璺宠繃琛ㄥご
+ String rowLabel = "绗�" + excelRowNo + "琛�";
+ // 1.1 瀹屽叏绌虹櫧鐨勮锛堟墍鏈夊垪閮芥病鏈夊�硷級锛欵xcel 甯稿湪鏈熬鐣欑┖琛岋紝闈欓粯璺宠繃鍗冲彲
+ if (isBlankRow(row)) {
+ continue;
+ }
+ validRows.add(new ImportRow(excelRowNo, row));
+ }
+ respVO.setTotalRows(validRows.size() + respVO.getSkippedRows().size());
+ if (CollUtil.isEmpty(validRows)) {
+ // 娌℃湁浠讳綍涓�琛屽彲瀵煎叆锛氱洿鎺ユ姤閿欍��
+ // 鑻ユ槸鏈夎鍥犮�岀墿鏂欑紪鐮佷负绌恒�嶈璺宠繃锛屽紓甯镐俊鎭噷甯︿笂琛屽彿锛屽府鍔╃敤鎴峰畾浣嶃��
+ if (CollUtil.isNotEmpty(respVO.getSkippedRows())) {
+ throw exception(PURCHASE_REQUEST_IMPORT_ALL_ROWS_SKIPPED,
+ String.join("銆�", respVO.getSkippedRows().keySet()));
+ }
+ throw exception(PURCHASE_REQUEST_IMPORT_LIST_IS_EMPTY);
+ }
+
// 2. 鎸夈�屽崟鍙枫�嶅垎缁勶細鐩稿悓鍗曞彿鐨勫琛屽悎骞舵垚涓�寮犻噰璐敵璇凤紱鍗曞彿涓虹┖鏃舵瘡琛屽悇鑷垚涓�寮犵敵璇�
- List<List<ErpPurchaseRequestImportExcelVO>> groups = new ArrayList<>();
+ List<List<ImportRow>> groups = new ArrayList<>();
Map<String, Integer> groupIndexMap = new LinkedHashMap<>();
- int rowIndex = 0;
- for (ErpPurchaseRequestImportExcelVO row : importRequests) {
- rowIndex++;
- String groupKey = StrUtil.isNotBlank(row.getNo()) ? row.getNo() : ("__row_" + rowIndex);
+ for (ImportRow row : validRows) {
+ String no = row.data.getNo();
+ if (StrUtil.isBlank(no)) { groups.add(new ArrayList<>(Collections.singletonList(row))); continue; }
+ String groupKey = no.trim();
Integer index = groupIndexMap.get(groupKey);
if (index == null) {
index = groups.size();
@@ -472,33 +572,99 @@
}
groups.get(index).add(row);
}
+
// 3. 閫愮粍鍚堝苟鍒涘缓閲囪喘鐢宠
- ErpPurchaseRequestImportRespVO respVO = ErpPurchaseRequestImportRespVO.builder()
- .createPurchaseRequestNos(new ArrayList<>())
- .failurePurchaseRequestNos(new LinkedHashMap<>())
- .build();
- for (List<ErpPurchaseRequestImportExcelVO> group : groups) {
- String groupKey = StrUtil.isNotBlank(group.get(0).getNo()) ? group.get(0).getNo()
- : "绗�" + (importRequests.indexOf(group.get(0)) + 1) + "琛�";
+ for (List<ImportRow> group : groups) {
+ ImportRow firstRow = group.get(0);
+ // 澶辫触/璺宠繃鐨勬爣璇嗕紭鍏堢敤鍗曞彿锛屾病鏈夊崟鍙峰垯鐢� Excel 閲岀殑鐪熷疄琛屽彿
+ String groupKey = StrUtil.isNotBlank(firstRow.data.getNo())
+ ? firstRow.data.getNo() : "绗�" + firstRow.excelRowNo + "琛�";
try {
- ErpPurchaseRequestSaveReqVO createReqVO = buildPurchaseRequestImportSaveReqVO(group);
- Long requestId = createPurchaseRequest(createReqVO);
+ Long requestId = cn.hutool.extra.spring.SpringUtil.getBean(ErpPurchaseRequestServiceImpl.class)
+ .createImportedPurchaseRequest(convertList(group, ImportRow::getData));
respVO.getCreatePurchaseRequestNos().add(purchaseRequestMapper.selectById(requestId).getNo());
+ respVO.setSuccessRows(respVO.getSuccessRows() == null
+ ? group.size() : respVO.getSuccessRows() + group.size());
} catch (ServiceException ex) {
+ // 涓氬姟鏍￠獙澶辫触锛氳褰曞師鍥狅紝缁х画澶勭悊涓嬩竴缁�
respVO.getFailurePurchaseRequestNos().put(groupKey, ex.getMessage());
+ } catch (Exception ex) {
+ // 闈炰笟鍔″紓甯革紙濡傝繙绋嬭皟鐢� NPE銆佹暟鎹В鏋愬け璐ワ級锛氫笉鑳借鏁翠釜瀵煎叆 500锛�
+ // 璁板綍涓哄け璐ュ苟缁х画锛屼繚璇佸叾瀹冭兘瀵肩殑琛屾甯稿叆搴�
+ log.error("[importPurchaseRequestList] 瀵煎叆琛�({}) 鍙戠敓闈炰笟鍔″紓甯�", groupKey, ex);
+ respVO.getFailurePurchaseRequestNos().put(groupKey,
+ "瀵煎叆澶辫触锛岃妫�鏌ュ熀纭�璧勬枡鍜岀敵璇锋槑缁�");
}
}
return respVO;
}
/**
+ * 鍒ゆ柇涓�琛屾槸鍚﹀畬鍏ㄧ┖鐧斤紙鎵�鏈変笟鍔″垪閮芥病鏈夊�硷級
+ */
+ private boolean isBlankRow(ErpPurchaseRequestImportExcelVO row) {
+ return row == null || StrUtil.isBlank(row.getNo())
+ && StrUtil.isBlank(row.getProductCode())
+ && StrUtil.isBlank(row.getProductUnitCode())
+ && row.getRequestTime() == null
+ && row.getCount() == null
+ && row.getProductPrice() == null
+ && row.getDiscountPercent() == null && row.getDepositPrice() == null && row.getTaxPercent() == null
+ && row.getDemandTime() == null && row.getQcCheckFlag() == null
+ && StrUtil.isBlank(row.getSupplierName())
+ && StrUtil.isBlank(row.getRequestReason())
+ && StrUtil.isBlank(row.getRemark())
+ && StrUtil.isBlank(row.getItemRemark());
+ }
+
+ /**
+ * 瀵煎叆琛屽寘瑁咃細鎼哄甫 Excel 涓殑鐪熷疄琛屽彿锛岀敤浜庨敊璇彁绀哄畾浣嶃��
+ */
+ private static class ImportRow {
+ private final int excelRowNo;
+ private final ErpPurchaseRequestImportExcelVO data;
+
+ private ImportRow(int excelRowNo, ErpPurchaseRequestImportExcelVO data) {
+ this.excelRowNo = excelRowNo;
+ this.data = data;
+ }
+
+ private ErpPurchaseRequestImportExcelVO getData() {
+ return data;
+ }
+ }
+
+ /**
* 灏嗗悓涓�寮犻噰璐敵璇风殑澶氳鏄庣粏杞崲鎴愬垱寤� Request VO
*/
+ @Transactional(rollbackFor = Exception.class)
+ public Long createImportedPurchaseRequest(List<ErpPurchaseRequestImportExcelVO> group) {
+ return createPurchaseRequest(buildPurchaseRequestImportSaveReqVO(group));
+ }
private ErpPurchaseRequestSaveReqVO buildPurchaseRequestImportSaveReqVO(List<ErpPurchaseRequestImportExcelVO> group) {
ErpPurchaseRequestImportExcelVO first = group.get(0);
// 1. 鏍￠獙鐢宠鏃堕棿
if (first.getRequestTime() == null) {
throw exception(PURCHASE_REQUEST_IMPORT_REQUEST_TIME_REQUIRED);
+ }
+ if (first.getDiscountPercent() != null && (first.getDiscountPercent().signum() < 0 || first.getDiscountPercent().compareTo(new BigDecimal("100")) > 0)
+ || first.getDepositPrice() != null && first.getDepositPrice().signum() < 0) {
+ throw exception(PURCHASE_REQUEST_IMPORT_INVALID, "浼樻儬鐜囬』鍦� 0 鑷� 100 涔嬮棿锛屽畾閲戜笉鑳戒负璐熸暟");
+ }
+ for (ErpPurchaseRequestImportExcelVO row : group) {
+ if (row.getRequestTime() != null && !row.getRequestTime().equals(first.getRequestTime())
+ || StrUtil.isNotBlank(row.getSupplierName()) && !StrUtil.equals(first.getSupplierName(), row.getSupplierName())
+ || StrUtil.isNotBlank(row.getRequestReason()) && !StrUtil.equals(first.getRequestReason(), row.getRequestReason())
+ || row.getDiscountPercent() != null && (first.getDiscountPercent() == null || row.getDiscountPercent().compareTo(first.getDiscountPercent()) != 0)
+ || row.getDepositPrice() != null && (first.getDepositPrice() == null || row.getDepositPrice().compareTo(first.getDepositPrice()) != 0)
+ || StrUtil.isNotBlank(row.getRemark()) && !StrUtil.equals(first.getRemark(), row.getRemark())) {
+ throw exception(PURCHASE_REQUEST_IMPORT_INVALID, "鍚屼竴鐢宠鍗曠殑涓昏〃淇℃伅涓嶄竴鑷�");
+ }
+ if (StrUtil.isBlank(row.getProductCode()) || StrUtil.isBlank(row.getProductUnitCode()) || row.getCount() == null || row.getCount().signum() <= 0
+ || row.getProductPrice() == null || row.getProductPrice().signum() < 0
+ || row.getTaxPercent() != null && (row.getTaxPercent().signum() < 0 || row.getTaxPercent().compareTo(new BigDecimal("100")) > 0)) {
+ throw exception(PURCHASE_REQUEST_IMPORT_INVALID, "姣忚椤诲～鍐欑墿鏂欍�佸崟浣嶃�佹鏁版暟閲忋�侀潪璐熷崟浠凤紱绋庣巼椤诲湪 0 鑷� 100 涔嬮棿");
+ }
}
// 2. 瑙ｆ瀽渚涘簲鍟嗭紙鍙�夛級
Long supplierId = null;
@@ -512,14 +678,17 @@
// 3. 缁勮鏄庣粏
List<ErpPurchaseRequestSaveReqVO.Item> items = new ArrayList<>();
for (ErpPurchaseRequestImportExcelVO row : group) {
- MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode()).getCheckedData();
+ MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode().trim()).getCheckedData();
if (product == null) {
throw exception(PURCHASE_REQUEST_IMPORT_PRODUCT_NOT_EXISTS, row.getProductCode());
}
- MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode()).getCheckedData();
+ MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode().trim()).getCheckedData();
if (unit == null) {
throw exception(PURCHASE_REQUEST_IMPORT_UNIT_NOT_EXISTS, row.getProductUnitCode());
}
+ if (product.getStatus() != null && product.getStatus() != 0 || unit.getStatus() != null && unit.getStatus() != 0) {
+ throw exception(PURCHASE_REQUEST_IMPORT_INVALID, "鐗╂枡鎴栬閲忓崟浣嶅凡鍋滅敤");
+ }
ErpPurchaseRequestSaveReqVO.Item item = new ErpPurchaseRequestSaveReqVO.Item()
.setProductId(product.getId())
.setProductUnitId(unit.getId())
--
Gitblit v1.9.3