diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java index 4faff57..2f29d6b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java @@ -106,7 +106,7 @@ public class CheckDifferenceRecordController extends BaseController { } /** - * 删除盘点差异 + * 审核未通过盘点差异 */ @PreAuthorize("@ss.hasPermi('check:difference:remove')") @Log(title = "盘点差异", businessType = BusinessType.DELETE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java index 47ecbe4..6999245 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java @@ -4,8 +4,10 @@ import java.util.Date; import java.util.List; import cn.hutool.core.util.IdUtil; +import org.springframework.beans.BeanUtils; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; +import com.ruoyi.check.DifferenceRecordFinish.domain.CheckDifferenceRecordFinish; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; @@ -15,9 +17,11 @@ import com.ruoyi.stock.stock.service.IBasStockService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.check.difference.mapper.CheckDifferenceRecordMapper; import com.ruoyi.check.difference.domain.CheckDifferenceRecord; +import com.ruoyi.check.DifferenceRecordFinish.domain.CheckDifferenceRecordFinish; +import com.ruoyi.check.difference.mapper.CheckDifferenceRecordMapper; import com.ruoyi.check.difference.service.ICheckDifferenceRecordService; +import com.ruoyi.check.DifferenceRecordFinish.service.ICheckDifferenceRecordFinishService; /** * 盘点差异Service业务层处理 @@ -33,6 +37,9 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS private CheckDifferenceRecordMapper checkDifferenceRecordMapper; @Autowired private IBasStockService basStockService; + + @Autowired + private ICheckDifferenceRecordFinishService checkDifferenceRecordFinishService; @Autowired private IBasCargoSpaceService basCargoSpaceService; @@ -143,9 +150,9 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS } /** - * 批量删除盘点差异 + * 审核未通过盘点差异 * - * @param checkGuids 需要删除的盘点差异主键 + * @param checkGuids 审核未通过盘点差异主键 * @return 结果 */ @Override @@ -159,6 +166,14 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS basStock.setProductStatus("1"); basStockService.updateBasStock(basStock); } + + // 设置审核状态为审核未通过 + checkDifferenceRecord.setStatus("2"); + + // 创建历史记录 + CheckDifferenceRecordFinish finishRecord = new CheckDifferenceRecordFinish(); + BeanUtils.copyProperties(checkDifferenceRecord, finishRecord); + checkDifferenceRecordFinishService.insertCheckDifferenceRecordFinish(finishRecord); } return checkDifferenceRecordMapper.deleteCheckDifferenceRecordByCheckGuids(checkGuids); }