From 7abf9f290c39dd20f865be53dbecee7fab6de140 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 19:12:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 272 insertions(+), 8 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 b8eb017..730e53d 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
@@ -2,22 +2,35 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
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;
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.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.dataobject.purchase.ErpSupplierDO;
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.mysql.purchase.ErpSupplierMapper;
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.ErpPurchaseOrderStatusEnum;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
@@ -50,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
@@ -67,7 +85,18 @@
private ErpSupplierService supplierService;
@Resource
+ private ErpSupplierMapper supplierMapper;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+
+ @Resource
private ApprovalConfigApi approvalConfigApi;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private AdminUserApi adminUserApi;
@@ -102,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);
@@ -130,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);
@@ -251,7 +287,14 @@
// 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉
approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_REQUEST_APPROVE_BIZ_TYPE);
// 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
- purchaseRequestMapper.submitAndResetAuditInfo(id, ErpPurchaseRequestStatusEnum.PROCESS.getStatus());
+ 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
@@ -276,13 +319,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(PURCHASE_REQUEST_AUDIT_REJECT_REASON_REQUIRED);
}
- purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_REQUEST_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙�
- purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_REQUEST_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃涓旀湁渚涘簲鍟嗐�佹湭鐢熸垚璁㈠崟鏃讹紝鑷姩鐢熸垚閲囪喘璁㈠崟
if (purchaseRequest.getSupplierId() != null && purchaseRequest.getOrderId() == null) {
try {
@@ -307,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
@@ -358,7 +452,8 @@
// 3. 鍒涘缓閲囪喘璁㈠崟
ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
purchaseOrder.setNo(orderNo);
- purchaseOrder.setStatus(ErpAuditStatus.APPROVE.getStatus()); // 閲囪喘璁㈠崟鐩存帴涓哄凡瀹℃牳鐘舵��
+ // 鑷姩鐢熸垚鐨勯噰璐鍗曚粛涓鸿崏绋匡紝蹇呴』璧拌鍗曡嚜韬殑鎻愪氦/瀹℃壒娴佺▼锛岄伩鍏嶇粫杩囧鎵�
+ purchaseOrder.setStatus(ErpPurchaseOrderStatusEnum.DRAFT.getStatus());
purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
@@ -392,9 +487,10 @@
});
purchaseOrderItemMapper.insertBatch(orderItems);
- // 5. 鏇存柊閲囪喘鐢宠鐨勮鍗曚俊鎭�
+ // 5. 鏇存柊閲囪喘鐢宠鐨勮鍗曚俊鎭紝骞跺洖鍐欐渶缁堜娇鐢ㄧ殑渚涘簲鍟�
purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
.setId(id)
+ .setSupplierId(purchaseRequest.getSupplierId())
.setOrderId(purchaseOrder.getId())
.setOrderNo(orderNo));
@@ -423,4 +519,172 @@
return cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId().toString();
}
+ @Override
+ public ErpPurchaseRequestImportRespVO importPurchaseRequestList(List<ErpPurchaseRequestImportExcelVO> importRequests,
+ ErpPurchaseRequestImportReqVO importReqVO) {
+ 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;
+ }
+ // 1.2 鐗╂枡缂栫爜涓虹┖锛氫笟鍔′笂鏃犳硶瀹氫綅鐗╂枡锛岃烦杩囧苟鏄庣‘鍛婄煡鐢ㄦ埛
+ if (StrUtil.isBlank(row.getProductCode())) {
+ respVO.getSkippedRows().put(rowLabel, "鐗╂枡缂栫爜涓虹┖锛岃琛屾湭瀵煎叆");
+ 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<ImportRow>> groups = new ArrayList<>();
+ Map<String, Integer> groupIndexMap = new LinkedHashMap<>();
+ for (ImportRow row : validRows) {
+ String no = row.data.getNo();
+ String groupKey = StrUtil.isNotBlank(no) ? no : ("__row_" + row.excelRowNo);
+ Integer index = groupIndexMap.get(groupKey);
+ if (index == null) {
+ index = groups.size();
+ groupIndexMap.put(groupKey, index);
+ groups.add(new ArrayList<>());
+ }
+ groups.get(index).add(row);
+ }
+
+ // 3. 閫愮粍鍚堝苟鍒涘缓閲囪喘鐢宠
+ 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(
+ convertList(group, ImportRow::getData));
+ Long requestId = createPurchaseRequest(createReqVO);
+ 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,
+ "瀵煎叆澶辫触锛�" + (ex instanceof NullPointerException ? "鏁版嵁瑙ｆ瀽寮傚父锛岃妫�鏌ョ墿鏂�/鍗曚綅缂栫爜" : ex.getMessage()));
+ }
+ }
+ return respVO;
+ }
+
+ /**
+ * 鍒ゆ柇涓�琛屾槸鍚﹀畬鍏ㄧ┖鐧斤紙鎵�鏈変笟鍔″垪閮芥病鏈夊�硷級
+ */
+ private boolean isBlankRow(ErpPurchaseRequestImportExcelVO row) {
+ return StrUtil.isBlank(row.getNo())
+ && StrUtil.isBlank(row.getProductCode())
+ && StrUtil.isBlank(row.getProductUnitCode())
+ && row.getRequestTime() == null
+ && row.getCount() == null
+ && row.getProductPrice() == 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
+ */
+ private ErpPurchaseRequestSaveReqVO buildPurchaseRequestImportSaveReqVO(List<ErpPurchaseRequestImportExcelVO> group) {
+ ErpPurchaseRequestImportExcelVO first = group.get(0);
+ // 1. 鏍￠獙鐢宠鏃堕棿
+ if (first.getRequestTime() == null) {
+ throw exception(PURCHASE_REQUEST_IMPORT_REQUEST_TIME_REQUIRED);
+ }
+ // 2. 瑙ｆ瀽渚涘簲鍟嗭紙鍙�夛級
+ Long supplierId = null;
+ if (StrUtil.isNotBlank(first.getSupplierName())) {
+ ErpSupplierDO supplier = supplierMapper.selectByName(first.getSupplierName());
+ if (supplier == null) {
+ throw exception(PURCHASE_REQUEST_IMPORT_SUPPLIER_NOT_EXISTS, first.getSupplierName());
+ }
+ supplierId = supplier.getId();
+ }
+ // 3. 缁勮鏄庣粏
+ List<ErpPurchaseRequestSaveReqVO.Item> items = new ArrayList<>();
+ for (ErpPurchaseRequestImportExcelVO row : group) {
+ MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode()).getCheckedData();
+ if (product == null) {
+ throw exception(PURCHASE_REQUEST_IMPORT_PRODUCT_NOT_EXISTS, row.getProductCode());
+ }
+ MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode()).getCheckedData();
+ if (unit == null) {
+ throw exception(PURCHASE_REQUEST_IMPORT_UNIT_NOT_EXISTS, row.getProductUnitCode());
+ }
+ ErpPurchaseRequestSaveReqVO.Item item = new ErpPurchaseRequestSaveReqVO.Item()
+ .setProductId(product.getId())
+ .setProductUnitId(unit.getId())
+ .setProductPrice(row.getProductPrice())
+ .setCount(row.getCount())
+ .setTaxPercent(row.getTaxPercent())
+ .setDemandTime(row.getDemandTime())
+ .setQcCheckFlag(row.getQcCheckFlag())
+ .setRemark(row.getItemRemark());
+ items.add(item);
+ }
+ // 4. 缁勮涓昏〃
+ return new ErpPurchaseRequestSaveReqVO()
+ .setRequestTime(first.getRequestTime())
+ .setRequestReason(first.getRequestReason())
+ .setSupplierId(supplierId)
+ .setDiscountPercent(first.getDiscountPercent())
+ .setDepositPrice(first.getDepositPrice())
+ .setRemark(first.getRemark())
+ .setItems(items);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3