From fbc80648adf176fed54046c3aa52173b20e5d12e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 14:57:32 +0800
Subject: [PATCH] 宁夏万通需求：商机状态组改为非必填；过程检验单生产订单、工位改为非必填
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java
index cf906b6..466db2a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java
@@ -12,12 +12,14 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptLineMapper;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeLineService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.service.wm.unitconvert.MesWmItemUnitConvertService;
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;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -44,6 +46,8 @@
private MesWmArrivalNoticeLineService arrivalNoticeLineService;
@Resource
private MesWmBatchService batchService;
+ @Resource
+ private MesWmItemUnitConvertService itemUnitConvertService;
@Override
public Long createItemReceiptLine(MesWmItemReceiptLineSaveReqVO createReqVO) {
@@ -54,13 +58,15 @@
// 3.1 鍒涘缓鍏ュ簱鍗曡
MesWmItemReceiptLineDO line = BeanUtils.toBean(createReqVO, MesWmItemReceiptLineDO.class);
- // 3.2 鐢熸垚鎴栬幏鍙栨壒娆�
+ // 3.2 鍙屽崟浣嶆崲绠�
+ fillReceivedQuantity(line, createReqVO);
+ // 3.3 鐢熸垚鎴栬幏鍙栨壒娆�
MesWmBatchDO batch = generateOrGetBatch(receipt, createReqVO);
if (batch != null) {
line.setBatchId(batch.getId());
line.setBatchCode(batch.getCode());
}
- // 3.3 鎻掑叆鏁版嵁搴�
+ // 3.4 鎻掑叆鏁版嵁搴�
itemReceiptLineMapper.insert(line);
return line.getId();
}
@@ -76,13 +82,34 @@
// 2.1 鏇存柊
MesWmItemReceiptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmItemReceiptLineDO.class);
- // 2.2 鐢熸垚鎴栬幏鍙栨壒娆�
+ // 2.2 鍙屽崟浣嶆崲绠�
+ fillReceivedQuantity(updateObj, updateReqVO);
+ // 2.3 鐢熸垚鎴栬幏鍙栨壒娆�
MesWmBatchDO batch = generateOrGetBatch(receipt, updateReqVO);
if (batch != null) {
updateObj.setBatchId(batch.getId()).setBatchCode(batch.getCode());
}
- // 2.3 鏇存柊鏁版嵁搴�
+ // 2.4 鏇存柊鏁版嵁搴�
itemReceiptLineMapper.updateById(updateObj);
+ }
+
+ /**
+ * 鍙屽崟浣嶆崲绠楋細鎸夊綍鍏ュ崟浣嶄笌鎵�閫夊瀷鍙凤紝鎶婂綍鍏ユ暟閲忔崲绠椾负鐗╂枡涓诲崟浣嶇殑鍏ュ簱鏁伴噺
+ *
+ * 鏈�夋嫨褰曞叆鍗曚綅鏃讹紝璇存槑鏈鎸夌墿鏂欎富鍗曚綅褰曞叆锛岀洿鎺ヤ娇鐢ㄤ紶鍏ョ殑鍏ュ簱鏁伴噺銆�
+ */
+ private void fillReceivedQuantity(MesWmItemReceiptLineDO line, MesWmItemReceiptLineSaveReqVO reqVO) {
+ if (reqVO.getEnterUnitMeasureId() != null) {
+ BigDecimal primaryQuantity = itemUnitConvertService.convertToPrimaryUnit(
+ reqVO.getItemId(), reqVO.getItemModelId(),
+ reqVO.getEnterUnitMeasureId(), reqVO.getEnterQuantity());
+ if (primaryQuantity != null) {
+ line.setReceivedQuantity(primaryQuantity);
+ }
+ }
+ if (line.getReceivedQuantity() == null) {
+ throw exception(WM_ITEM_RECEIPT_LINE_QUANTITY_REQUIRED);
+ }
}
private void validateItemReceiptLineSaveData(MesWmItemReceiptDO receipt, MesWmItemReceiptLineSaveReqVO reqVO) {
@@ -133,6 +160,12 @@
itemReceiptLineMapper.deleteByReceiptId(receiptId);
}
+ @Override
+ public void createItemReceiptLineFromArrivalNoticeLine(MesWmItemReceiptLineDO line) {
+ // 鍐呴儴鏂规硶锛屼笉鍋氭牎楠岋紝鐩存帴鎻掑叆
+ itemReceiptLineMapper.insert(line);
+ }
+
/**
* 鏍￠獙鍒拌揣閫氱煡鍗曡
*
--
Gitblit v1.9.3