| | |
|---|
| | | BigDecimal totalReturnQty = oldReturnQty.add(currentReturnQty); |
|---|
| | | if (currentReturnQty.compareTo(BigDecimal.ZERO) > 0) { |
|---|
| | | String returnBatchNo = resolveInventoryBatchNoFromStored(oldPick.getBatchNo()); |
|---|
| | | addInventory(oldPick.getId(), oldPick.getProductModelId(), returnBatchNo, currentReturnQty, FEED_RETURN_IN_RECORD_TYPE); |
|---|
| | | addInventoryRecordOnly(oldPick.getId(), oldPick.getProductModelId(), returnBatchNo, currentReturnQty, FEED_RETURN_IN_RECORD_TYPE); |
|---|
| | | } |
|---|
| | | |
|---|
| | | BigDecimal actualQty = defaultDecimal(oldPick.getQuantity()) |
|---|
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | private void addInventoryRecordOnly(Long recordId, |
|---|
| | | Long productModelId, |
|---|
| | | String batchNo, |
|---|
| | | BigDecimal quantity, |
|---|
| | | String stockInRecordType) { |
|---|
| | | // 仅记录入库申请，不做审核通过。 |
|---|
| | | BigDecimal addQuantity = defaultDecimal(quantity); |
|---|
| | | if (addQuantity.compareTo(BigDecimal.ZERO) <= 0) { |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | try { |
|---|
| | | StockInventoryDto stockInventoryDto = new StockInventoryDto(); |
|---|
| | | stockInventoryDto.setProductModelId(productModelId); |
|---|
| | | stockInventoryDto.setBatchNo(batchNo); |
|---|
| | | stockInventoryDto.setQualitity(addQuantity); |
|---|
| | | stockInventoryDto.setRecordType(stockInRecordType); |
|---|
| | | stockInventoryDto.setRecordId(recordId == null ? 0L : recordId); |
|---|
| | | stockInventoryService.addStockInRecordOnly(stockInventoryDto); |
|---|
| | | } catch (ServiceException ex) { |
|---|
| | | throw ex; |
|---|
| | | } catch (Exception ex) { |
|---|
| | | throw new ServiceException("退料入库记录保存失败：" + ex.getMessage()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | private List<ProductionOrderPickDto> resolvePickItems(ProductionOrderPickDto dto) { |
|---|
| | | // 解析新增场景的领料明细集合。 |
|---|
| | | if (dto == null) { |
|---|
