Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
秦鸿展
2026-02-25 14:00:39 +08:00
@@ -418,8 +418,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
public synchronized void xgkc(List<OutMaterialDetail> outMaterialDetailList,String outOrderNumber,LoginUser loginUser) {
StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber));
for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
BigDecimal alreadyAllocationQuantity = outMaterialDetail.getAlreadyAllocationQuantity();
String isAllocated = outMaterialDetail.getIsAllocated();
Long materialDetailId = outMaterialDetail.getMaterialDetailId();
OutMaterialDetail isAllocatedDetail = outMaterialDetailMapper.selectById(materialDetailId);
String isAllocated = isAllocatedDetail.getIsAllocated();
// 如果已经分配过,则跳过本次循环(该明细已分配过,不再重复处理)
if (isAllocated != null && "1".equals(isAllocated)) {
continue;