From 99ac94a7cf412d9f0081c1d84b520eab051bb0fd Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 24 四月 2026 11:08:21 +0800
Subject: [PATCH] feat(production): 重构生产计划模块，新增和优化生产计划功能
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 99 ++++---------
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java | 4
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java | 159 ++++------------------
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 94 ++++++-------
src/main/java/com/ruoyi/production/pojo/ProductionPlan.java | 15 +
src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java | 1
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 5
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 2
src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java | 2
9 files changed, 125 insertions(+), 256 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
index 4e0913e..a980ce2 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -20,10 +20,6 @@
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- @Schema(description = "瀹㈡埛鍚嶇О")
- @Excel(name = "瀹㈡埛鍚嶇О")
- private String customerName;
-
@Schema(description = "浜у搧瑙勬牸")
@Excel(name = "浜у搧瑙勬牸")
private String model;
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
index a6aa0ce..5dd5160 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
@@ -1,12 +1,11 @@
package com.ruoyi.production.bean.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
/**
* <br>
@@ -20,126 +19,43 @@
@Data
@Schema(name = "閿�鍞敓浜ч渶姹� Excel瀵煎叆瀵煎嚭DTO")
public class ProductionPlanImportDto {
- /**
- * 鐢宠鍗曠紪鍙�
- */
- @Schema(description = "鐢宠鍗曠紪鍙�")
- @Excel(name = "鐢宠鍗曠紪鍙�")
- private String applyNo;
- /**
- * 瀹㈡埛鍚嶇О
- */
- @Schema(description = "瀹㈡埛鍚嶇О")
- @Excel(name = "瀹㈡埛鍚嶇О")
- private String customerName;
+ @Schema(description = "涓荤敓浜ц鍒掑彿")
+ @Excel(name = "涓荤敓浜ц鍒掑彿")
+ private String mpsNo;
- /**
- * 鐗╂枡缂栫爜
- */
- @Schema(description = "鐗╂枡缂栫爜")
- @Excel(name = "鐗╂枡缂栫爜")
- private String materialCode;
+ @Schema(description = "闇�姹傛棩鏈�")
+ @Excel(name = "闇�姹傛棩鏈�")
+ private LocalDate requiredDate;
- /**
- * 浜у搧鍚嶇О
- */
+ @Schema(description = "澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "闇�姹傛暟閲�")
+ @Excel(name = "闇�姹傛暟閲�")
+ private BigDecimal qtyRequired;
+
+ @Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
+ @Excel(name = "鏉ユ簮 閿�鍞�/鍐呴儴")
+ private String source;
+
+ @Schema(description = "鎵胯鏃ユ湡")
+ @Excel(name = "鎵胯鏃ユ湡")
+ private LocalDate promisedDeliveryDate;
+
@Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- /**
- * 浜у搧瑙勬牸
- */
- @Schema(description = "浜у搧瑙勬牸")
- @Excel(name = "浜у搧瑙勬牸")
- private String productSpec;
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String model;
- /**
- * 闀�
- */
- @Schema(description = "闀�")
- @Excel(name = "闀�(mm)")
- private Integer length;
+ @Schema(description = "鍗曚綅")
+ @Excel(name = "鍗曚綅")
+ private String unit;
- /**
- * 瀹�
- */
- @Schema(description = "瀹�")
- @Excel(name = "瀹�(mm)")
- private Integer width;
-
- /**
- * 楂�
- */
- @Schema(description = "楂�")
- @Excel(name = "楂�(mm)")
- private Integer height;
-
- /**
- * 鍧楁暟
- */
- @Schema(description = "鍧楁暟")
- @Excel(name = "鍧楁暟")
- private Integer quantity;
-
- /**
- * 鏂规暟
- */
- @Schema(description = "鏂规暟")
- @Excel(name = "鏂规暟")
- private BigDecimal volume;
-
- /**
- * 寮哄害
- */
- @Schema(description = "寮哄害")
- @Excel(name = "寮哄害")
- private String strength;
-
- /**
- * 寮�濮嬫棩鏈�
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @Schema(description = "寮�濮嬫棩鏈�")
- @Excel(name = "寮�濮嬫棩鏈�", width = 20, dateFormat = "yyyy-MM-dd")
- private Date startDate;
-
- /**
- * 缁撴潫鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @Schema(description = "缁撴潫鏃ユ湡")
- @Excel(name = "缁撴潫鏃ユ湡", width = 20, dateFormat = "yyyy-MM-dd")
- private Date endDate;
-
- /**
- * 鎻愪氦浜�
- */
- @Schema(description = "鎻愪氦浜�")
- @Excel(name = "鎻愪氦浜�")
- private String submitter;
-
- /**
- * 鎻愪氦浜虹粍缁�
- */
- @Schema(description = "鎻愪氦浜虹粍缁�")
- @Excel(name = "鎻愪氦浜虹粍缁�")
- private String submitOrg;
-
- /**
- * 澶囨敞1
- */
- @Schema(description = "澶囨敞1")
- @Excel(name = "澶囨敞1")
- private String remarkOne;
-
- /**
- * 澶囨敞2
- */
- @Schema(description = "澶囨敞2")
- @Excel(name = "澶囨敞2")
- private String remarkTwo;
/**
* 鍒涘缓浜�
@@ -155,22 +71,11 @@
@Excel(name = "淇敼浜�", type = Excel.Type.EXPORT)
private String modifierName;
- /**
- * 鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟
- */
- @Schema(description = "鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟")
- private Integer dataSyncType;
/**
- * 鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板
+ * 宸蹭笅鍙戞暟閲�
*/
- @Schema(description = "鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板")
- private Integer dataSourceType;
-
- /**
- * 涓嬪彂鏁伴噺
- */
- @Schema(description = "涓嬪彂鏁伴噺")
- @Excel(name = "涓嬪彂鏁伴噺", type = Excel.Type.EXPORT)
+ @Schema(description = "宸蹭笅鍙戞暟閲�")
+ @Excel(name = "宸蹭笅鍙戞暟閲�", type = Excel.Type.EXPORT)
private BigDecimal assignedQuantity;
}
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
index ff32fd1..842fc9b 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
@@ -9,8 +9,6 @@
@Data
@Schema(name = "ProductionPlanVo", description = "鐢熶骇璁″垝杩斿洖瀵硅薄")
public class ProductionPlanVo extends ProductionPlan {
- @Schema(description = "鐗╂枡缂栫爜")
- private String materialCode;
@Schema(description = "浜у搧鍚嶇О")
private String productName;
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
index 9810b6e..841dd10 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
@@ -27,5 +27,4 @@
List<ProductionPlanDto> selectWithMaterialByIds(@Param("ids") List<Long> ids);
ProductionPlanDto selectProductionPlanDtoById(@Param("productionPlanId") Long productionPlanId);
-
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
index eb0ef6d..b7809c8 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
@@ -30,6 +30,12 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @Schema(description = "閿�鍞彴璐d")
+ private Long salesLedgerId;
+
+ @Schema(description = "閿�鍞骇鍝佽鏍糹d")
+ private Long salesLedgerProductId;
+
@Schema(description = "涓荤敓浜ц鍒掑彿")
private String mpsNo;
@@ -55,6 +61,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
+ @Schema(description = "閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
@Schema(description = "浜у搧鍨嬪彿id")
private Long productModelId;
@@ -64,7 +74,7 @@
@Schema(description = "鏄惁涓嬪彂鍒堕�犺鍗�")
private Boolean issued;
- @Schema(description = "鏉ユ簮")
+ @Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
private String source;
@Schema(description = "瀹℃牳鐘舵��")
@@ -72,9 +82,6 @@
@Schema(description = "鎵胯鏃ユ湡")
private LocalDate promisedDeliveryDate;
-
- @Schema(description = "鐢宠鍗曠紪鍙�")
- private String applyNo;
@Schema(description = "鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
private Integer status;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
index 1b09c74..597ed34 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -1,6 +1,7 @@
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -26,7 +27,9 @@
import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -135,12 +138,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(ProductionPlanDto dto) {
- if (StringUtils.isBlank(dto.getApplyNo())) {
- throw new ServiceException("鏂板澶辫触锛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
- }
- checkApplyNoUnique(dto.getApplyNo(), null);
-
+ if (StringUtils.isBlank(dto.getMpsNo())) {
+ dto.setMpsNo(generateNextPlanNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
+ }else checkMpsNoUnique(dto.getMpsNo(), null);
dto.setStatus(PLAN_STATUS_WAIT);
+ dto.setSource("鍐呴儴");
return productionPlanMapper.insert(dto) > 0;
}
@@ -160,21 +162,21 @@
throw new BaseException("缂栬緫澶辫触锛岃鐢熶骇璁″垝宸蹭笅鍙戞垨閮ㄥ垎涓嬪彂锛岀姝㈢紪杈�");
}
- if (StringUtils.isNotBlank(dto.getApplyNo()) && !dto.getApplyNo().equals(old.getApplyNo())) {
- checkApplyNoUnique(dto.getApplyNo(), dto.getId());
+ if (StringUtils.isNotBlank(dto.getMpsNo()) && !dto.getMpsNo().equals(old.getMpsNo())) {
+ checkMpsNoUnique(dto.getMpsNo(), dto.getId());
}
return productionPlanMapper.updateById(dto) > 0;
}
- private void checkApplyNoUnique(String applyNo, Long excludeId) {
+ private void checkMpsNoUnique(String mpsNo, Long excludeId) {
LambdaQueryWrapper<ProductionPlan> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(ProductionPlan::getApplyNo, applyNo);
+ wrapper.eq(ProductionPlan::getMpsNo, mpsNo);
if (excludeId != null) {
wrapper.ne(ProductionPlan::getId, excludeId);
}
if (productionPlanMapper.selectCount(wrapper) > 0) {
- throw new ServiceException("鐢宠鍗曠紪鍙� " + applyNo + " 宸插瓨鍦�");
+ throw new ServiceException("鐢熶骇璁″垝鍙� " + mpsNo + " 宸插瓨鍦�");
}
}
@@ -202,7 +204,6 @@
if (file == null || file.isEmpty()) {
throw new ServiceException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
-
ExcelUtil<ProductionPlanImportDto> excelUtil = new ExcelUtil<>(ProductionPlanImportDto.class);
List<ProductionPlanImportDto> list;
try {
@@ -210,77 +211,54 @@
} catch (Exception e) {
throw new ServiceException("Excel瑙ｆ瀽澶辫触");
}
-
if (list == null || list.isEmpty()) {
throw new ServiceException("Excel娌℃湁鏁版嵁");
}
-
- Set<String> applyNos = new HashSet<>();
- Set<String> materialCodes = new HashSet<>();
+ Set<String> mpsNos = new HashSet<>();
for (int i = 0; i < list.size(); i++) {
ProductionPlanImportDto dto = list.get(i);
- String applyNo = dto.getApplyNo();
- String materialCode = dto.getMaterialCode();
-
- if (StringUtils.isEmpty(applyNo)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
+ String mpsNo = dto.getMpsNo();
+ if (StringUtils.isEmpty(mpsNo)) {
+ generateNextPlanNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
}
- if (!applyNos.add(applyNo)) {
- throw new ServiceException("瀵煎叆澶辫触锛欵xcel 涓瓨鍦ㄩ噸澶嶇殑鐢宠鍗曠紪鍙� " + applyNo);
+ if (!mpsNos.add(mpsNo)) {
+ throw new ServiceException("瀵煎叆澶辫触锛欵xcel 涓瓨鍦ㄩ噸澶嶇殑鐢宠鍗曠紪鍙� " + mpsNo);
}
- if (StringUtils.isEmpty(materialCode)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛岀墿鏂欑紪鐮佷笉鑳戒负绌�");
- }
-
- String strength = dto.getStrength();
- if (StringUtils.isNotEmpty(strength) && !"A3.5".equals(strength) && !"A5.0".equals(strength)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛屽己搴﹀彧鑳芥槸 A3.5 鎴� A5.0");
- }
-
- materialCodes.add(materialCode);
}
-
Long existApplyNoCount = baseMapper.selectCount(Wrappers.<ProductionPlan>lambdaQuery()
- .in(ProductionPlan::getApplyNo, applyNos));
+ .in(ProductionPlan::getMpsNo, mpsNos));
if (existApplyNoCount > 0) {
- List<String> existApplyNos = baseMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery()
- .in(ProductionPlan::getApplyNo, applyNos))
+ List<String> existMpsNos = baseMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery()
+ .in(ProductionPlan::getMpsNo, mpsNos))
.stream()
- .map(ProductionPlan::getApplyNo)
+ .map(ProductionPlan::getMpsNo)
.collect(Collectors.toList());
- throw new ServiceException("瀵煎叆澶辫触锛岀敵璇峰崟缂栧彿宸插瓨鍦�: " + String.join(", ", existApplyNos));
+ throw new ServiceException("瀵煎叆澶辫触锛岀敓浜ц鍒掑彿宸插瓨鍦�: " + String.join(", ", existMpsNos));
}
-
LocalDateTime now = LocalDateTime.now();
List<ProductionPlan> entityList = list.stream().map(dto -> {
ProductionPlan entity = new ProductionPlan();
BeanUtils.copyProperties(dto, entity);
entity.setStatus(PLAN_STATUS_WAIT);
+ entity.setSource("鍐呴儴");
entity.setCreateTime(now);
entity.setUpdateTime(now);
return entity;
}).collect(Collectors.toList());
-
this.saveBatch(entityList);
}
@Override
public void exportProdData(HttpServletResponse response, List<Long> ids) {
- List<ProductionPlan> list;
- if (ids != null && !ids.isEmpty()) {
- list = baseMapper.selectBatchIds(ids);
- } else {
- list = baseMapper.selectList(null);
- }
-
+ List<ProductionPlanDto> list = productionPlanMapper.selectWithMaterialByIds(ids);
List<ProductionPlanImportDto> exportList = new ArrayList<>();
- for (ProductionPlan entity : list) {
+ for (ProductionPlanDto entity : list) {
ProductionPlanImportDto dto = new ProductionPlanImportDto();
BeanUtils.copyProperties(entity, dto);
exportList.add(dto);
}
ExcelUtil<ProductionPlanImportDto> util = new ExcelUtil<>(ProductionPlanImportDto.class);
- util.exportExcel(response, exportList, "閿�鍞敓浜ч渶姹傛暟鎹�");
+ util.exportExcel(response, exportList, "涓荤敓浜ц鍒�");
}
private String formatPlanIds(List<Long> planIds) {
@@ -290,4 +268,22 @@
.map(String::valueOf)
.collect(Collectors.joining(",", "[", "]"));
}
+
+ private String generateNextPlanNo(String datePrefix) {
+ QueryWrapper<ProductionPlan> queryWrapper = new QueryWrapper<>();
+ queryWrapper.likeRight("mps_no", "JH" + datePrefix);
+ queryWrapper.orderByDesc("mps_no");
+ queryWrapper.last("LIMIT 1");
+ ProductionPlan latestPlan = productionPlanMapper.selectOne(queryWrapper);
+ int sequence = 1;
+ if (latestPlan != null && latestPlan.getMpsNo() != null && !latestPlan.getMpsNo().isEmpty()) {
+ String sequenceStr = latestPlan.getMpsNo().substring(("JH" + datePrefix).length());
+ try {
+ sequence = Integer.parseInt(sequenceStr) + 1;
+ } catch (NumberFormatException e) {
+ sequence = 1;
+ }
+ }
+ return "JH" + datePrefix + String.format("%04d", sequence);
+ }
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 5765262..70ffa12 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -232,6 +232,7 @@
private BigDecimal ticketsTotal = BigDecimal.ZERO;
@Schema(description = "鏄惁璐ㄦ")
+ //閽堝閲囪喘鍙拌处锛屾槸鍚﹁川妫�
private Boolean isChecked;
@TableField(exist = false)
@@ -251,4 +252,8 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+ @Schema(description = "鏄惁鐢熶骇")
+ //閽堝閿�鍞彴璐︼紝鏄惁鐢熶骇
+ private Boolean isProduction;
+
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index f30cb1d..ee2ee05 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -6,17 +6,14 @@
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.common.enums.StockInUnQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.mapper.*;
-import com.ruoyi.production.pojo.*;
+import com.ruoyi.production.pojo.ProductionPlan;
import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
@@ -65,7 +62,7 @@
private final ProductionAccountMapper productionAccountMapper;
private final SalesLedgerMapper salesLedgerMapper;
private final PurchaseLedgerMapper purchaseLedgerMapper;
- private final ProductionOrderMapper productionOrderMapper;
+ private final ProductionPlanMapper productionPlanMapper;
private final ProductionOperationTaskMapper productionOperationTaskMapper;
private final ProductionOrderService productionOrderService;
private final TechnologyRoutingMapper technologyRoutingMapper;
@@ -253,70 +250,36 @@
* 鏂板鐢熶骇鏁版嵁
*/
public void addProductionData(SalesLedgerProduct salesLedgerProduct) {
- ProductionOrder productionOrder = new ProductionOrder();
- productionOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
- productionOrder.setProductModelId(salesLedgerProduct.getProductModelId());
- productionOrder.setSaleLedgerProductId(salesLedgerProduct.getId().intValue());
- productionOrder.setNpsNo(generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
- productionOrder.setQuantity(salesLedgerProduct.getQuantity());
- productionOrder.setCompleteQuantity(BigDecimal.ZERO);
+ //鍏堝垽鏂浜у搧鏄惁闇�瑕佺敓浜�
+ if (!salesLedgerProduct.getIsProduction()) {
+ return;
+ }
+ ProductionPlan productionPlan = new ProductionPlan();
+ productionPlan.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
+ productionPlan.setProductModelId(salesLedgerProduct.getProductModelId());
+ productionPlan.setSalesLedgerProductId(salesLedgerProduct.getId());
+ productionPlan.setMpsNo(generateNextPlanNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
+ productionPlan.setQtyRequired(salesLedgerProduct.getQuantity());
+ productionPlanMapper.insert(productionPlan);
- TechnologyRouting routing = technologyRoutingMapper.selectOne(
- new QueryWrapper<TechnologyRouting>().lambda()
- .eq(TechnologyRouting::getProductModelId, salesLedgerProduct.getProductModelId())
- .orderByDesc(TechnologyRouting::getCreateTime)
- .last("LIMIT 1"));
- if (routing != null) {
- productionOrder.setTechnologyRoutingId(routing.getId());
- }
- productionOrderMapper.insert(productionOrder);
- if (productionOrder.getTechnologyRoutingId() != null) {
- productionOrderService.syncProductionOrderSnapshot(productionOrder.getId());
- }
}
/**
- * 鍒犻櫎鐢熶骇鏁版嵁
+ * 鍒犻櫎鐢熶骇璁″垝
*/
public void deleteProductionData(List<Long> productIds) {
- List<ProductionOrder> productionOrders = productionOrderMapper.selectList(
- new LambdaQueryWrapper<ProductionOrder>()
- .in(ProductionOrder::getSaleLedgerProductId, productIds.stream().map(Long::intValue).collect(Collectors.toList())));
- if (org.springframework.util.CollectionUtils.isEmpty(productionOrders)) {
+ List<ProductionPlan> productionPlans = productionPlanMapper.selectList(
+ new LambdaQueryWrapper<ProductionPlan>()
+ .in(ProductionPlan::getSalesLedgerProductId, productIds.stream().map(Long::intValue).collect(Collectors.toList())));
+ if (org.springframework.util.CollectionUtils.isEmpty(productionPlans)) {
return;
}
- List<Long> orderIds = productionOrders.stream().map(ProductionOrder::getId).collect(Collectors.toList());
- List<Long> taskIds = productionOperationTaskMapper.selectList(
- new LambdaQueryWrapper<ProductionOperationTask>()
- .in(ProductionOperationTask::getProductionOrderId, orderIds))
- .stream().map(ProductionOperationTask::getId).collect(Collectors.toList());
- if (!taskIds.isEmpty()) {
- List<ProductionProductMain> productMains = productionProductMainMapper.selectList(
- new LambdaQueryWrapper<ProductionProductMain>()
- .in(ProductionProductMain::getProductionOperationTaskId, taskIds));
- List<Long> productMainIds = productMains.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
- if (!productMainIds.isEmpty()) {
- List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(
- new LambdaQueryWrapper<QualityInspect>().in(QualityInspect::getProductMainId, productMainIds));
- qualityInspects.forEach(qualityInspect -> {
- if (qualityInspect.getInspectState() == 1) {
- throw new RuntimeException("宸叉彁浜ょ殑妫�楠屽崟涓嶈兘鍒犻櫎");
- }
- });
- productionProductOutputMapper.deleteByProductMainIds(productMainIds);
- productionProductInputMapper.deleteByProductMainIds(productMainIds);
- qualityInspectMapper.deleteByProductMainIds(productMainIds);
- productionAccountMapper.delete(new LambdaQueryWrapper<ProductionAccount>()
- .in(ProductionAccount::getProductionProductMainId, productMainIds));
- for (Long productMainId : productMainIds) {
- stockUtils.deleteStockOutRecord(productMainId, StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode());
- stockUtils.deleteStockInRecord(productMainId, StockInUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode());
- }
- }
- productionProductMainMapper.delete(new LambdaQueryWrapper<ProductionProductMain>()
- .in(ProductionProductMain::getProductionOperationTaskId, taskIds));
+ //濡傛灉鐢熶骇璁″垝宸蹭笅鍙戝垯涓嶈兘鍒犻櫎
+ if (productionPlans.stream().anyMatch(productionPlan -> productionPlan.getStatus() != 0)) {
+ throw new RuntimeException("鐢熶骇璁″垝宸蹭笅鍙戯紝涓嶈兘鍒犻櫎璇ラ攢鍞骇鍝�");
}
- productionOrderService.removeProductionOrder(orderIds);
+ List<Long> ids = productionPlans.stream().map(ProductionPlan::getId).collect(Collectors.toList());
+ productionPlanMapper.deleteByIds(ids);
}
@Override
@@ -429,21 +392,21 @@
return R.ok();
}
- private String generateNextOrderNo(String datePrefix) {
- QueryWrapper<ProductionOrder> queryWrapper = new QueryWrapper<>();
- queryWrapper.likeRight("nps_no", "SC" + datePrefix);
- queryWrapper.orderByDesc("nps_no");
+ private String generateNextPlanNo(String datePrefix) {
+ QueryWrapper<ProductionPlan> queryWrapper = new QueryWrapper<>();
+ queryWrapper.likeRight("mps_no", "JH" + datePrefix);
+ queryWrapper.orderByDesc("mps_no");
queryWrapper.last("LIMIT 1");
- ProductionOrder latestOrder = productionOrderMapper.selectOne(queryWrapper);
+ ProductionPlan latestPlan = productionPlanMapper.selectOne(queryWrapper);
int sequence = 1;
- if (latestOrder != null && latestOrder.getNpsNo() != null && !latestOrder.getNpsNo().isEmpty()) {
- String sequenceStr = latestOrder.getNpsNo().substring(("SC" + datePrefix).length());
+ if (latestPlan != null && latestPlan.getMpsNo() != null && !latestPlan.getMpsNo().isEmpty()) {
+ String sequenceStr = latestPlan.getMpsNo().substring(("JH" + datePrefix).length());
try {
sequence = Integer.parseInt(sequenceStr) + 1;
} catch (NumberFormatException e) {
sequence = 1;
}
}
- return "SC" + datePrefix + String.format("%04d", sequence);
+ return "JH" + datePrefix + String.format("%04d", sequence);
}
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 607ada0..32d6069 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -520,7 +520,7 @@
List<Long> productIds = products.stream()
.map(SalesLedgerProduct::getId)
.collect(Collectors.toList());
- //鍒犻櫎鐢熶骇鏁版嵁
+ //鍒犻櫎鐢熶骇璁″垝
salesLedgerProductServiceImpl.deleteProductionData(productIds);
// 鎵归噺鍒犻櫎浜у搧瀛愯〃
--
Gitblit v1.9.3