From ff361539e3ffd6e62100e392ddda2f4ab9dfee62 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 13:15:42 +0800
Subject: [PATCH] 工序调整， 报工反改订单数量，判断是最后一道工序才修改订单完成数量
---
src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
index 60f5788..60b3dc2 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
@@ -11,11 +11,11 @@
import com.ruoyi.basic.service.IProductModelService;
import com.ruoyi.basic.service.IProductService;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.production.dto.ProductProcessDto;
import com.ruoyi.production.dto.ProductProcessImportDto;
-import com.ruoyi.production.enums.ProductProcessEnum;
import com.ruoyi.production.mapper.ProcessRouteItemMapper;
import com.ruoyi.production.mapper.ProductProcessMapper;
import com.ruoyi.production.mapper.ProductProcessRouteItemMapper;
@@ -84,18 +84,18 @@
throw new ServiceException("鏂板澶辫触,璁″垝宸ユ椂涓嶈兘涓虹┖");
}
// 鍒ゆ柇浜у搧鏄惁瀛樺湪
- if (ObjectUtils.isEmpty(productProcessDto.getProductModelId())) {
- throw new ServiceException("鏂板澶辫触,閮ㄤ欢涓嶈兘涓虹┖");
- }
- ProductModel productModel = productModelService.getById(productProcessDto.getProductModelId());
- if (productModel == null) {
- throw new ServiceException("鏂板澶辫触,璇ラ儴浠朵笉瀛樺湪");
- }
- validateDuplicateTypeForSameProduct(productModel.getId(), productProcessDto.getType(), null);
+// if (ObjectUtils.isEmpty(productProcessDto.getProductModelId())) {
+// throw new ServiceException("鏂板澶辫触,閮ㄤ欢涓嶈兘涓虹┖");
+// }
+// ProductModel productModel = productModelService.getById(productProcessDto.getProductModelId());
+// if (productModel == null) {
+// throw new ServiceException("鏂板澶辫触,璇ラ儴浠朵笉瀛樺湪");
+// }
+// validateDuplicateTypeForSameProduct(productModel.getId(), productProcessDto.getType(), null);
ProductProcess productProcess = new ProductProcess();
BeanUtils.copyProperties(productProcessDto, productProcess);
- productProcess.setProductModelId(productModel.getId());
+// productProcess.setProductModelId(productModel.getId());
validatePlanner(productProcessDto.getPlannerId(), productProcessDto.getPlannerName(), null);
@@ -129,17 +129,17 @@
if (oldProductProcess == null) {
throw new ServiceException("淇敼澶辫触锛屽伐搴忎笉瀛樺湪");
}
- Long finalProductModelId = ObjectUtils.isNotEmpty(productProcessDto.getProductModelId())
- ? productProcessDto.getProductModelId() : oldProductProcess.getProductModelId();
- Integer finalType = ObjectUtils.isNotEmpty(productProcessDto.getType())
- ? productProcessDto.getType() : oldProductProcess.getType();
-
+// Long finalProductModelId = ObjectUtils.isNotEmpty(productProcessDto.getProductModelId())
+// ? productProcessDto.getProductModelId() : oldProductProcess.getProductModelId();
+// Integer finalType = ObjectUtils.isNotEmpty(productProcessDto.getType())
+// ? productProcessDto.getType() : oldProductProcess.getType();
+//
// 鍒ゆ柇鍏宠仈浜у搧鏄惁瀛樺湪
- ProductModel productModel = productModelService.getById(finalProductModelId);
- if (productModel == null) {
- throw new ServiceException("淇敼澶辫触锛屽叧鑱旈儴浠朵笉瀛樺湪");
- }
- validateDuplicateTypeForSameProduct(productModel.getId(), finalType, productProcessDto.getId());
+// ProductModel productModel = productModelService.getById(finalProductModelId);
+// if (productModel == null) {
+// throw new ServiceException("淇敼澶辫触锛屽叧鑱旈儴浠朵笉瀛樺湪");
+// }
+// validateDuplicateTypeForSameProduct(productModel.getId(), finalType, productProcessDto.getId());
// 鏍￠獙璁″垝浜哄憳
validatePlanner(productProcessDto.getPlannerId(), productProcessDto.getPlannerName(), null);
@@ -187,10 +187,10 @@
if (ObjectUtils.isEmpty(importDto.getProductProcessType())) {
throw new ServiceException("绗�" + rowNum + "琛岋細閮ㄤ欢銆�" + importDto.getName() + "銆戠殑绫诲瀷涓嶈兘涓虹┖");
}
- ProductProcessEnum enumByInfo = ProductProcessEnum.getEnumByInfo(importDto.getProductProcessType());
- if (ObjectUtils.isEmpty(enumByInfo)) {
+ String dictValue = DictUtils.getDictValue("product_process_type", importDto.getProductProcessType());
+ if (StringUtils.isEmpty(dictValue)) {
throw new ServiceException("绗�" + rowNum + "琛岋細閮ㄤ欢銆�" + importDto.getName() + "銆戠殑绫诲瀷銆�"
- + importDto.getProductProcessType() + "銆戜笉瀛樺湪锛岃濉啓姝ｇ‘鐨勭被鍨嬶細鍔犲伐銆佸埉鏉垮喎鑺埗浣溿�佺璺粍瀵广�佺綈浣撹繛鎺ュ強璋冭瘯銆佹祴璇曟墦鍘嬨�佸叾浠�");
+ + importDto.getProductProcessType() + "銆戜笉瀛樺湪锛岃濉啓姝ｇ‘鐨勭被鍨嬶細" + DictUtils.getDictLabels("product_process_type"));
}
// 妫�楠岃鍒掑伐鏃�
if (importDto.getSalaryQuota() == null || importDto.getSalaryQuota().compareTo(BigDecimal.ZERO) < 0) {
@@ -207,7 +207,7 @@
ProductProcess productProcess = new ProductProcess();
BeanUtils.copyProperties(importDto, productProcess);
productProcess.setProductModelId(productModel.getId());
- productProcess.setType(enumByInfo.getCode());
+ productProcess.setType(Integer.valueOf(dictValue));
if (sysUser != null) {
productProcess.setPlannerId(sysUser.getUserId());
productProcess.setPlannerName(sysUser.getNickName());
--
Gitblit v1.9.3