From f0f19fae3c310667b6732a3ac96df8e5d618fcff Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 18 三月 2026 15:15:37 +0800
Subject: [PATCH] 1.生产报工的成品未进入到入库记录中 2.仓储物流-入库来源保留合格自定义入库、生产报工-入库。出库来源只保留合格自定义出库
---
src/main/java/com/ruoyi/quality/controller/RawMaterialController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
index 92f13f1..ffcbba4 100644
--- a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
+++ b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
@@ -1,13 +1,16 @@
package com.ruoyi.quality.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.enums.RawMaterialInspectState;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.dto.RawMaterialDto;
-import com.ruoyi.quality.pojo.QualityInspect;
-import com.ruoyi.quality.pojo.RawMaterial;
+import com.ruoyi.quality.pojo.*;
+import com.ruoyi.quality.service.IQualityInspectFileService;
+import com.ruoyi.quality.service.RawMaterialQualityInspectItemService;
import com.ruoyi.quality.service.RawMaterialService;
-import com.ruoyi.staff.pojo.StaffOnJob;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -27,6 +30,12 @@
public class RawMaterialController {
@Resource
private RawMaterialService rawMaterialService;
+
+ @Resource
+ private RawMaterialQualityInspectItemService rawMaterialQualityInspectItemService;
+
+ @Resource
+ private IQualityInspectFileService qualityInspectFileService;
/**
* 鍘熸枡鍒嗛〉鏌ヨ
@@ -59,10 +68,7 @@
*/
@PatchMapping("/submit/{id}")
public AjaxResult submit(@PathVariable Long id) {
- RawMaterial rawMaterial = new RawMaterial();
- rawMaterial.setId(id);
- rawMaterial.setInspectState(RawMaterialInspectState.RawMaterialInspectStateSubmitted.getCode());
- return AjaxResult.success(rawMaterialService.updateById(rawMaterial));
+ return AjaxResult.success(rawMaterialService.submit(id));
}
/**
@@ -90,8 +96,26 @@
* 鍘熸枡鍒犻櫎
*/
@DeleteMapping("")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Integer> ids) {
- return AjaxResult.success(rawMaterialService.removeByIds(ids));
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ //濡傛灉宸茬粡鎻愪氦灏变笉鍏佽鍒犻櫎
+ List<RawMaterial> rawMaterials = rawMaterialService.list(Wrappers.<RawMaterial>lambdaQuery()
+ .in(RawMaterial::getId,ids)
+ .eq(RawMaterial::getInspectState, RawMaterialInspectState.RawMaterialInspectStateSubmitted.getCode()));
+ if(!CollectionUtils.isEmpty(rawMaterials)){
+ throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁稿垹闄�");
+ }
+ //鍒犻櫎妫�楠屽弬鏁�
+ rawMaterialQualityInspectItemService.remove(Wrappers.<RawMaterialQualityInspectItem>lambdaQuery()
+ .in(RawMaterialQualityInspectItem::getRawMaterialId,ids));
+ //鍒犻櫎妫�楠岄檮浠�
+ qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
+ .in(QualityInspectFile::getInspectId,ids));
+ //鍒犻櫎妫�楠屽崟
+ return AjaxResult.success(rawMaterialService.removeBatchByIds(ids));
}
/**
--
Gitblit v1.9.3