From dc65f9d54db26c5655ebce137f0d5442508c79e5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 07 一月 2026 14:14:50 +0800
Subject: [PATCH] 报工提交生成过程检
---
src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java | 7 -
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 7 -
src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java | 6 ++
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 9 +--
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 114 ++++++++++++++++++++++++++++---------
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 3
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 9 +++
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 3 +
8 files changed, 112 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index 0a9876a..e27be8d 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -5,8 +5,11 @@
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.service.ProductionProductMainService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
@RequestMapping("productionProductMain")
@RestController
@@ -36,4 +39,10 @@
public R addProductMain(@RequestBody ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.addProductMain(productionProductMainDto));
}
+
+ @ApiOperation("鍒犻櫎鎶ュ伐")
+ @DeleteMapping("/{ids}")
+ public R delete(@PathVariable("ids") Long[] ids) {
+ return R.ok(productionProductMainService.removeBatchByIds(Arrays.asList(ids)));
+ }
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9dfb35b..449b75a 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -19,4 +19,7 @@
@ApiModelProperty(value = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
+
+ @ApiModelProperty(value = "鏄惁鎶ュ伐")
+ private boolean reportWork;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 01ed986..21ca82a 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -3,12 +3,13 @@
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@TableName("product_process")
@Data
-public class ProductProcess {
+public class ProductProcess implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
index 30208f9..a1325bd 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
@@ -86,4 +86,10 @@
*/
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
private LocalDate actualEndTime;
+
+ /**
+ * 鏄惁鎶ュ伐
+ */
+ @ApiModelProperty(value = "鏄惁鎶ュ伐")
+ private boolean reportWork;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
index 271f460..c938170 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
@@ -1,9 +1,6 @@
package com.ruoyi.production.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,7 +11,7 @@
@TableName("production_product_input")
public class ProductionProductInput {
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "鎶ュ伐id")
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index a4326a6..3dbe688 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -1,9 +1,6 @@
package com.ruoyi.production.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +10,7 @@
@TableName("production_product_main")
public class ProductionProductMain {
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "鎶ュ伐鍗曞彿")
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 7ed085b..20e52ad 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -1,9 +1,6 @@
package com.ruoyi.production.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,10 +8,10 @@
import java.time.LocalDateTime;
@Data
-@TableName("production_product_input")
+@TableName("production_product_output")
public class ProductionProductOutput {
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "鎶ュ伐id")
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index efa13d3..f100c7f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -1,17 +1,27 @@
package com.ruoyi.production.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.production.controller.ProductWorkOrderController;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.mapper.*;
-import com.ruoyi.production.pojo.ProductProcessRouteItem;
-import com.ruoyi.production.pojo.ProductionProductMain;
-import com.ruoyi.production.pojo.ProductionProductOutput;
+import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductionProductMainService;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.quality.mapper.QualityInspectParamMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.pojo.QualityTestStandard;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,18 +38,28 @@
public class ProductionProductMainServiceImpl extends ServiceImpl<ProductionProductMainMapper, ProductionProductMain> implements ProductionProductMainService {
private ProductionProductMainMapper productionProductMainMapper;
-
+
private ProductWorkOrderController productWorkOrderController;
-
+
private ProductWorkOrderMapper productWorkOrderMapper;
-
+
private ProductProcessRouteItemMapper productProcessRouteItemMapper;
-
+
private ProductionProductOutputMapper productionProductOutputMapper;
-
+
private ProcessRouteItemMapper processRouteItemMapper;
-
+
private ProductModelMapper productModelMapper;
+
+ private QualityInspectMapper qualityInspectMapper;
+
+ private ProductProcessMapper productProcessMapper;
+
+ private ProductMapper productMapper;
+
+ private QualityTestStandardMapper qualityTestStandardMapper;
+
+ private QualityInspectParamMapper qualityInspectParamMapper;
@Override
@@ -54,24 +74,23 @@
throw new RuntimeException("鍙傛暟涓嶈兘涓虹┖");
}
- // 鍒ゆ柇鏄柊澧炶繕鏄洿鏂�
- if (dto.getId() != null) {
- // 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
- QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
- outputWrapper.eq("product_main_id", dto.getId());
-
- ProductionProductOutput output = productionProductOutputMapper.selectOne(outputWrapper);
- if (output == null) {
- throw new RuntimeException("浜у嚭璁板綍涓嶅瓨鍦�");
- }
-
- // 鍙洿鏂版暟閲�
- if (dto.getQuantity() != null) {
- output.setQuantity(dto.getQuantity());
- productionProductOutputMapper.updateById(output);
- }
- return true;
- }
+// if (dto.isReportWork()) {
+// // 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
+// QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
+// outputWrapper.eq("product_main_id", dto.getId());
+//
+// ProductionProductOutput output = productionProductOutputMapper.selectOne(outputWrapper);
+// if (output == null) {
+// throw new RuntimeException("浜у嚭璁板綍涓嶅瓨鍦�");
+// }
+//
+// // 鍙洿鏂版暟閲�
+// if (dto.getQuantity() != null) {
+// output.setQuantity(dto.getQuantity());
+// productionProductOutputMapper.updateById(output);
+// }
+// return true;
+// }
// 鏂板閫昏緫
ProductionProductMain productionProductMain = new ProductionProductMain();
@@ -86,7 +105,6 @@
queryWrapper.select("MAX(product_no) as maxNo")
.likeRight("product_no", datePrefix);
- // 淇锛氬畨鍏ㄥ鐞嗗彲鑳戒负绌虹殑鏌ヨ缁撴灉
List<Map<String, Object>> resultList = productionProductMainMapper.selectMaps(queryWrapper);
int sequenceNumber = 1;
@@ -119,8 +137,46 @@
productionProductMain.setStatus(0);
// 娣诲姞鎶ュ伐涓昏〃
- productionProductMainMapper.insert(productionProductMain);
+ int insert = productionProductMainMapper.insert(productionProductMain);
+ //鏇存柊宸ュ崟
+ if (insert > 0) {
+ UpdateWrapper<ProductWorkOrder> wrapper = new UpdateWrapper<>();
+ wrapper.set("report_work", true)
+ .set("quantity",dto.getQuantity())
+ .eq("id", dto.getWorkOrderId());
+ productWorkOrderMapper.update(null, wrapper);
+ }
+ ProductProcess productProcess = productProcessMapper.selectById(productProcessRouteItem.getProcessId());
+ ProductModel productModel = productProcessRouteItem.getProductModelId() != null ?
+ productModelMapper.selectById(productProcessRouteItem.getProductModelId()) : null;
+
+ if (productModel != null) {
+ Product product = productMapper.selectById(productModel.getProductId());
+ int inspectType = "缁勮".equals(productProcess.getName()) ? 2 : 1;
+
+ QualityInspect qualityInspect = new QualityInspect();
+ qualityInspect.setProductId(product.getId());
+ qualityInspect.setProductName(product.getProductName());
+ qualityInspect.setModel(productModel.getModel());
+ qualityInspect.setUnit(productModel.getUnit());
+ qualityInspect.setQuantity(dto.getQuantity());
+ qualityInspect.setProcess(productProcess.getName());
+ qualityInspect.setInspectState(0);
+ qualityInspect.setInspectType(inspectType);
+ qualityInspectMapper.insert(qualityInspect);
+
+ qualityTestStandardMapper.selectList(
+ new LambdaQueryWrapper<QualityTestStandard>()
+ .eq(QualityTestStandard::getProductId, product.getId())
+ ).forEach(standard -> {
+ QualityInspectParam param = new QualityInspectParam();
+ BeanUtils.copyProperties(standard, param);
+ param.setId(null);
+ param.setInspectId(qualityInspect.getId());
+ qualityInspectParamMapper.insert(param);
+ });
+ }
// 娣诲姞浜у嚭
ProductionProductOutput productionProductOutput = new ProductionProductOutput();
productionProductOutput.setProductMainId(productionProductMain.getId());
--
Gitblit v1.9.3