From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 226 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 181 insertions(+), 45 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
index 662cc0a..b2b7b01 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
@@ -2,6 +2,8 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -17,7 +19,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;
@@ -26,22 +27,29 @@
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
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.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
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 org.flowable.engine.repository.ProcessDefinition;
import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -51,6 +59,8 @@
@Validated
@Slf4j
public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
+
+ private static final String ITEM_RECEIPT_APPROVE_CATEGORY_CODE = "item_receipt_approve";
@Resource
private MesWmItemReceiptMapper itemReceiptMapper;
@@ -63,7 +73,8 @@
@Lazy
private MesWmArrivalNoticeService arrivalNoticeService;
@Resource
- private MesMdVendorService vendorService;
+ @Lazy
+ private SrmSupplierApi srmSupplierApi;
@Resource
@Lazy
private MesQcIqcService iqcService;
@@ -75,9 +86,14 @@
@Resource
private BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
@Resource
private ErpPurchaseOrderApi purchaseOrderApi;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
@Override
public Long createItemReceipt(MesWmItemReceiptSaveReqVO createReqVO) {
@@ -106,8 +122,8 @@
private void validateItemReceiptSaveData(MesWmItemReceiptSaveReqVO reqVO) {
// 鏍￠獙缂栫爜鍞竴
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙渚涘簲鍟嗗瓨鍦�
- vendorService.validateVendorExistsAndEnable(reqVO.getVendorId());
+ // 鏍￠獙渚涘簲鍟嗗瓨鍦紙閲囪喘鍏ュ簱浣跨敤 ERP 渚涘簲鍟嗭級
+ srmSupplierApi.getSupplier(reqVO.getVendorId());
// 鏍￠獙鍒拌揣閫氱煡鍗曞瓨鍦�
if (reqVO.getNoticeId() != null) {
MesWmArrivalNoticeDO notice = arrivalNoticeService.validateArrivalNoticeReadyForReceipt(reqVO.getNoticeId());
@@ -155,9 +171,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) {
+ // 鑾峰彇鎵�鏈夌墿鏂橧D
+ 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
@@ -216,28 +256,49 @@
* 鍥炲啓 ERP 閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
*/
private void updateErpPurchaseOrderInCount(MesWmItemReceiptDO receipt) {
- // 鑾峰彇鍏ュ簱鍗曡
- List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(receipt.getId());
- if (CollUtil.isEmpty(lines)) {
- return;
+ // 1. 纭畾閲囪喘璁㈠崟 ID锛氫紭鍏堜粠鍏ュ簱鍗曞ご鍙栵紙浠庡埌璐ч�氱煡鍗曞甫鍏ワ級锛屽叾娆′粠琛屽弽鏌�
+ Long purchaseOrderId = receipt.getPurchaseOrderId();
+ if (purchaseOrderId == null && receipt.getNoticeId() != null) {
+ // 浠庡叧鑱旂殑鍒拌揣閫氱煡鍗曡幏鍙栭噰璐鍗� ID
+ MesWmArrivalNoticeDO notice = arrivalNoticeService.getArrivalNotice(receipt.getNoticeId());
+ if (notice != null) {
+ purchaseOrderId = notice.getPurchaseOrderId();
+ }
}
- // 鐢ㄤ簬瀛樺偍閲囪喘璁㈠崟 ID锛岄伩鍏嶉噸澶嶆洿鏂�
- Long purchaseOrderId = null;
- // 閬嶅巻琛岋紝鎸� purchaseOrderItemId 鏇存柊鍏ュ簱鏁伴噺
- for (MesWmItemReceiptLineDO line : lines) {
- if (line.getPurchaseOrderItemId() != null && line.getReceivedQuantity() != null) {
- purchaseOrderApi.updateOrderItemInCount(line.getPurchaseOrderItemId(), line.getReceivedQuantity());
- // 鑾峰彇閲囪喘璁㈠崟 ID锛堜粠绗竴涓湁鏁堢殑鏄庣粏椤硅幏鍙栵級
- if (purchaseOrderId == null) {
- cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderItemRespDTO itemDTO =
- purchaseOrderApi.getPurchaseOrderItem(line.getPurchaseOrderItemId()).getCheckedData();
- if (itemDTO != null && itemDTO.getOrderId() != null) {
- purchaseOrderId = itemDTO.getOrderId();
+
+ // 2. 鑾峰彇鍏ュ簱鍗曡锛屾寜 purchaseOrderItemId 鏇存柊鍏ュ簱鏁伴噺
+ List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(receipt.getId());
+ if (CollUtil.isNotEmpty(lines)) {
+ for (MesWmItemReceiptLineDO line : lines) {
+ if (line.getPurchaseOrderItemId() != null && line.getReceivedQuantity() != null) {
+ purchaseOrderApi.updateOrderItemInCount(line.getPurchaseOrderItemId(), line.getReceivedQuantity());
+ // 濡傛灉杩樻病鎷垮埌 purchaseOrderId锛屼粠鏄庣粏椤瑰弽鏌�
+ if (purchaseOrderId == null) {
+ cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderItemRespDTO itemDTO =
+ purchaseOrderApi.getPurchaseOrderItem(line.getPurchaseOrderItemId()).getCheckedData();
+ if (itemDTO != null && itemDTO.getOrderId() != null) {
+ purchaseOrderId = itemDTO.getOrderId();
+ }
+ }
+ }
+ }
+ } else if (receipt.getNoticeId() != null) {
+ // 鍏滃簳锛氬叆搴撹涓虹┖鏃讹紝浠庡埌璐ч�氱煡鍗曡鍥炲啓鍏ュ簱鏁伴噺
+ List<MesWmArrivalNoticeLineDO> noticeLines = arrivalNoticeLineService
+ .getArrivalNoticeLineListByNoticeId(receipt.getNoticeId());
+ for (MesWmArrivalNoticeLineDO noticeLine : noticeLines) {
+ if (noticeLine.getPurchaseOrderItemId() != null) {
+ // 浣跨敤鍚堟牸鏁伴噺锛堟湁 IQC 鏃朵负鍚堟牸鏁伴噺锛屽惁鍒欎负鍒拌揣鏁伴噺锛�
+ BigDecimal qty = noticeLine.getQualifiedQuantity() != null
+ ? noticeLine.getQualifiedQuantity() : noticeLine.getArrivalQuantity();
+ if (qty != null && qty.compareTo(BigDecimal.ZERO) > 0) {
+ purchaseOrderApi.updateOrderItemInCount(noticeLine.getPurchaseOrderItemId(), qty);
}
}
}
}
- // 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撶姸鎬�
+
+ // 3. 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撶姸鎬�
if (purchaseOrderId != null) {
purchaseOrderApi.updateOrderInStatus(purchaseOrderId);
}
@@ -245,14 +306,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,52 +404,116 @@
// 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.setPurchaseOrderId(notice.getPurchaseOrderId());
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) {
+ BigDecimal receivable = noticeLine.getQualifiedQuantity() != null
+ ? noticeLine.getQualifiedQuantity() : noticeLine.getArrivalQuantity();
+ // 鏁磋宸查��渚涘簲鍟嗘椂涓嶇敓鎴愰浂鏁伴噺鍏ュ簱琛岋紱鍏朵綑琛屼粛姝ｅ父鏀惰揣銆�
+ if (receivable == null || receivable.signum() <= 0) {
+ continue;
+ }
MesWmItemReceiptLineDO receiptLine = new MesWmItemReceiptLineDO();
receiptLine.setReceiptId(receipt.getId());
receiptLine.setArrivalNoticeLineId(noticeLine.getId());
receiptLine.setPurchaseOrderItemId(noticeLine.getPurchaseOrderItemId());
receiptLine.setItemId(noticeLine.getItemId());
// 浣跨敤鍚堟牸鏁伴噺锛堝鏋滄湁 IQC 鍒欐槸鍚堟牸鏁伴噺锛屽惁鍒欐槸鍒拌揣鏁伴噺锛�
- receiptLine.setReceivedQuantity(noticeLine.getQualifiedQuantity() != null ? noticeLine.getQualifiedQuantity() : noticeLine.getArrivalQuantity());
+ receiptLine.setReceivedQuantity(receivable);
+ // 鎸夐噰璐鍗曡鍗曚环蹇収閲戦锛屼緵鏉ョエ/瀵硅处浣跨敤
+ fillReceiptLinePrice(receiptLine);
itemReceiptLineService.createItemReceiptLineFromArrivalNoticeLine(receiptLine);
}
return receipt.getId();
}
+ /**
+ * 鎸夐噰璐鍗曡鍗曚环鍥炲～鍏ュ簱琛岄噾棰濓紝閬垮厤瀵硅处鏃跺啀鑱旇〃鍙栦环
+ */
+ private void fillReceiptLinePrice(MesWmItemReceiptLineDO receiptLine) {
+ if (receiptLine.getPurchaseOrderItemId() == null) {
+ return;
+ }
+ try {
+ var item = purchaseOrderApi.getPurchaseOrderItem(receiptLine.getPurchaseOrderItemId()).getData();
+ if (item == null || item.getProductPrice() == null) {
+ return;
+ }
+ receiptLine.setPrice(item.getProductPrice());
+ if (receiptLine.getReceivedQuantity() != null) {
+ receiptLine.setTotalPrice(item.getProductPrice().multiply(receiptLine.getReceivedQuantity()));
+ }
+ } catch (Exception ex) {
+ // 浠锋牸鍙槸蹇収锛岄噰璐鍗曡鍙栦笉鍒版椂涓嶉樆鏂叆搴�
+ log.warn("[fillReceiptLinePrice][閲囪喘璁㈠崟琛�({}) 浠锋牸蹇収澶辫触]", receiptLine.getPurchaseOrderItemId(), ex);
+ }
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void submitItemReceiptApproval(Long id, String processDefinitionKey) {
// 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateItemReceiptExistsAndDraft(id);
+ MesWmItemReceiptDO receipt = validateItemReceiptExistsAndDraft(id);
+ // 瀹℃壒鍏ュ彛涓庢櫘閫氭彁浜ゅ叆鍙ｄ繚鎸佷竴鑷达紝绌鸿鍗曟嵁涓嶈兘杩涘叆瀹℃壒銆�
+ List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(id);
+ if (CollUtil.isEmpty(lines)) {
+ throw exception(WM_ITEM_RECEIPT_NO_LINE);
+ }
// 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
Long userId = getCurrentUserId();
+ // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
+ if (processInstanceApi.isGlobalAutoApprove()) {
+ itemReceiptMapper.updateById(new MesWmItemReceiptDO()
+ .setId(id)
+ .setStatus(MesWmItemReceiptStatusEnum.APPROVING.getStatus())
+ .setProcessInstanceId(""));
+ updateItemReceiptAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ return;
+ }
+
+ if (StrUtil.isBlank(processDefinitionKey)) {
+ throw exception(WM_ITEM_RECEIPT_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ if (processDefinition == null || bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(ITEM_RECEIPT_APPROVE_CATEGORY_CODE).stream()
+ .noneMatch(info -> Objects.equals(info.getProcessDefinitionId(), processDefinition.getId()))) {
+ throw exception(WM_ITEM_RECEIPT_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(processDefinitionKey)
- .setBusinessKey(String.valueOf(id)));
+ .setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("businessNo", receipt.getCode())));
// 3. 鏇存柊鍏ュ簱鍗曠姸鎬佷负瀹℃壒涓�
itemReceiptMapper.updateById(new MesWmItemReceiptDO()
@@ -398,8 +535,11 @@
// 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
Integer newStatus = convertBpmResultToReceiptStatus(bpmResult);
if (newStatus != null) {
- itemReceiptMapper.updateById(new MesWmItemReceiptDO()
- .setId(id).setStatus(newStatus));
+ itemReceiptMapper.update(null, new LambdaUpdateWrapper<MesWmItemReceiptDO>()
+ .eq(MesWmItemReceiptDO::getId, id)
+ .set(MesWmItemReceiptDO::getStatus, newStatus)
+ .set(MesWmItemReceiptDO::getApproveTime,
+ BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult) ? LocalDateTime.now() : null));
}
}
@@ -421,11 +561,7 @@
* 鑾峰彇褰撳墠鐢ㄦ埛 ID
*/
private Long getCurrentUserId() {
- Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- if (authentication != null && authentication.getPrincipal() instanceof Long) {
- return (Long) authentication.getPrincipal();
- }
- return 1L; // 榛樿鐢ㄦ埛
+ return Objects.requireNonNull(getLoginUserId(), "閲囪喘鍏ュ簱瀹℃壒闇�瑕佺櫥褰曠敤鎴�");
}
/**
--
Gitblit v1.9.3