src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -218,13 +218,13 @@ shippingInfo.setStatus("审核通过"); shippingInfo.setShippingDate(new Date()); //更改出库审核状态（待确认改成待审核） stockUtils.shipmentStatus(StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), shippingInfo.getId()); //stockUtils.shipmentStatus(StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), shippingInfo.getId()); } else if (status.equals(3)) { //删除原本（待确认）的出库审核状态 stockUtils.deleteStockOutRecord(shippingInfo.getId(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode()); shippingInfo.setStatus("审核拒绝"); //stockUtils.deleteStockOutRecord(shippingInfo.getId(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode()); //shippingInfo.setStatus("审核拒绝"); } else if (status.equals(1)) { shippingInfo.setStatus("审核中"); //shippingInfo.setStatus("审核中"); } shippingInfoMapper.updateById(shippingInfo); } src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -3,7 +3,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.enums.ReviewStatusEnum; import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum; import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum; import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper; import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper; import com.ruoyi.stock.dto.StockInventoryDto; @@ -111,6 +114,11 @@ stockInventoryDto.setProductModelId(productModelId); stockInventoryDto.setBatchNo(batchNo); stockInventoryService.addStockInRecordOnly(stockInventoryDto); //StockInRecord stockInRecord = stockInRecordService.getOne(Wrappers.<StockInRecord>lambdaQuery() // .eq(StockInRecord::getRecordId, stockInventoryDto.getRecordId()) // .eq(StockInRecord::getRecordType, stockInventoryDto.getRecordType()) //); //stockInRecordService.batchApprove(Collections.singletonList(stockInRecord.getId()),1); } /** @@ -129,6 +137,11 @@ stockInventoryDto.setProductModelId(productModelId); stockInventoryDto.setBatchNo(batchNo); stockInventoryService.addStockOutRecordOnly(stockInventoryDto); StockOutRecord stockOutRecord = stockOutRecordService.getOne(Wrappers.<StockOutRecord>lambdaQuery() .eq(StockOutRecord::getRecordId, stockInventoryDto.getRecordId()) .eq(StockOutRecord::getRecordType, stockInventoryDto.getRecordType()) ); stockOutRecordService.batchApprove(Collections.singletonList(stockOutRecord.getId()),1); } /** src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -27,6 +27,7 @@ import com.ruoyi.quality.mapper.*; import com.ruoyi.quality.pojo.*; import com.ruoyi.stock.pojo.StockInRecord; import com.ruoyi.stock.pojo.StockInventory; import com.ruoyi.stock.service.StockInRecordService; import com.ruoyi.stock.dto.StockInventoryDto; import com.ruoyi.stock.service.StockInventoryService; @@ -42,15 +43,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.*; import java.util.stream.Collectors; @Service @@ -360,6 +353,12 @@ StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode(), productModel.getId(), "0"); //StockInRecord stockInRecord = stockInRecordService.getOne(Wrappers.<StockInRecord>lambdaQuery() // .eq(StockInRecord::getRecordId, productionProductMain.getId()) // .eq(StockInRecord::getRecordType, StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode()) //); //stockInRecordService.batchApprove(Collections.singletonList(stockInRecord.getId()),1); } productionOperationTask.setCompleteQuantity(defaultDecimal(productionOperationTask.getCompleteQuantity()).add(productQty)); src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -13,6 +13,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.HackLoopTableRenderPolicy; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.web.domain.R; import com.ruoyi.procurementrecord.service.ProcurementRecordService; import com.ruoyi.procurementrecord.utils.StockUtils; import com.ruoyi.quality.dto.QualityInspectDto; @@ -40,6 +41,7 @@ import java.math.BigDecimal; import java.net.URLEncoder; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -128,6 +130,11 @@ qualityInspect.getId(), qualityInspect.getProductModelId())); stockInventoryService.addStockInRecordOnly(stockInventoryDto); //StockInRecord stockInRecord = stockInRecordService.getOne(Wrappers.<StockInRecord>lambdaQuery() // .eq(StockInRecord::getRecordId, qualityInspect.getId()) // .eq(StockInRecord::getRecordType, stockInventoryDto.getRecordType()) //); //stockInRecordService.batchApprove(Collections.singletonList(stockInRecord.getId()),1); } // 不合格处理 if(qualityInspect.getUnqualifiedQuantity().compareTo(BigDecimal.ZERO) > 0){ src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.approve.pojo.ApproveProcess; @@ -10,6 +11,7 @@ import com.ruoyi.basic.enums.RecordTypeEnum; import com.ruoyi.basic.utils.FileUtil; import com.ruoyi.common.enums.FileNameType; import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum; import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum; import com.ruoyi.procurementrecord.bean.vo.ShippingProductVo; import com.ruoyi.procurementrecord.utils.StockUtils; @@ -22,12 +24,16 @@ import com.ruoyi.sales.pojo.ShippingInfo; import com.ruoyi.sales.pojo.ShippingProductDetail; import com.ruoyi.sales.service.ShippingInfoService; import com.ruoyi.stock.pojo.StockInRecord; import com.ruoyi.stock.pojo.StockOutRecord; import com.ruoyi.stock.service.StockOutRecordService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Collections; import java.util.List; /** @@ -52,6 +58,7 @@ private final ApproveProcessServiceImpl approveProcessService; private final FileUtil fileUtil; private final ShippingProductDetailMapper shippingProductDetailMapper; private final StockOutRecordService stockOutRecordService; @Override public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) { @@ -137,6 +144,11 @@ shippingProductDetailMapper.insert(req.getBatchNoDetailList()); for (ShippingProductDetail shippingProductDetail : req.getBatchNoDetailList()) { stockUtils.substractStock(shippingProductDetail.getProductModelId(), shippingProductDetail.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId(), shippingProductDetail.getBatchNo()); //StockOutRecord stockOutRecord = stockOutRecordService.getOne(Wrappers.<StockOutRecord>lambdaQuery() // .eq(StockOutRecord::getRecordId, req.getId()) // .eq(StockOutRecord::getRecordType, StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode()) //); //stockOutRecordService.batchApprove(Collections.singletonList(stockOutRecord.getId()),1); } // 保存文件 fileUtil.saveStorageAttachment(ApplicationTypeEnum.IMAGE, RecordTypeEnum.SHIPPING_INFO, req.getId(), req.getStorageBlobDTOs()); src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -263,9 +263,9 @@ if (stockInRecord == null) { throw new BaseException("入库记录不存在,无法审批!!!"); } if (stockInRecord.getApprovalStatus() != null && !ReviewStatusEnum.PENDING_REVIEW.getCode().equals(stockInRecord.getApprovalStatus())) { /*if (stockInRecord.getApprovalStatus() != null && !ReviewStatusEnum.PENDING_REVIEW.getCode().equals(stockInRecord.getApprovalStatus())) { throw new BaseException("只有待审批状态的记录才能审批,入库批次:" + stockInRecord.getInboundBatches()); } }*/ stockInRecord.setApprovalStatus(approvalStatus); stockInRecordMapper.updateById(stockInRecord);
@@ -37,10 +37,7 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.*; /** * <p> @@ -170,6 +167,13 @@ stockInRecordDto.setType("0"); stockInRecordDto.setRemark(stockInventoryDto.getRemark()); stockInRecordService.add(stockInRecordDto); StockInRecord stockInRecord = stockInRecordService.getOne(Wrappers.<StockInRecord>lambdaQuery() .eq(StockInRecord::getRecordId, stockInRecordDto.getRecordId()) .eq(StockInRecord::getRecordType, stockInRecordDto.getRecordType()) ); stockInRecordService.batchApprove(Collections.singletonList(stockInRecord.getId()),1); return true; }
@@ -173,9 +173,9 @@ if (stockOutRecord == null) { throw new BaseException("出库记录不存在,无法审批!!!"); } if (stockOutRecord.getApprovalStatus() != null && !ReviewStatusEnum.PENDING_REVIEW.getCode().equals(stockOutRecord.getApprovalStatus())) { throw new BaseException("只有待审批状态的记录才能审批,出库批次:" + stockOutRecord.getOutboundBatches()); } //if (stockOutRecord.getApprovalStatus() != null && !ReviewStatusEnum.PENDING_REVIEW.getCode().equals(stockOutRecord.getApprovalStatus())) { // throw new BaseException("只有待审批状态的记录才能审批,出库批次:" + stockOutRecord.getOutboundBatches()); //} stockOutRecord.setApprovalStatus(approvalStatus); stockOutRecordMapper.updateById(stockOutRecord); // 审批通过时，扣减库存
