From 5ad54547dc97b76dc3d689b9499dec7364968235 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 07 五月 2026 17:16:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java | 496 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 427 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java
index 8f2f728..478ecd5 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.bean.dto.ProductionOrderPickDto;
@@ -18,6 +19,7 @@
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.pojo.StockInventory;
+import com.ruoyi.stock.service.StockInventoryService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,36 +30,45 @@
import java.util.stream.Collectors;
/**
- * <p>
- * 鐠併垹宕熸０鍡樻灐缁捐儻绔熸禒?閺堝秴濮熺�圭偟骞囩猾?
- * </p>
- *
- * @author 閼侯垰顕辨潪顖欐閿涘牊鐫欓懟蹇ョ礆閺堝妾洪崗顒�寰�
- * @since 2026-04-21 03:55:52
+ * 鐢熶骇璁㈠崟棰嗘枡鏈嶅姟瀹炵幇銆�
+ * 璐熻矗棰嗘枡鏂板銆佹洿鏂般�佽ˉ鏂欍�侀��鏂欏強搴撳瓨鑱斿姩銆�
*/
@Service
@RequiredArgsConstructor
public class ProductionOrderPickServiceImpl extends ServiceImpl<ProductionOrderPickMapper, ProductionOrderPick> implements ProductionOrderPickService {
+ private static final byte PICK_TYPE_NORMAL = 1;
+ private static final byte PICK_TYPE_FEEDING = 2;
+
private final ProductionOrderMapper productionOrderMapper;
private final ProductionOperationTaskMapper productionOperationTaskMapper;
private final ProductionOrderPickRecordMapper productionOrderPickRecordMapper;
private final StockInventoryMapper stockInventoryMapper;
+ private final StockInventoryService stockInventoryService;
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean savePick(ProductionOrderPickDto dto) {
+ // 棰嗘枡鏂板鎬绘祦绋嬶細
+ // 1) 瑙ｆ瀽鍓嶇琛屾暟鎹苟閫愯鍚堝苟鍙傛暟锛�
+ // 2) 鏍￠獙鍙傛暟涓庢壒娆★紱
+ // 3) 鍏堟墸鍑忓簱瀛橈紝鍐嶈惤搴撻鏂欎富璁板綍锛�
+ // 4) 鍐欏叆棰嗘枡娴佹按锛岃褰曟暟閲忓彉鍖栬建杩广��
List<ProductionOrderPickDto> pickItems = resolvePickItems(dto);
+ // 閫愯澶勭悊棰嗘枡鏁版嵁锛岃鍙风敤浜庢嫾瑁呯簿纭殑鎶ラ敊淇℃伅銆�
for (int i = 0; i < pickItems.size(); i++) {
int rowNo = i + 1;
ProductionOrderPickDto resolvedDto = mergeDto(dto, pickItems.get(i));
+ // 姣忚閮藉仛瀹屾暣鏍￠獙锛屽紓甯镐俊鎭甫琛屽彿銆�
validatePickParam(resolvedDto, rowNo);
+ // 缁熶竴澶勭悊鎵规锛堟敮鎸佸崟鎵规/澶氭壒娆★級銆�
List<String> batchNoList = resolveBatchNoList(resolvedDto);
String inventoryBatchNo = pickInventoryBatchNo(batchNoList);
String storedBatchNo = formatBatchNoStorage(batchNoList);
- subtractInventory(resolvedDto.getProductModelId(), inventoryBatchNo, resolvedDto.getPickQuantity(), rowNo);
+ subtractInventory(resolvedDto.getProductModelId(), storedBatchNo, resolvedDto.getPickQuantity(), rowNo);
+ // 淇濆瓨棰嗘枡涓昏褰曞揩鐓с��
ProductionOrderPick orderPick = new ProductionOrderPick();
orderPick.setProductionOrderId(resolvedDto.getProductionOrderId());
orderPick.setProductModelId(resolvedDto.getProductModelId());
@@ -68,8 +79,11 @@
orderPick.setTechnologyOperationId(resolvedDto.getTechnologyOperationId());
orderPick.setDemandedQuantity(resolvedDto.getDemandedQuantity());
orderPick.setBom(resolvedDto.getBom());
+ orderPick.setReturned(false);
+ // 鏂板涓昏褰曘��
baseMapper.insert(orderPick);
+ // 璁板綍鏈棰嗘枡娴佹按锛坆efore=0锛宎fter=鏈棰嗘枡閲忥級銆�
insertPickRecord(orderPick.getId(),
resolvedDto.getProductionOrderId(),
resolvedDto.getProductionOperationTaskId(),
@@ -79,7 +93,8 @@
BigDecimal.ZERO,
resolvedDto.getPickQuantity(),
resolvedDto.getPickType(),
- resolvedDto.getRemark());
+ resolvedDto.getRemark(),
+ resolvedDto.getFeedingReason());
}
return true;
}
@@ -87,8 +102,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updatePick(ProductionOrderPickDto dto) {
+ // 棰嗘枡鏇存柊鍏ュ彛锛堝悓鎺ュ彛鍏煎涓夌被涓氬姟锛夛細
+ // 1) 鏅�氶鏂欐敼閲�/澧炲垹锛�
+ // 2) 琛ユ枡锛坧ickType=2锛夛紱
+ // 3) 閫�鏂欙紙returned=true锛夈��
if (dto == null) {
- throw new ServiceException("鍙樻洿鍙傛暟涓嶈兘涓虹┖");
+ throw new ServiceException("鍙傛暟涓嶈兘涓虹┖");
}
Long productionOrderId = resolveProductionOrderId(dto);
if (productionOrderId == null) {
@@ -99,17 +118,32 @@
throw new ServiceException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
}
+ // 鏌ヨ璁㈠崟涓嬬幇鏈夐鏂欒褰曞苟鏋勫缓ID绱㈠紩銆�
List<ProductionOrderPick> existingPickList = baseMapper.selectList(
Wrappers.<ProductionOrderPick>lambdaQuery()
.eq(ProductionOrderPick::getProductionOrderId, productionOrderId));
+ // 杞垚Map渚夸簬鍚庣画鎸塈D蹇�熸牎楠屼笌鏇存柊銆�
Map<Long, ProductionOrderPick> existingPickMap = existingPickList.stream()
.filter(item -> item.getId() != null)
.collect(Collectors.toMap(ProductionOrderPick::getId, Function.identity(), (a, b) -> a));
+ // 琛ユ枡璇锋眰鍗曠嫭璧拌ˉ鏂欏垎鏀��
+ if (isFeedingRequest(dto)) {
+ processFeedingPickItems(dto, existingPickMap, productionOrderId);
+ return true;
+ }
+ // 閫�鏂欒姹傚崟鐙蛋閫�鏂欏垎鏀��
+ if (isReturnRequest(dto)) {
+ processReturnPickItems(dto, existingPickMap, productionOrderId);
+ return true;
+ }
+
+ // 鏅�氭洿鏂板満鏅厛澶勭悊鏄惧紡鍒犻櫎銆�
processDeletePickIds(dto, existingPickMap, productionOrderId);
List<ProductionOrderPickDto> pickItems = resolveUpdateItems(dto);
Set<Long> keepPickIdSet = new HashSet<>();
+ // keepPickIdSet 鐢ㄤ簬鏍囪鏈鍓嶇浠嶇劧淇濈暀鐨勬棫璁板綍锛屽悗缁敤浜庤瘑鍒�滄湭鍥炰紶鍗冲垹闄も�濈殑琛屻��
for (int i = 0; i < pickItems.size(); i++) {
int rowNo = i + 1;
ProductionOrderPickDto resolvedDto = mergeDto(dto, pickItems.get(i));
@@ -128,12 +162,14 @@
keepPickIdSet.add(resolvedDto.getId());
updateExistingPick(resolvedDto, rowNo, existingPickMap);
}
+ // 娓呯悊鍓嶇鏈洖浼犳棫琛屽苟鍥炶ˉ搴撳瓨銆�
processMissingPickItems(dto, existingPickMap, productionOrderId, keepPickIdSet);
return true;
}
@Override
public List<ProductionOrderPickVo> listPickedDetail(Long productionOrderId) {
+ // 鏌ヨ璁㈠崟棰嗘枡鏄庣粏锛屽苟琛ラ綈鎵规灞曠ず瀛楁銆�
if (productionOrderId == null) {
return Collections.emptyList();
}
@@ -146,6 +182,11 @@
private void processDeletePickIds(ProductionOrderPickDto rootDto,
Map<Long, ProductionOrderPick> existingPickMap,
Long productionOrderId) {
+ // 澶勭悊鍓嶇鏄惧紡鍒犻櫎ID锛�
+ // 1) 鏍￠獙鍒犻櫎鐩爣鏄惁灞炰簬褰撳墠璁㈠崟锛�
+ // 2) 鍥炶ˉ搴撳瓨锛�
+ // 3) 鍒犻櫎涓昏褰曪紱
+ // 4) 璁板綍鍒犻櫎娴佹按銆�
if (rootDto.getDeletePickIds() == null || rootDto.getDeletePickIds().isEmpty()) {
return;
}
@@ -156,14 +197,14 @@
}
ProductionOrderPick existingPick = existingPickMap.get(deleteId);
if (existingPick == null || !Objects.equals(existingPick.getProductionOrderId(), productionOrderId)) {
- throw new ServiceException("瑕佸垹闄ょ殑棰嗘枡璁板綍涓嶅瓨鍦ㄦ垨涓嶅睘浜庡綋鍓嶈鍗曪紝ID=" + deleteId);
+ throw new ServiceException("鍒犻櫎澶辫触锛氶鏂欒褰曚笉瀛樺湪鎴栦笉灞炰簬褰撳墠璁㈠崟锛孖D=" + deleteId);
}
String oldBatchNo = resolveInventoryBatchNoFromStored(existingPick.getBatchNo());
BigDecimal oldQuantity = defaultDecimal(existingPick.getQuantity());
addInventory(existingPick.getProductModelId(), oldBatchNo, oldQuantity);
int affected = baseMapper.deleteById(deleteId);
if (affected <= 0) {
- throw new ServiceException("鍒犻櫎棰嗘枡澶辫触锛孖D=" + deleteId);
+ throw new ServiceException("鍒犻櫎棰嗘枡璁板綍澶辫触锛孖D=" + deleteId);
}
insertPickRecord(existingPick.getId(),
existingPick.getProductionOrderId(),
@@ -174,7 +215,8 @@
oldQuantity,
BigDecimal.ZERO,
rootDto.getPickType(),
- rootDto.getRemark());
+ rootDto.getRemark(),
+ rootDto.getFeedingReason());
existingPickMap.remove(deleteId);
}
}
@@ -183,6 +225,9 @@
Map<Long, ProductionOrderPick> existingPickMap,
Long productionOrderId,
Set<Long> keepPickIdSet) {
+ // 澶勭悊鈥滃墠绔湭鍥炰紶鈥濈殑鏃ц锛�
+ // 瀵瑰簲鍦烘櫙鏄敤鎴峰湪鍓嶇鍒犻櫎琛屼絾鏈斁鍏� deletePickIds銆�
+ // 杩欓噷鍏滃簳璇嗗埆骞舵墽琛屽洖琛ュ簱瀛� + 鍒犻櫎涓昏褰� + 鍐欐祦姘淬��
if (rootDto.getPickList() == null) {
return;
}
@@ -191,14 +236,14 @@
.filter(item -> item.getId() != null)
.filter(item -> Objects.equals(item.getProductionOrderId(), productionOrderId))
.filter(item -> !keepPickIdSet.contains(item.getId()))
- .collect(Collectors.toList());
+ .toList();
for (ProductionOrderPick missingPick : missingPickList) {
String oldBatchNo = resolveInventoryBatchNoFromStored(missingPick.getBatchNo());
BigDecimal oldQuantity = defaultDecimal(missingPick.getQuantity());
addInventory(missingPick.getProductModelId(), oldBatchNo, oldQuantity);
int affected = baseMapper.deleteById(missingPick.getId());
if (affected <= 0) {
- throw new ServiceException("鍒犻櫎棰嗘枡澶辫触锛孖D=" + missingPick.getId());
+ throw new ServiceException("鍒犻櫎鏈洖浼犻鏂欒褰曞け璐ワ紝ID=" + missingPick.getId());
}
insertPickRecord(missingPick.getId(),
missingPick.getProductionOrderId(),
@@ -209,16 +254,18 @@
oldQuantity,
BigDecimal.ZERO,
rootDto.getPickType(),
- rootDto.getRemark());
+ rootDto.getRemark(),
+ rootDto.getFeedingReason());
existingPickMap.remove(missingPick.getId());
}
}
private void addNewPickInUpdate(ProductionOrderPickDto dto, int rowNo) {
+ // 鏇存柊鍦烘櫙涓嬫柊澧炰竴鏉￠鏂欙細鎵ｅ簱瀛� -> 鏂板涓昏褰� -> 鍐欐祦姘淬��
List<String> batchNoList = resolveBatchNoList(dto);
String inventoryBatchNo = pickInventoryBatchNo(batchNoList);
String storedBatchNo = formatBatchNoStorage(batchNoList);
- subtractInventory(dto.getProductModelId(), inventoryBatchNo, dto.getPickQuantity(), rowNo);
+ subtractInventory(dto.getProductModelId(), storedBatchNo, dto.getPickQuantity(), rowNo);
ProductionOrderPick orderPick = new ProductionOrderPick();
orderPick.setProductionOrderId(dto.getProductionOrderId());
@@ -230,6 +277,7 @@
orderPick.setTechnologyOperationId(dto.getTechnologyOperationId());
orderPick.setDemandedQuantity(dto.getDemandedQuantity());
orderPick.setBom(dto.getBom());
+ orderPick.setReturned(false);
baseMapper.insert(orderPick);
insertPickRecord(orderPick.getId(),
@@ -241,15 +289,136 @@
BigDecimal.ZERO,
dto.getPickQuantity(),
dto.getPickType(),
- dto.getRemark());
+ dto.getRemark(),
+ dto.getFeedingReason());
+ }
+
+ private void processFeedingPickItems(ProductionOrderPickDto rootDto,
+ Map<Long, ProductionOrderPick> existingPickMap,
+ Long productionOrderId) {
+ // 琛ユ枡娴佺▼鍏ュ彛锛�
+ // 閫愯鏍￠獙琛ユ枡鍙傛暟锛屾牎楠屽師棰嗘枡褰掑睘锛屽啀鎵ц琛ユ枡搴撳瓨鎵ｅ噺鍜屼富璁板綍鍥炲啓銆�
+ List<ProductionOrderPickDto> pickItems = resolveUpdateItems(rootDto);
+ for (int i = 0; i < pickItems.size(); i++) {
+ int rowNo = i + 1;
+ ProductionOrderPickDto resolvedDto = mergeDto(rootDto, pickItems.get(i));
+ if (isEmptyUpdateItem(resolvedDto)) {
+ continue;
+ }
+ if (!isFeedingPick(resolvedDto)) {
+ throw new ServiceException("琛ユ枡璇锋眰涓瓨鍦ㄩ潪琛ユ枡绫诲瀷鏁版嵁");
+ }
+ if (resolvedDto.getProductionOrderId() == null) {
+ resolvedDto.setProductionOrderId(productionOrderId);
+ }
+ validateFeedingParam(resolvedDto, rowNo);
+
+ ProductionOrderPick oldPick = existingPickMap.get(resolvedDto.getId());
+ if (oldPick == null || !Objects.equals(oldPick.getProductionOrderId(), productionOrderId)) {
+ throw new ServiceException("绗�" + rowNo + "琛岃ˉ鏂欏け璐ワ細鏈壘鍒板搴旂殑棰嗘枡璁板綍");
+ }
+ addFeedingPick(resolvedDto, oldPick, rowNo);
+ }
+ }
+
+ private void addFeedingPick(ProductionOrderPickDto dto, ProductionOrderPick oldPick, int rowNo) {
+ // 琛ユ枡鏍稿績锛�
+ // 1) 鏍￠獙瑙勬牸涓�鑷达紱
+ // 2) 鎵ｅ噺琛ユ枡搴撳瓨锛�
+ // 3) 鍐欒ˉ鏂欐祦姘达紱
+ // 4) 鍥炲啓涓诲崟绱琛ユ枡閲忓拰瀹為檯閲忋��
+ if (dto.getProductModelId() != null && !Objects.equals(dto.getProductModelId(), oldPick.getProductModelId())) {
+ throw new ServiceException("绗�" + rowNo + "琛岃ˉ鏂欏け璐ワ細浜у搧瑙勬牸涓庡師棰嗘枡璁板綍涓嶄竴鑷�");
+ }
+ Long productModelId = oldPick.getProductModelId();
+ List<String> batchNoList = resolveBatchNoList(dto);
+ String inventoryBatchNo = batchNoList.isEmpty()
+ ? resolveInventoryBatchNoFromStored(oldPick.getBatchNo())
+ : formatBatchNoStorage(batchNoList);
+ BigDecimal feedingQuantity = dto.getFeedingQuantity();
+
+ subtractInventory(productModelId, inventoryBatchNo, feedingQuantity, rowNo);
+
+ // 璁＄畻琛ユ枡鍓嶅悗鏁伴噺骞跺啓琛ユ枡娴佹按銆�
+ BigDecimal beforeFeedingQty = sumFeedingQuantity(dto.getProductionOrderId(), oldPick.getId());
+ BigDecimal afterFeedingQty = beforeFeedingQty.add(feedingQuantity);
+ insertPickRecord(oldPick.getId(),
+ dto.getProductionOrderId(),
+ dto.getProductionOperationTaskId(),
+ productModelId,
+ inventoryBatchNo,
+ feedingQuantity,
+ beforeFeedingQty,
+ afterFeedingQty,
+ PICK_TYPE_FEEDING,
+ dto.getRemark(),
+ dto.getFeedingReason());
+
+ ProductionOrderPick updatePick = new ProductionOrderPick();
+ updatePick.setId(oldPick.getId());
+ updatePick.setFeedingQty(afterFeedingQty);
+ updatePick.setActualQty(calculateActualQty(oldPick, afterFeedingQty));
+ // 鍥炲啓涓昏褰曠殑琛ユ枡绱鍊间笌瀹為檯鐢ㄩ噺銆�
+ int affected = baseMapper.updateById(updatePick);
+ if (affected <= 0) {
+ throw new ServiceException("绗�" + rowNo + "琛岃ˉ鏂欏け璐ワ細鏇存柊棰嗘枡涓昏褰曞け璐�");
+ }
+ oldPick.setFeedingQty(afterFeedingQty);
+ oldPick.setActualQty(updatePick.getActualQty());
+ }
+
+ private void processReturnPickItems(ProductionOrderPickDto rootDto,
+ Map<Long, ProductionOrderPick> existingPickMap,
+ Long productionOrderId) {
+ // 閫�鏂欐祦绋嬪叆鍙ｏ細
+ // 閫愯鏍￠獙閫�鏂欏弬鏁颁笌棰嗘枡褰掑睘锛屽啀鏇存柊閫�鏂欓噺涓庡疄闄呴噺瀛楁銆�
+ List<ProductionOrderPickDto> pickItems = resolveUpdateItems(rootDto);
+ for (int i = 0; i < pickItems.size(); i++) {
+ int rowNo = i + 1;
+ ProductionOrderPickDto resolvedDto = mergeDto(rootDto, pickItems.get(i));
+ if (isEmptyUpdateItem(resolvedDto)) {
+ continue;
+ }
+ if (resolvedDto.getProductionOrderId() == null) {
+ resolvedDto.setProductionOrderId(productionOrderId);
+ }
+ validateReturnParam(resolvedDto, rowNo);
+
+ ProductionOrderPick oldPick = existingPickMap.get(resolvedDto.getId());
+ if (oldPick == null || !Objects.equals(oldPick.getProductionOrderId(), productionOrderId)) {
+ throw new ServiceException("绗�" + rowNo + "琛岄��鏂欏け璐ワ細鏈壘鍒板搴旂殑棰嗘枡璁板綍");
+ }
+ updateReturnPick(resolvedDto, oldPick, rowNo);
+ }
+ }
+
+ private void updateReturnPick(ProductionOrderPickDto dto, ProductionOrderPick oldPick, int rowNo) {
+ // 閫�鏂欐洿鏂板彧鏀逛富棰嗘枡璁板綍涓殑閫�鏂欏瓧娈典笌瀹為檯閲忋��
+ ProductionOrderPick updatePick = new ProductionOrderPick();
+ updatePick.setId(oldPick.getId());
+ updatePick.setReturnQty(dto.getReturnQty());
+ updatePick.setActualQty(dto.getActualQty());
+ updatePick.setReturned(true);
+ int affected = baseMapper.updateById(updatePick);
+ if (affected <= 0) {
+ throw new ServiceException("绗�" + rowNo + "琛岄��鏂欏け璐ワ細鏇存柊棰嗘枡涓昏褰曞け璐�");
+ }
+ oldPick.setReturnQty(updatePick.getReturnQty());
+ oldPick.setActualQty(updatePick.getActualQty());
+ oldPick.setReturned(true);
}
private void updateExistingPick(ProductionOrderPickDto dto,
int rowNo,
Map<Long, ProductionOrderPick> existingPickMap) {
+ // 鏅�氭洿鏂板崟琛屾牳蹇冩祦绋嬶細
+ // 1) 鏍￠獙鏃ц褰曞瓨鍦ㄤ笖灞炰簬褰撳墠璁㈠崟锛�
+ // 2) 姣旇緝鏂版棫鈥滆鏍�+鎵规鈥濓紝鍐冲畾搴撳瓨澶勭悊绛栫暐锛�
+ // 3) 鏇存柊涓昏褰曪紱
+ // 4) 鍐欏彉鏇存祦姘达紙璁板綍鍓嶅悗鏁伴噺鍙樺寲锛夈��
ProductionOrderPick oldPick = existingPickMap.get(dto.getId());
if (oldPick == null || !Objects.equals(oldPick.getProductionOrderId(), dto.getProductionOrderId())) {
- throw new ServiceException("绗�" + rowNo + "鏉￠鏂欒褰曚笉瀛樺湪鎴栦笉灞炰簬褰撳墠璁㈠崟");
+ throw new ServiceException("绗�" + rowNo + "琛屾洿鏂板け璐ワ細鏈壘鍒板搴旂殑棰嗘枡璁板綍");
}
Long oldProductModelId = oldPick.getProductModelId();
@@ -262,18 +431,21 @@
String newStoredBatchNo = formatBatchNoStorage(newBatchNoList);
BigDecimal newQuantity = dto.getPickQuantity();
+ // 鍒ゆ柇瑙勬牸+鎵规鏄惁鍙樺寲锛屽喅瀹氬簱瀛樺鐞嗙瓥鐣ャ��
boolean sameStockKey = Objects.equals(oldProductModelId, newProductModelId)
&& Objects.equals(oldBatchNo, newBatchNo);
if (sameStockKey) {
+ // 瑙勬牸涓庢壒娆′笉鍙橈細鍙寜宸�煎鍑忓簱瀛樸��
BigDecimal delta = newQuantity.subtract(oldQuantity);
if (delta.compareTo(BigDecimal.ZERO) > 0) {
- subtractInventory(newProductModelId, newBatchNo, delta, rowNo);
+ subtractInventory(newProductModelId, newStoredBatchNo, delta, rowNo);
} else if (delta.compareTo(BigDecimal.ZERO) < 0) {
addInventory(oldProductModelId, oldBatchNo, delta.abs());
}
} else {
+ // 瑙勬牸鎴栨壒娆″彉鍖栵細鍏堝洖琛ユ棫搴撳瓨锛屽啀鎵ｅ噺鏂板簱瀛樸��
addInventory(oldProductModelId, oldBatchNo, oldQuantity);
- subtractInventory(newProductModelId, newBatchNo, newQuantity, rowNo);
+ subtractInventory(newProductModelId, newStoredBatchNo, newQuantity, rowNo);
}
oldPick.setProductModelId(newProductModelId);
@@ -290,9 +462,10 @@
}
int affected = baseMapper.updateById(oldPick);
if (affected <= 0) {
- throw new ServiceException("绗�" + rowNo + "鏉￠鏂欐洿鏂板け璐�");
+ throw new ServiceException("绗�" + rowNo + "琛屾洿鏂板け璐ワ細鏇存柊棰嗘枡璁板綍澶辫触");
}
+ // 鍐欏叆鏇存柊娴佹按锛屼繚鐣欐湰娆℃暟閲忓彉鍖栬建杩广��
BigDecimal recordQuantity = sameStockKey ? oldQuantity.subtract(newQuantity).abs() : newQuantity;
if (recordQuantity.compareTo(BigDecimal.ZERO) > 0 || oldQuantity.compareTo(newQuantity) != 0 || !sameStockKey) {
insertPickRecord(oldPick.getId(),
@@ -304,7 +477,8 @@
oldQuantity,
newQuantity,
dto.getPickType(),
- dto.getRemark());
+ dto.getRemark(),
+ dto.getFeedingReason());
}
}
@@ -317,7 +491,9 @@
BigDecimal beforeQuantity,
BigDecimal afterQuantity,
Byte pickType,
- String remark) {
+ String remark,
+ String feedingReason) {
+ // 鍐欓鏂欐祦姘磋褰曪細缁熶竴璁板綍棰嗘枡/琛ユ枡/閫�鏂欐暟閲忓彉鍖栬建杩广��
ProductionOrderPickRecord pickRecord = new ProductionOrderPickRecord();
pickRecord.setPickId(pickId);
pickRecord.setProductionOrderId(productionOrderId);
@@ -327,60 +503,100 @@
pickRecord.setPickQuantity(defaultDecimal(pickQuantity));
pickRecord.setBeforeQuantity(defaultDecimal(beforeQuantity));
pickRecord.setAfterQuantity(defaultDecimal(afterQuantity));
- pickRecord.setPickType(pickType == null ? (byte) 1 : pickType);
+ pickRecord.setPickType(pickType == null ? PICK_TYPE_NORMAL : pickType);
pickRecord.setRemark(remark);
+ pickRecord.setFeedingReason(feedingReason);
productionOrderPickRecordMapper.insert(pickRecord);
}
private void subtractInventory(Long productModelId, String batchNo, BigDecimal quantity, int rowNo) {
- StockInventory stockInventory = stockInventoryMapper.selectOne(buildStockWrapper(productModelId, batchNo));
- if (stockInventory == null) {
- throw new ServiceException("绗�" + rowNo + "鏉￠鏂欏搴斿簱瀛樹笉瀛樺湪");
+ // 鎵ｅ噺搴撳瓨鎬绘祦绋嬶細
+ // 1) 瑙ｆ瀽鎵规鍒楄〃锛�
+ // 2) 璁＄畻姣忎釜鎵规鍙敤閲忎笌鎬诲彲鐢ㄩ噺锛�
+ // 3) 鎸夋壒娆￠『搴忛�愮瑪鎵ｅ噺锛岀洿鍒版墸瀹岀洰鏍囨暟閲忥紱
+ // 4) 浠讳竴姝ュけ璐ュ嵆鎶涢敊骞跺洖婊氫簨鍔°��
+ BigDecimal deductQuantity = defaultDecimal(quantity);
+ // 棰嗘枡鏁伴噺灏忎簬绛変簬0鏃讹紝涓嶉渶瑕佹墽琛屽簱瀛樻墸鍑忋��
+ if (deductQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return;
}
- BigDecimal availableQuantity = defaultDecimal(stockInventory.getQualitity())
- .subtract(defaultDecimal(stockInventory.getLockedQuantity()));
- if (quantity.compareTo(availableQuantity) > 0) {
- throw new ServiceException("绗�" + rowNo + "鏉￠鏂欏彲鐢ㄥ簱瀛樹笉瓒�");
+
+ List<String> batchNoList = parseBatchNoValue(batchNo);
+ if (batchNoList.isEmpty()) {
+ batchNoList = Collections.singletonList(null);
}
- StockInventoryDto stockInventoryDto = new StockInventoryDto();
- stockInventoryDto.setProductModelId(productModelId);
- stockInventoryDto.setBatchNo(batchNo);
- stockInventoryDto.setQualitity(quantity);
- int affected = stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
- if (affected <= 0) {
- throw new ServiceException("绗�" + rowNo + "鏉￠鏂欐墸鍑忓簱瀛樺け璐�");
+
+ // 鍏堣绠楀悇鎵规鍙敤閲忥紝閬垮厤杈规墸杈圭畻瀵艰嚧鍒ゆ柇涓嶄竴鑷淬��
+ Map<String, BigDecimal> availableQuantityMap = new LinkedHashMap<>();
+ BigDecimal totalAvailableQuantity = BigDecimal.ZERO;
+ // 閬嶅巻鎵规锛岃绠楁瘡涓壒娆″彲鐢ㄥ簱瀛樸��
+ for (String currentBatchNo : batchNoList) {
+ // 鏌ヨ褰撳墠瑙勬牸+鎵规鐨勫簱瀛樿褰曘��
+ StockInventory stockInventory = stockInventoryMapper.selectOne(buildStockWrapper(productModelId, currentBatchNo));
+ BigDecimal availableQuantity = BigDecimal.ZERO;
+ if (stockInventory != null) {
+ availableQuantity = defaultDecimal(stockInventory.getQualitity())
+ .subtract(defaultDecimal(stockInventory.getLockedQuantity()));
+ if (availableQuantity.compareTo(BigDecimal.ZERO) < 0) {
+ availableQuantity = BigDecimal.ZERO;
+ }
+ }
+ availableQuantityMap.put(currentBatchNo, availableQuantity);
+ totalAvailableQuantity = totalAvailableQuantity.add(availableQuantity);
+ }
+
+ if (deductQuantity.compareTo(totalAvailableQuantity) > 0) {
+ BigDecimal shortQuantity = deductQuantity.subtract(totalAvailableQuantity);
+ throw new ServiceException("绗�" + rowNo + "琛屾墸鍑忓簱瀛樺け璐ワ細鍙敤搴撳瓨涓嶈冻锛屽綋鍓嶅彲鐢�"
+ + formatQuantity(totalAvailableQuantity) + "锛屼粛缂哄皯" + formatQuantity(shortQuantity));
+ }
+
+ // 鎸夋壒娆￠『搴忛�愮瑪鎵ｅ噺搴撳瓨銆�
+ BigDecimal remainingQuantity = deductQuantity;
+ for (Map.Entry<String, BigDecimal> entry : availableQuantityMap.entrySet()) {
+ if (remainingQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ break;
+ }
+ BigDecimal availableQuantity = defaultDecimal(entry.getValue());
+ if (availableQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ BigDecimal currentDeductQuantity = remainingQuantity.min(availableQuantity);
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setProductModelId(productModelId);
+ stockInventoryDto.setBatchNo(entry.getKey());
+ stockInventoryDto.setQualitity(currentDeductQuantity);
+ int affected = stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
+ if (affected <= 0) {
+ throw new ServiceException("绗�" + rowNo + "琛屾墸鍑忓簱瀛樺け璐ワ細搴撳瓨鏇存柊澶辫触");
+ }
+ remainingQuantity = remainingQuantity.subtract(currentDeductQuantity);
+ }
+
+ if (remainingQuantity.compareTo(BigDecimal.ZERO) > 0) {
+ throw new ServiceException("绗�" + rowNo + "琛屾墸鍑忓簱瀛樺け璐ワ細浠嶆湁鏈墸鍑忔暟閲�" + formatQuantity(remainingQuantity));
}
}
private void addInventory(Long productModelId, String batchNo, BigDecimal quantity) {
+ // 鍥炶ˉ搴撳瓨锛堢敤浜庡垹闄ら鏂欍�佹敼灏忛鏂欍�佸垏鎹㈡壒娆＄瓑鍦烘櫙锛夈��
BigDecimal addQuantity = defaultDecimal(quantity);
if (addQuantity.compareTo(BigDecimal.ZERO) <= 0) {
- return;
- }
- StockInventory stockInventory = stockInventoryMapper.selectOne(buildStockWrapper(productModelId, batchNo));
- if (stockInventory == null) {
- StockInventory newStockInventory = new StockInventory();
- newStockInventory.setProductModelId(productModelId);
- newStockInventory.setBatchNo(batchNo);
- newStockInventory.setQualitity(addQuantity);
- newStockInventory.setLockedQuantity(BigDecimal.ZERO);
- newStockInventory.setVersion(1);
- stockInventoryMapper.insert(newStockInventory);
return;
}
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setProductModelId(productModelId);
stockInventoryDto.setBatchNo(batchNo);
stockInventoryDto.setQualitity(addQuantity);
- int affected = stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
- if (affected <= 0) {
- throw new ServiceException("搴撳瓨鍥為��澶辫触锛屼骇鍝佽鏍糏D=" + productModelId);
- }
+ stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.PICK_RETURN_IN.getCode()));
+ stockInventoryDto.setRecordId(0L);
+ stockInventoryService.addStockInRecordOnly(stockInventoryDto);
}
private List<ProductionOrderPickDto> resolvePickItems(ProductionOrderPickDto dto) {
+ // 瑙ｆ瀽鏂板鍦烘櫙鐨勯鏂欐槑缁嗛泦鍚堛��
if (dto == null) {
- throw new ServiceException("棰嗘枡鍙傛暟涓嶈兘涓虹┖");
+ throw new ServiceException("鍙傛暟涓嶈兘涓虹┖");
}
if (dto.getPickList() != null && !dto.getPickList().isEmpty()) {
return dto.getPickList();
@@ -389,6 +605,7 @@
}
private List<ProductionOrderPickDto> resolveUpdateItems(ProductionOrderPickDto dto) {
+ // 瑙ｆ瀽鏇存柊鍦烘櫙鐨勯鏂欐槑缁嗛泦鍚堛��
if (dto.getPickList() != null) {
return dto.getPickList();
}
@@ -399,12 +616,18 @@
}
private boolean isEmptyUpdateItem(ProductionOrderPickDto dto) {
+ // 鍒ゆ柇鏇存柊琛屾槸鍚︿负绌虹櫧鍗犱綅琛屻��
return dto.getId() == null
&& dto.getProductModelId() == null
&& dto.getPickQuantity() == null
&& StringUtils.isEmpty(dto.getBatchNo())
&& (dto.getBatchNoList() == null || dto.getBatchNoList().isEmpty())
&& dto.getPickType() == null
+ && dto.getFeedingQuantity() == null
+ && StringUtils.isEmpty(dto.getFeedingReason())
+ && dto.getReturnQty() == null
+ && dto.getActualQty() == null
+ && dto.getReturned() == null
&& dto.getProductionOperationTaskId() == null
&& dto.getTechnologyOperationId() == null
&& StringUtils.isEmpty(dto.getOperationName())
@@ -414,6 +637,7 @@
}
private Long resolveProductionOrderId(ProductionOrderPickDto dto) {
+ // 浼樺厛浠庝富DTO瑙ｆ瀽璁㈠崟ID锛屼笉瀛樺湪鏃跺啀浠庡瓙椤逛腑鍥為��鏌ユ壘銆�
if (dto.getProductionOrderId() != null) {
return dto.getProductionOrderId();
}
@@ -429,7 +653,12 @@
}
private ProductionOrderPickDto mergeDto(ProductionOrderPickDto rootDto, ProductionOrderPickDto itemDto) {
+ // 鍚堝苟瑙勫垯锛�
+ // - itemDto 浼樺厛鎵胯浇琛岀骇杈撳叆锛�
+ // - itemDto 缂哄け瀛楁浠� rootDto 鍏滃簳缁ф壙锛�
+ // - 杈撳嚭 merged 浣滀负缁熶竴涓氬姟鍏ュ弬銆�
ProductionOrderPickDto merged = new ProductionOrderPickDto();
+ // 鍏堟嫹璐濊绾у瓧娈点��
if (itemDto != null) {
merged.setId(itemDto.getId());
merged.setProductionOrderId(itemDto.getProductionOrderId());
@@ -440,10 +669,15 @@
merged.setPickQuantity(itemDto.getPickQuantity());
merged.setPickType(itemDto.getPickType());
merged.setRemark(itemDto.getRemark());
+ merged.setFeedingReason(itemDto.getFeedingReason());
+ merged.setFeedingQuantity(itemDto.getFeedingQuantity());
merged.setTechnologyOperationId(itemDto.getTechnologyOperationId());
merged.setOperationName(itemDto.getOperationName());
merged.setDemandedQuantity(itemDto.getDemandedQuantity());
merged.setBom(itemDto.getBom());
+ merged.setReturnQty(itemDto.getReturnQty());
+ merged.setActualQty(itemDto.getActualQty());
+ merged.setReturned(itemDto.getReturned());
}
if (merged.getId() == null) {
merged.setId(rootDto.getId());
@@ -472,6 +706,12 @@
if (merged.getRemark() == null) {
merged.setRemark(rootDto.getRemark());
}
+ if (merged.getFeedingReason() == null) {
+ merged.setFeedingReason(rootDto.getFeedingReason());
+ }
+ if (merged.getFeedingQuantity() == null) {
+ merged.setFeedingQuantity(rootDto.getFeedingQuantity());
+ }
if (merged.getTechnologyOperationId() == null) {
merged.setTechnologyOperationId(rootDto.getTechnologyOperationId());
}
@@ -484,25 +724,124 @@
if (merged.getBom() == null) {
merged.setBom(rootDto.getBom());
}
+ if (merged.getReturnQty() == null) {
+ merged.setReturnQty(rootDto.getReturnQty());
+ }
+ if (merged.getActualQty() == null) {
+ merged.setActualQty(rootDto.getActualQty());
+ }
+ if (merged.getReturned() == null) {
+ merged.setReturned(rootDto.getReturned());
+ }
return merged;
}
private void validatePickParam(ProductionOrderPickDto dto, int rowNo) {
+ // 鏍￠獙鏅�氶鏂欏弬鏁帮紙璁㈠崟銆佽鏍笺�佹暟閲忋�佺被鍨嬶級銆�
if (dto.getProductionOrderId() == null) {
- throw new ServiceException("绗�" + rowNo + "鏉＄敓浜ц鍗旾D涓嶈兘涓虹┖");
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細鐢熶骇璁㈠崟ID涓嶈兘涓虹┖");
}
if (dto.getProductModelId() == null) {
- throw new ServiceException("绗�" + rowNo + "鏉′骇鍝佽鏍糏D涓嶈兘涓虹┖");
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細浜у搧瑙勬牸涓嶈兘涓虹┖");
}
- if (dto.getPickQuantity() == null || dto.getPickQuantity().compareTo(BigDecimal.ZERO) <= 0) {
- throw new ServiceException("绗�" + rowNo + "鏉￠鏂欐暟閲忓繀椤诲ぇ浜�0");
+ if (dto.getPickQuantity() == null || dto.getPickQuantity().compareTo(BigDecimal.ZERO) < 0) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細棰嗘枡鏁伴噺涓嶈兘灏忎簬0");
}
- if (dto.getPickType() != null && dto.getPickType() != 1 && dto.getPickType() != 2) {
- throw new ServiceException("绗�" + rowNo + "鏉￠鏂欑被鍨嬪彧鑳芥槸1鎴�2");
+ if (dto.getPickType() != null && dto.getPickType() != PICK_TYPE_NORMAL && dto.getPickType() != PICK_TYPE_FEEDING) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細棰嗘枡绫诲瀷浠呮敮鎸�1(棰嗘枡)鎴�2(琛ユ枡)");
}
}
+ private void validateFeedingParam(ProductionOrderPickDto dto, int rowNo) {
+ // 鏍￠獙琛ユ枡鍙傛暟锛堣鍗曘�侀鏂橧D銆佽ˉ鏂欐暟閲忋�佺被鍨嬶級銆�
+ if (dto.getProductionOrderId() == null) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細鐢熶骇璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ if (dto.getId() == null) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細棰嗘枡璁板綍ID涓嶈兘涓虹┖");
+ }
+ if (dto.getFeedingQuantity() == null || dto.getFeedingQuantity().compareTo(BigDecimal.ZERO) < 0) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細琛ユ枡鏁伴噺涓嶈兘灏忎簬0");
+ }
+ if (!isFeedingPick(dto)) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細琛ユ枡鍦烘櫙涓嬮鏂欑被鍨嬪繀椤讳负2");
+ }
+ }
+
+ private void validateReturnParam(ProductionOrderPickDto dto, int rowNo) {
+ // 鏍￠獙閫�鏂欏弬鏁帮紙璁㈠崟銆侀鏂橧D銆侀��鏂欓噺銆佸疄闄呴噺锛夈��
+ if (dto.getProductionOrderId() == null) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細鐢熶骇璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ if (dto.getId() == null) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細棰嗘枡璁板綍ID涓嶈兘涓虹┖");
+ }
+ if (dto.getReturnQty() == null || dto.getReturnQty().compareTo(BigDecimal.ZERO) < 0) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細閫�鏂欐暟閲忎笉鑳藉皬浜�0");
+ }
+ if (dto.getActualQty() == null || dto.getActualQty().compareTo(BigDecimal.ZERO) < 0) {
+ throw new ServiceException("绗�" + rowNo + "琛屽弬鏁伴敊璇細瀹為檯鏁伴噺涓嶈兘灏忎簬0");
+ }
+ }
+
+ private boolean isFeedingRequest(ProductionOrderPickDto dto) {
+ // 鍒ゆ柇褰撳墠璇锋眰鏄惁灞炰簬琛ユ枡娴佺▼銆�
+ if (isFeedingPick(dto)) {
+ return true;
+ }
+ if (dto.getPickList() == null || dto.getPickList().isEmpty()) {
+ return false;
+ }
+ return dto.getPickList().stream()
+ .filter(Objects::nonNull)
+ .anyMatch(this::isFeedingPick);
+ }
+
+ private boolean isFeedingPick(ProductionOrderPickDto dto) {
+ // 鍒ゆ柇褰撳墠琛屾槸鍚︿负琛ユ枡绫诲瀷銆�
+ return dto != null && Objects.equals(dto.getPickType(), PICK_TYPE_FEEDING);
+ }
+
+ private boolean isReturnRequest(ProductionOrderPickDto dto) {
+ // 鍒ゆ柇褰撳墠璇锋眰鏄惁灞炰簬閫�鏂欐祦绋嬨��
+ if (isReturnPick(dto)) {
+ return true;
+ }
+ if (dto.getPickList() == null || dto.getPickList().isEmpty()) {
+ return false;
+ }
+ return dto.getPickList().stream()
+ .filter(Objects::nonNull)
+ .anyMatch(this::isReturnPick);
+ }
+
+ private boolean isReturnPick(ProductionOrderPickDto dto) {
+ // 鍒ゆ柇褰撳墠琛屾槸鍚︿负閫�鏂欑被鍨嬨��
+ return dto != null && Boolean.TRUE.equals(dto.getReturned());
+ }
+
+ private BigDecimal sumFeedingQuantity(Long productionOrderId, Long pickId) {
+ // 姹囨�绘寚瀹氶鏂欏崟鐨勫巻鍙茶ˉ鏂欐�婚噺銆�
+ List<ProductionOrderPickRecord> feedingRecords = productionOrderPickRecordMapper.selectList(
+ Wrappers.<ProductionOrderPickRecord>lambdaQuery()
+ .eq(ProductionOrderPickRecord::getProductionOrderId, productionOrderId)
+ .eq(ProductionOrderPickRecord::getPickId, pickId)
+ .eq(ProductionOrderPickRecord::getPickType, PICK_TYPE_FEEDING));
+ return feedingRecords.stream()
+ .map(ProductionOrderPickRecord::getPickQuantity)
+ .map(this::defaultDecimal)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
+ private BigDecimal calculateActualQty(ProductionOrderPick pick, BigDecimal feedingQty) {
+ // 鎸夆�滈鏂�+琛ユ枡-閫�鏂欌�濊绠楀疄闄呯敤閲忋��
+ return defaultDecimal(pick.getQuantity())
+ .add(defaultDecimal(feedingQty))
+ .subtract(defaultDecimal(pick.getReturnQty()));
+ }
+
private String normalizeBatchNo(String batchNo) {
+ // 鏍囧噯鍖栨壒娆″彿锛堝幓绌虹櫧銆佺┖涓茶浆null锛夈��
if (StringUtils.isEmpty(batchNo)) {
return null;
}
@@ -510,6 +849,7 @@
return trimBatchNo.isEmpty() ? null : trimBatchNo;
}
private List<String> resolveBatchNoList(ProductionOrderPickDto dto) {
+ // 浼樺厛瑙ｆ瀽 batchNoList锛岀┖鍒欏洖閫�瑙ｆ瀽 batchNo 瀛楃涓层��
List<String> normalizedBatchNoList = normalizeBatchNoList(dto.getBatchNoList());
if (!normalizedBatchNoList.isEmpty()) {
return normalizedBatchNoList;
@@ -518,6 +858,7 @@
}
private String pickInventoryBatchNo(List<String> batchNoList) {
+ // 浠庢壒娆￠泦鍚堜腑鍙栧簱瀛樻墸鍑忎娇鐢ㄧ殑鎵规銆�
if (batchNoList == null || batchNoList.isEmpty()) {
return null;
}
@@ -525,10 +866,12 @@
}
private String resolveInventoryBatchNoFromStored(String storedBatchNo) {
+ // 浠庢暟鎹簱瀛樺偍鎵规瀛楁涓弽瑙ｅ彲鐢ㄦ壒娆°��
return pickInventoryBatchNo(parseBatchNoValue(storedBatchNo));
}
private String formatBatchNoStorage(List<String> batchNoList) {
+ // 灏嗘壒娆￠泦鍚堟牸寮忓寲涓烘暟鎹簱瀛樺偍鍊笺��
if (batchNoList == null || batchNoList.isEmpty()) {
return null;
}
@@ -539,6 +882,7 @@
}
private List<String> normalizeBatchNoList(List<String> batchNoList) {
+ // 鎵归噺鏍囧噯鍖栨壒娆″彿骞跺幓閲嶃��
if (batchNoList == null || batchNoList.isEmpty()) {
return Collections.emptyList();
}
@@ -553,6 +897,7 @@
}
private void fillBatchNoList(List<ProductionOrderPickVo> detailList) {
+ // 灏嗗悓璁㈠崟+鍚岃鏍�+鍚屽伐搴忕殑鏁版嵁鎸夌粍鑱氬悎鎵规锛屼究浜庡墠绔粺涓�灞曠ず銆�
if (detailList == null || detailList.isEmpty()) {
return;
}
@@ -573,9 +918,11 @@
}
private void fillSelectableBatchNoList(List<ProductionOrderPickVo> detailList) {
+ // 鍚堝苟鈥滃凡閫夋壒娆♀�濆拰鈥滃簱瀛樺彲閫夋壒娆♀�濓紝鐢ㄤ簬鍓嶇涓嬫媺銆�
if (detailList == null || detailList.isEmpty()) {
return;
}
+ // 鍏堟敹闆嗘槑缁嗕腑娑夊強鐨勮鏍糏D锛屾壒閲忔煡璇㈠簱瀛樻壒娆°��
Set<Long> productModelIdSet = detailList.stream()
.map(ProductionOrderPickVo::getProductModelId)
.filter(Objects::nonNull)
@@ -609,30 +956,35 @@
}
private String buildBatchNoGroupKey(ProductionOrderPickVo detail) {
- return String.valueOf(detail.getProductionOrderId()) + "|"
- + String.valueOf(detail.getProductModelId()) + "|"
- + String.valueOf(detail.getTechnologyOperationId()) + "|"
- + String.valueOf(detail.getOperationName());
+ // 鏋勫缓鎵规鑱氬悎鍒嗙粍閿��
+ return detail.getProductionOrderId() + "|"
+ + detail.getProductModelId() + "|"
+ + detail.getTechnologyOperationId() + "|"
+ + detail.getOperationName();
}
private List<String> parseBatchNoValue(String rawBatchNoValue) {
+ // 鎵规瑙ｆ瀽鍏煎涓夌鏍煎紡锛�
+ // 1) 鍗曞�硷細A001
+ // 2) 閫楀彿鍒嗛殧锛欰001,A002
+ // 3) 绫籎SON鏁扮粍瀛楃涓诧細["A001","A002"]
String normalizedValue = normalizeBatchNo(rawBatchNoValue);
if (StringUtils.isEmpty(normalizedValue)) {
return Collections.emptyList();
}
- if (normalizedValue.startsWith("[") && normalizedValue.endsWith("]")) {
+ if (normalizedValue != null && normalizedValue.startsWith("[") && normalizedValue.endsWith("]")) {
String value = normalizedValue.substring(1, normalizedValue.length() - 1);
if (StringUtils.isEmpty(value)) {
return Collections.emptyList();
}
List<String> parsed = Arrays.stream(value.split(","))
- .map(item -> item == null ? null : item.trim().replace("\"", "").replace("'", ""))
+ .map(item -> item.trim().replace("\"", "").replace("'", ""))
.collect(Collectors.toList());
return normalizeBatchNoList(parsed);
}
- if (normalizedValue.contains(",")) {
+ if (normalizedValue != null && normalizedValue.contains(",")) {
List<String> parsed = Arrays.stream(normalizedValue.split(","))
- .map(item -> item == null ? null : item.trim())
+ .map(item -> item.trim())
.collect(Collectors.toList());
return normalizeBatchNoList(parsed);
}
@@ -640,6 +992,7 @@
}
private LambdaQueryWrapper<StockInventory> buildStockWrapper(Long productModelId, String batchNo) {
+ // 鏋勫缓搴撳瓨鏌ヨ鏉′欢锛堣鏍� + 鎵规锛夈��
LambdaQueryWrapper<StockInventory> wrapper = Wrappers.<StockInventory>lambdaQuery()
.eq(StockInventory::getProductModelId, productModelId);
if (StringUtils.isEmpty(batchNo)) {
@@ -651,7 +1004,12 @@
}
private BigDecimal defaultDecimal(BigDecimal value) {
+ // BigDecimal 绌哄�煎厹搴曪紝缁熶竴鎸�0澶勭悊銆�
return value == null ? BigDecimal.ZERO : value;
}
-}
+ private String formatQuantity(BigDecimal value) {
+ // 鏁伴噺鏍煎紡鍖栬緭鍑猴紙鍘婚櫎鏈熬鏃犳晥0锛夈��
+ return defaultDecimal(value).stripTrailingZeros().toPlainString();
+ }
+}
--
Gitblit v1.9.3