From 8168aef3c7557c9e1361892270a1ebe35dbddba5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:19 +0800
Subject: [PATCH] refactor(erp): 采购申请与询价比价流程重构
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 308 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 251 insertions(+), 57 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 7f2debd..9ffba24 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
@@ -1,9 +1,11 @@
package cn.iocoder.yudao.module.erp.service.purchase;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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.framework.operatelog.core.util.OperateLogUtils;
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.dal.dataobject.definition.BpmCategoryDO;
@@ -13,6 +15,8 @@
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
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;
@@ -22,12 +26,16 @@
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.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderSourceTypeEnum;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.repository.ProcessDefinition;
@@ -36,11 +44,16 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.erp.enums.LogRecordConstants.*;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
/**
* ERP 閲囪喘鐢宠 Service 瀹炵幇绫�
@@ -70,6 +83,8 @@
@Resource
private ErpSupplierService supplierService;
+ @Resource
+ private MdmItemApi mdmItemApi;
@Resource
private BpmProcessInstanceApi processInstanceApi;
@@ -95,10 +110,8 @@
supplierService.validateSupplier(createReqVO.getSupplierId());
}
// 3. 鐢熸垚鐢宠鍗曞彿
- String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
- if (purchaseRequestMapper.selectByNo(no) != null) {
- throw exception(PURCHASE_REQUEST_NO_EXISTS);
- }
+ String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX,
+ candidate -> purchaseRequestMapper.selectByNo(candidate) != null);
// 4. 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
Long userId = Long.parseLong(getCurrentUserId());
@@ -111,7 +124,7 @@
.setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus())
.setRequestUserId(userId)
.setRequestDeptId(deptId));
- calculateTotalPrice(purchaseRequest, requestItems);
+ calculateTotalCount(purchaseRequest, requestItems);
purchaseRequestMapper.insert(purchaseRequest);
// 6. 缁戝畾闄勪欢
@@ -139,7 +152,7 @@
// 4. 鏇存柊鐢宠鍗�
ErpPurchaseRequestDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseRequestDO.class);
- calculateTotalPrice(updateObj, requestItems);
+ calculateTotalCount(updateObj, requestItems);
purchaseRequestMapper.updateById(updateObj);
// 5. 鏇存柊鐢宠鏄庣粏
@@ -149,28 +162,179 @@
storageAttachmentApi.updateAttachments("file", "erp_purchase_request", updateReqVO.getId(), updateReqVO.getBlobIds());
}
- private void calculateTotalPrice(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
- purchaseRequest.setTotalCount(getSumValue(requestItems, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
- purchaseRequest.setTotalProductPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseRequest.setTotalTaxPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseRequest.setTotalPrice(purchaseRequest.getTotalProductPrice().add(purchaseRequest.getTotalTaxPrice()));
- // 璁＄畻浼樻儬浠锋牸
- if (purchaseRequest.getDiscountPercent() == null) {
- purchaseRequest.setDiscountPercent(BigDecimal.ZERO);
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @LogRecord(type = ERP_PURCHASE_REQUEST_TYPE, subType = ERP_PURCHASE_REQUEST_IMPORT_SUB_TYPE, bizNo = "0",
+ success = ERP_PURCHASE_REQUEST_IMPORT_SUCCESS)
+ public ErpPurchaseRequestImportRespVO importPurchaseRequestList(List<ErpPurchaseRequestImportExcelVO> importList) {
+ ErpPurchaseRequestImportRespVO respVO = ErpPurchaseRequestImportRespVO.builder()
+ .createList(new ArrayList<>())
+ .updateList(new ArrayList<>())
+ .failureList(new LinkedHashMap<>())
+ .build();
+ if (CollUtil.isEmpty(importList)) {
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(respVO.getCreateList(), respVO.getUpdateList(), respVO.getFailureList());
+ return respVO;
}
- purchaseRequest.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseRequest.getTotalPrice(), purchaseRequest.getDiscountPercent()));
- purchaseRequest.setTotalPrice(purchaseRequest.getTotalPrice().subtract(purchaseRequest.getDiscountPrice()));
+
+ // 1. 鎸夆�滈噰璐敵璇峰崟鍙封�濆垎缁�
+ Map<String, List<ErpPurchaseRequestImportExcelVO>> groups = new LinkedHashMap<>();
+ for (int i = 0; i < importList.size(); i++) {
+ ErpPurchaseRequestImportExcelVO row = importList.get(i);
+ if (row == null || (StrUtil.isBlank(row.getProductCode()) && StrUtil.isBlank(row.getNo()))) {
+ continue; // 璺宠繃绌鸿
+ }
+ String key = StrUtil.isNotBlank(row.getNo()) ? row.getNo().trim() : "__row_" + (i + 2);
+ groups.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
+ }
+
+ // 2. 閫愬紶鐢宠瀵煎叆
+ for (Map.Entry<String, List<ErpPurchaseRequestImportExcelVO>> entry : groups.entrySet()) {
+ List<ErpPurchaseRequestImportExcelVO> rows = entry.getValue();
+ String label = StrUtil.isNotBlank(rows.get(0).getNo()) ? rows.get(0).getNo().trim()
+ : "绗� " + entry.getKey().substring("__row_".length()) + " 琛�";
+ try {
+ ErpPurchaseRequestDO purchaseRequest = createPurchaseRequestByImport(rows);
+ respVO.getCreateList().add(purchaseRequest.getNo());
+ } catch (Exception ex) {
+ respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
+ }
+ }
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(respVO.getCreateList(), respVO.getUpdateList(), respVO.getFailureList());
+ return respVO;
+ }
+
+ /**
+ * 渚濇嵁瀵煎叆鏁版嵁鍒涘缓涓�寮犻噰璐敵璇凤紙鍚槑缁嗭級銆傜敵璇蜂汉/鐢宠閮ㄩ棬鐢卞綋鍓嶇櫥褰曠敤鎴疯嚜鍔ㄥ～鍏咃紱鐘舵�佷负鈥滄湭鎻愪氦(0)鈥濄��
+ */
+ private ErpPurchaseRequestDO createPurchaseRequestByImport(List<ErpPurchaseRequestImportExcelVO> rows) {
+ ErpPurchaseRequestImportExcelVO head = rows.get(0);
+
+ // 1. 鏄庣粏
+ List<ErpPurchaseRequestSaveReqVO.Item> items = new ArrayList<>();
+ for (ErpPurchaseRequestImportExcelVO row : rows) {
+ if (StrUtil.isBlank(row.getProductCode())) {
+ throw new IllegalArgumentException("浜у搧缂栫爜涓嶈兘涓虹┖");
+ }
+ CommonResult<MdmItemRespDTO> itemResult = mdmItemApi.getItemByCode(row.getProductCode().trim());
+ MdmItemRespDTO item = itemResult == null ? null : itemResult.getData();
+ if (item == null) {
+ throw new IllegalArgumentException("浜у搧涓嶅瓨鍦細" + row.getProductCode());
+ }
+ if (row.getCount() == null) {
+ throw new IllegalArgumentException("浜у搧[" + row.getProductCode() + "]鐨勬暟閲忎笉鑳戒负绌�");
+ }
+ if (item.getUnitMeasureId() == null) {
+ throw new IllegalArgumentException("浜у搧[" + row.getProductCode() + "]鏈厤缃閲忓崟浣嶏紝璇峰厛鍦ㄧ墿鏂欎腑缁存姢");
+ }
+ ErpPurchaseRequestSaveReqVO.Item itemVO = new ErpPurchaseRequestSaveReqVO.Item();
+ itemVO.setProductId(item.getId());
+ itemVO.setProductUnitId(item.getUnitMeasureId());
+ itemVO.setCount(row.getCount());
+ itemVO.setDemandTime(parseImportDate(row.getDemandTime()));
+ itemVO.setRemark(row.getRemark());
+ items.add(itemVO);
+ }
+
+ // 3. 鍗曞彿锛氬～浜嗗氨鐢紙鏍￠獙鍞竴锛夛紝娌″～鑷姩鐢熸垚 CGSQ...
+ String no;
+ if (StrUtil.isNotBlank(head.getNo())) {
+ no = head.getNo().trim();
+ if (purchaseRequestMapper.selectByNo(no) != null) {
+ throw new IllegalArgumentException("閲囪喘鐢宠鍗曞彿宸插瓨鍦細" + no);
+ }
+ } else {
+ no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX,
+ candidate -> purchaseRequestMapper.selectByNo(candidate) != null);
+ }
+
+ // 4. 鐢宠浜� / 鐢宠閮ㄩ棬锛氬彇褰撳墠鐧诲綍鐢ㄦ埛鍙婂叾閮ㄩ棬
+ Long userId = getLoginUserId();
+ AdminUserRespDTO user = userId == null ? null : adminUserApi.getUser(userId);
+ Long deptId = user != null ? user.getDeptId() : null;
+
+ // 5. 缁勮涓昏〃锛堢姸鎬佷负鈥滄湭鎻愪氦鈥濓級
+ ErpPurchaseRequestDO purchaseRequest = new ErpPurchaseRequestDO();
+ purchaseRequest.setNo(no);
+ purchaseRequest.setRequestTime(parseImportDateTime(head.getRequestTime()));
+ purchaseRequest.setRequestReason(head.getRequestReason());
+ purchaseRequest.setRemark(head.getRemark());
+ purchaseRequest.setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus());
+ purchaseRequest.setRequestUserId(userId);
+ purchaseRequest.setRequestDeptId(deptId);
+
+ List<ErpPurchaseRequestItemDO> itemDOs = validatePurchaseRequestItems(items);
+ calculateTotalCount(purchaseRequest, itemDOs);
+ purchaseRequestMapper.insert(purchaseRequest);
+ itemDOs.forEach(item -> item.setRequestId(purchaseRequest.getId()));
+ purchaseRequestItemMapper.insertBatch(itemDOs);
+ return purchaseRequest;
+ }
+
+ private LocalDateTime parseImportDateTime(String text) {
+ if (StrUtil.isBlank(text)) {
+ return LocalDateTime.now();
+ }
+ String value = text.trim();
+ for (String pattern : new String[]{"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy/MM/dd HH:mm:ss"}) {
+ try {
+ return LocalDateTime.parse(value, DateTimeFormatter.ofPattern(pattern));
+ } catch (Exception ignored) {
+ // 缁х画灏濊瘯涓嬩竴涓牸寮�
+ }
+ }
+ for (String pattern : new String[]{"yyyy-MM-dd", "yyyy/M/d"}) {
+ try {
+ return LocalDate.parse(value, DateTimeFormatter.ofPattern(pattern)).atStartOfDay();
+ } catch (Exception ignored) {
+ // 缁х画灏濊瘯涓嬩竴涓牸寮�
+ }
+ }
+ throw new IllegalArgumentException("鐢宠鏃堕棿鏍煎紡涓嶆纭細" + text + "锛岀ず渚� 2026-01-01 10:00:00");
+ }
+
+ private LocalDate parseImportDate(String text) {
+ if (StrUtil.isBlank(text)) {
+ return null;
+ }
+ String value = text.trim();
+ for (String pattern : new String[]{"yyyy-MM-dd", "yyyy/M/d"}) {
+ try {
+ return LocalDate.parse(value, DateTimeFormatter.ofPattern(pattern));
+ } catch (Exception ignored) {
+ // 缁х画灏濊瘯涓嬩竴涓牸寮�
+ }
+ }
+ try {
+ return LocalDateTime.parse(value, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).toLocalDate();
+ } catch (Exception ignored) {
+ // 蹇界暐
+ }
+ throw new IllegalArgumentException("闇�姹傛棩鏈熸牸寮忎笉姝ｇ‘锛�" + text + "锛岀ず渚� 2026-01-01");
+ }
+
+ private String resolveImportErrorMessage(Exception ex) {
+ if (ex instanceof cn.iocoder.yudao.framework.common.exception.ServiceException serviceException) {
+ return serviceException.getMessage();
+ }
+ return StrUtil.blankToDefault(ex.getMessage(), "瀵煎叆澶辫触");
+ }
+
+ private void calculateTotalCount(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
+ purchaseRequest.setTotalCount(getSumValue(requestItems, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
}
private List<ErpPurchaseRequestItemDO> validatePurchaseRequestItems(List<ErpPurchaseRequestSaveReqVO.Item> list) {
- return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class, item -> {
- if (item.getProductPrice() != null && item.getCount() != null) {
- item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
- if (item.getTaxPercent() != null) {
- item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
- }
+ return convertList(list, o -> {
+ ErpPurchaseRequestItemDO item = BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class);
+ // 閲囪喘鐢宠涓嶅啀濉啓鈥滄槸鍚﹁川妫�鈥濓紝榛樿闇�瑕佹潵鏂欐楠岋紝鐢熸垚鍙拌处鍚庡彲鍦ㄥ彴璐︿腑璋冩暣
+ if (item.getQcCheckFlag() == null) {
+ item.setQcCheckFlag(true);
}
- }));
+ return item;
+ });
}
private void updatePurchaseRequestItemList(Long id, List<ErpPurchaseRequestItemDO> newList) {
@@ -256,6 +420,16 @@
}
// 3. 鍒涘缓 BPM 娴佺▼瀹炰緥
+ // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
+ if (processInstanceApi.isGlobalAutoApprove()) {
+ purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
+ .setId(id)
+ .setStatus(ErpPurchaseRequestStatusEnum.PROCESS.getStatus())
+ .setProcessInstanceId(""));
+ updatePurchaseRequestAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ return;
+ }
+
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(processDefinitionKey)
@@ -316,23 +490,11 @@
}
// 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ // 瀹℃壒閫氳繃鍚庝笉鑷姩鐢熸垚閲囪喘鍙拌处锛氱敱閲囪喘鍛樺湪鍒楄〃涓喅瀹氥�屽彂璧疯浠枫�嶆垨銆岀洿鎺ョ敓鎴愰噰璐彴璐︺��
Integer newStatus = convertBpmResultToStatus(bpmResult);
if (newStatus != null) {
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);
- // 涓嶆姏鍑哄紓甯革紝閬垮厤褰卞搷鐘舵�佹洿鏂�
- }
}
}
@@ -348,11 +510,19 @@
if (purchaseRequest.getOrderId() != null) {
throw exception(PURCHASE_REQUEST_ORDER_EXISTS);
}
- // 3. 鏍￠獙渚涘簲鍟�
- supplierService.validateSupplier(supplierId);
+ // 3. 宸插彂璧疯浠风殑鐢宠锛屽繀椤荤瓑璇环纭锛堢‘瀹氫环鏍硷級鍚庢墠鑳界敓鎴愰噰璐彴璐�
+ if (purchaseRequest.getInquiryId() != null) {
+ throw exception(PURCHASE_REQUEST_INQUIRY_EXISTS);
+ }
+ // 4. 渚涘簲鍟嗕笉鍦ㄨ繖閲岀‘瀹氾細閲囪喘鐢宠鏈韩涓嶅～渚涘簲鍟嗭紝鐩存帴鐢熸垚鍙拌处鏃朵篃鍏佽涓虹┖锛�
+ // 鐢遍噰璐憳鍦ㄩ噰璐彴璐﹁崏绋块噷琛ュ厖渚涘簲鍟嗕笌浠锋牸鍚庡啀鎻愪氦瀹℃壒
+ Long targetSupplierId = supplierId != null ? supplierId : purchaseRequest.getSupplierId();
+ if (targetSupplierId != null) {
+ supplierService.validateSupplier(targetSupplierId);
+ }
- // 4. 璁剧疆渚涘簲鍟嗗苟鐢熸垚璁㈠崟
- purchaseRequest.setSupplierId(supplierId);
+ // 5. 鐢熸垚璁㈠崟锛坰upplierId 鍙负绌猴紝鐣欏緟鍙拌处琛ュ厖锛�
+ purchaseRequest.setSupplierId(targetSupplierId);
return doGeneratePurchaseOrder(purchaseRequest);
}
@@ -372,24 +542,29 @@
}
// 2. 鐢熸垚閲囪喘璁㈠崟鍙�
- String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
- if (purchaseOrderMapper.selectByNo(orderNo) != null) {
- throw exception(PURCHASE_ORDER_NO_EXISTS);
- }
+ String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX,
+ candidate -> purchaseOrderMapper.selectByNo(candidate) != null);
// 3. 鍒涘缓閲囪喘璁㈠崟
ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
purchaseOrder.setNo(orderNo);
- purchaseOrder.setStatus(ErpAuditStatus.APPROVE.getStatus()); // 閲囪喘璁㈠崟鐩存帴涓哄凡瀹℃牳鐘舵��
+ // 鐢熸垚鍚庝负鑽夌锛氶噰璐敵璇蜂笌閲囪喘鍙拌处瀛楁涓嶅畬鍏ㄤ竴鑷达紙浠樻鏃ユ湡銆侀噰璐被鍨嬨�佷粯娆炬柟寮忕瓑锛夛紝
+ // 闇�瑕佷笟鍔″湪閲囪喘鍙拌处閲岃ˉ鍏呭畬鏁村悗鍐嶆彁浜ゅ鎵�
+ purchaseOrder.setStatus(ErpAuditStatus.DRAFT.getStatus());
purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
- purchaseOrder.setTotalPrice(purchaseRequest.getTotalPrice());
- purchaseOrder.setTotalProductPrice(purchaseRequest.getTotalProductPrice());
- purchaseOrder.setTotalTaxPrice(purchaseRequest.getTotalTaxPrice());
- purchaseOrder.setDiscountPercent(purchaseRequest.getDiscountPercent());
- purchaseOrder.setDiscountPrice(purchaseRequest.getDiscountPrice());
- purchaseOrder.setDepositPrice(purchaseRequest.getDepositPrice() != null ? purchaseRequest.getDepositPrice() : BigDecimal.ZERO);
+ // 閲囪喘鐢宠涓嶅惈浠锋牸锛氬彴璐﹀厛浠� 0 閲戦鐢熸垚鑽夌锛岀敱閲囪喘鍛樺湪鍙拌处涓ˉ褰曞崟浠�/绋庣巼鍚庡啀鎻愪氦瀹℃壒
+ purchaseOrder.setTotalPrice(BigDecimal.ZERO);
+ purchaseOrder.setTotalProductPrice(BigDecimal.ZERO);
+ purchaseOrder.setTotalTaxPrice(BigDecimal.ZERO);
+ purchaseOrder.setDiscountPercent(BigDecimal.ZERO);
+ purchaseOrder.setDiscountPrice(BigDecimal.ZERO);
+ purchaseOrder.setDepositPrice(BigDecimal.ZERO);
+ purchaseOrder.setSourceType(ErpPurchaseOrderSourceTypeEnum.PURCHASE_REQUEST.getType());
+ purchaseOrder.setSourceId(purchaseRequest.getId());
+ purchaseOrder.setSourceNo(purchaseRequest.getNo());
+ purchaseOrder.setPurchaseRequestId(purchaseRequest.getId());
purchaseOrder.setRemark(purchaseRequest.getRemark());
purchaseOrder.setInCount(BigDecimal.ZERO);
purchaseOrder.setInStatus(0);
@@ -402,14 +577,16 @@
orderItem.setRequestItemId(item.getId()); // 鍏宠仈閲囪喘鐢宠鏄庣粏
orderItem.setProductId(item.getProductId());
orderItem.setProductUnitId(item.getProductUnitId());
- orderItem.setProductPrice(item.getProductPrice());
+ // 鍗曚环/绋庣巼寰呴噰璐憳鍦ㄥ彴璐︿腑琛ュ綍锛屽厛鎸� 0 淇濆瓨
+ orderItem.setProductPrice(BigDecimal.ZERO);
orderItem.setCount(item.getCount());
- orderItem.setTotalPrice(item.getTotalPrice());
- orderItem.setTaxPercent(item.getTaxPercent());
- orderItem.setTaxPrice(item.getTaxPrice());
+ orderItem.setTotalPrice(BigDecimal.ZERO);
+ orderItem.setTaxPercent(BigDecimal.ZERO);
+ orderItem.setTaxPrice(BigDecimal.ZERO);
orderItem.setRemark(item.getRemark());
orderItem.setInCount(BigDecimal.ZERO);
- orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : false);
+ // 鏄惁璐ㄦ涓庨噰璐敵璇蜂繚鎸佷竴鑷达細鏄庣粏鏈槑纭爣璁版椂榛樿涓恒�屾槸銆嶏紙鍘嗗彶鐢宠鍗曞彲鑳戒负 null锛�
+ orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : true);
return orderItem;
});
purchaseOrderItemMapper.insertBatch(orderItems);
@@ -417,6 +594,7 @@
// 5. 鏇存柊閲囪喘鐢宠鐨勮鍗曚俊鎭�
purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
.setId(id)
+ .setSupplierId(purchaseRequest.getSupplierId())
.setOrderId(purchaseOrder.getId())
.setOrderNo(orderNo));
@@ -448,6 +626,22 @@
return null;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void resetPurchaseRequestStatus(Long id) {
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
+ Integer status = purchaseRequest.getStatus();
+ // 鍏煎鏁版嵁涓嶄竴鑷达細BPM 宸查┏鍥炰絾涓氬姟琛� status 鏈洿鏂帮紙浠嶄负瀹℃壒涓級
+ if (!ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)
+ && !ErpPurchaseRequestStatusEnum.PROCESS.getStatus().equals(status)) {
+ throw exception(PURCHASE_REQUEST_RESET_FAIL_NOT_REJECT);
+ }
+ purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
+ .setId(id)
+ .setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus())
+ .setProcessInstanceId(""));
+ }
+
private ErpPurchaseRequestDO validatePurchaseRequestExists(Long id) {
ErpPurchaseRequestDO purchaseRequest = purchaseRequestMapper.selectById(id);
if (purchaseRequest == null) {
--
Gitblit v1.9.3