From 8b749305a8e8c3f4bf669f6980edf2bbb7bfa9c7 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 11:14:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 102 ++-----
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java | 34 --
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java | 159 ++----------
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 316 +++++++++++--------------
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/service/impl/ProductionOrderServiceImpl.java | 27 +-
src/main/resources/mapper/production/ProductionPlanMapper.xml | 37 +-
src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java | 6
11 files changed, 255 insertions(+), 449 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 3f6ef76..a980ce2 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -16,30 +16,10 @@
@Data
public class ProductionPlanDto extends ProductionPlan {
- /**
- * 鐗╂枡缂栫爜
- */
- @Schema(description = "鐗╂枡缂栫爜")
- @Excel(name = "鐗╂枡缂栫爜")
- private String materialCode;
-
- /**
- * 浜у搧鍚嶇О
- */
@Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- /**
- * 瀹㈡埛鍚嶇О
- */
- @Schema(description = "瀹㈡埛鍚嶇О")
- @Excel(name = "瀹㈡埛鍚嶇О")
- private String customerName;
-
- /**
- * 浜у搧瑙勬牸
- */
@Schema(description = "浜у搧瑙勬牸")
@Excel(name = "浜у搧瑙勬牸")
private String model;
@@ -59,17 +39,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planCompleteTime;
- /**
- * 鍏宠仈鐗╂枡淇℃伅琛�
- */
- @Schema(description = "鍏宠仈鐗╂枡淇℃伅琛↖D")
- private Long productMaterialId;
-
- /**
- * 寮哄害
- */
- @Schema(description = "寮哄害")
- @Excel(name = "寮哄害")
- private String strength;
+ @Schema(description = "浜у搧ID")
+ private Long productId;
}
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 4c0dbe3..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;
@@ -21,6 +19,6 @@
@Schema(description = "鍗曚綅")
private String unit;
- @Schema(description = "鍏宠仈浜у搧鐗╂枡ID")
- private Long productMaterialId;
+ @Schema(description = "浜у搧ID")
+ private Long productId;
}
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/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index c6d90cf..5ec666b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -62,7 +63,7 @@
private final FileUtil fileUtil;
@Override
- public com.baomidou.mybatisplus.core.metadata.IPage<ProductionOrderVo> pageProductionOrder(Page<ProductionOrderDto> page, ProductionOrderDto dto) {
+ public IPage<ProductionOrderVo> pageProductionOrder(Page<ProductionOrderDto> page, ProductionOrderDto dto) {
Page<ProductionOrderVo> result = (Page<ProductionOrderVo>) baseMapper.pageProductionOrder(page, dto);
fillProductImages(result.getRecords());
return result;
@@ -359,18 +360,18 @@
if (defaultDecimal(productionOrder.getQuantity()).compareTo(BigDecimal.ZERO) <= 0) {
throw new ServiceException("quantity must be greater than 0");
}
- if (productionOrder.getTechnologyRoutingId() == null) {
- // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
- TechnologyRouting technologyRouting = technologyRoutingMapper.selectOne(
- Wrappers.<TechnologyRouting>lambdaQuery()
- .eq(TechnologyRouting::getProductModelId, productionOrder.getProductModelId())
- .orderByDesc(TechnologyRouting::getId)
- .last("limit 1"));
- if (technologyRouting == null) {
- throw new ServiceException("No technology routing found for the product model");
- }
- productionOrder.setTechnologyRoutingId(technologyRouting.getId());
- }
+// if (productionOrder.getTechnologyRoutingId() == null) {
+// // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
+// TechnologyRouting technologyRouting = technologyRoutingMapper.selectOne(
+// Wrappers.<TechnologyRouting>lambdaQuery()
+// .eq(TechnologyRouting::getProductModelId, productionOrder.getProductModelId())
+// .orderByDesc(TechnologyRouting::getId)
+// .last("limit 1"));
+// if (technologyRouting == null) {
+// throw new ServiceException("No technology routing found for the product model");
+// }
+// productionOrder.setTechnologyRoutingId(technologyRouting.getId());
+// }
if (oldOrder != null && ProductOrderStatusEnum.isStarted(oldOrder.getStatus())) {
// 寮�宸ュ悗鍙厑璁镐慨姝ｉ潪鏍稿績瀛楁锛屾牳蹇冪敓浜т緷鎹攣瀹氥��
if (!Objects.equals(oldOrder.getProductModelId(), productionOrder.getProductModelId())
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 f9e4008..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;
@@ -17,6 +18,7 @@
import com.ruoyi.production.mapper.ProductionPlanMapper;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.pojo.ProductionPlan;
+import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.production.service.ProductionPlanService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
@@ -24,20 +26,24 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper, ProductionPlan> implements ProductionPlanService {
- private final ProductionPlanMapper productionPlanMapper;
+ private static final int PLAN_STATUS_WAIT = 0;
+ private static final int PLAN_STATUS_PARTIAL = 1;
+ private static final int PLAN_STATUS_ISSUED = 2;
+ private final ProductionPlanMapper productionPlanMapper;
private final ProductionOrderMapper productionOrderMapper;
+ private final ProductionOrderService productionOrderService;
@Override
public IPage<ProductionPlanVo> listPage(Page<ProductionPlanDto> page, ProductionPlanDto productionPlanDto) {
@@ -45,133 +51,98 @@
}
/**
- * 鍚堝苟鐢熶骇璁″垝
+ * 鍚堝苟鐢熶骇璁″垝骞朵笅鍙戠敓浜ц鍗曘��
+ * 涓氬姟绾︽潫锛�
+ * 1. 浠呭厑璁稿悓涓�浜у搧鍨嬪彿鐨勮鍒掑悎骞讹紱
+ * 2. 宸蹭笅鍙戞垨閮ㄥ垎涓嬪彂鐨勮鍒掔姝㈠啀娆″悎骞讹紱
+ * 3. 涓嬪彂鏁伴噺涓嶈兘澶т簬鎵�閫夎鍒掗渶姹傛�婚噺锛�
+ * 4. 璁㈠崟鍒涘缓缁熶竴澶嶇敤 ProductionOrderService.saveProductionOrder锛岀‘淇濆伐鑹�/BOM/棰嗘枡涓诲崟绛夊悗缁�昏緫涓�鑷淬��
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean combine(ProductionPlanDto productionPlanDto) {
- if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
+ if (productionPlanDto == null || productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
return false;
}
- // 鏌ヨ涓荤敓浜ц鍒�
- List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(productionPlanDto.getIds());
-
- if (plans == null || plans.isEmpty()) {
- throw new ServiceException("涓嬪彂澶辫触,鐢熶骇璁″垝涓嶅瓨鍦�");
+ List<Long> planIds = productionPlanDto.getIds().stream()
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ if (planIds.isEmpty()) {
+ throw new ServiceException("涓嬪彂澶辫触锛屾湭閫夋嫨鐢熶骇璁″垝");
}
- // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佸悕绉�
- String firstProductName = plans.get(0).getProductName();
- if (plans.stream().anyMatch(p -> p.getProductName() == null || !p.getProductName().equals(firstProductName))) {
- throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧鍚嶇О");
+ List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(planIds);
+ if (plans == null || plans.isEmpty() || plans.size() != planIds.size()) {
+ throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掍笉瀛樺湪鎴栧凡琚垹闄�");
}
- // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佽鏍�
- String firstProductSpec = plans.get(0).getModel();
- if (plans.stream().anyMatch(p -> p.getModel() == null || !p.getModel().equals(firstProductSpec))) {
- throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧瑙勬牸");
+ ProductionPlanDto firstPlan = plans.getFirst();
+ if (firstPlan.getProductModelId() == null) {
+ throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掔己灏戜骇鍝佸瀷鍙�");
}
- // 鍒涘缓鐢熶骇璁㈠崟
+ boolean hasDifferentModel = plans.stream()
+ .anyMatch(item -> !Objects.equals(item.getProductModelId(), firstPlan.getProductModelId()));
+ if (hasDifferentModel) {
+ throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掔殑浜у搧鍨嬪彿涓嶄竴鑷�");
+ }
+
+ boolean hasIssuedPlan = plans.stream()
+ .anyMatch(item -> item.getStatus() != null && item.getStatus() != PLAN_STATUS_WAIT);
+ if (hasIssuedPlan) {
+ throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掑瓨鍦ㄥ凡涓嬪彂鎴栭儴鍒嗕笅鍙戞暟鎹�");
+ }
+
+ BigDecimal totalRequiredQuantity = plans.stream()
+ .map(ProductionPlan::getQtyRequired)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (totalRequiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("涓嬪彂澶辫触锛屾墍閫夌敓浜ц鍒掗渶姹傛�婚噺蹇呴』澶т簬0");
+ }
+
+ BigDecimal assignedQuantity = productionPlanDto.getTotalAssignedQuantity();
+ if (assignedQuantity == null || assignedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("涓嬪彂澶辫触锛屼笅鍙戞暟閲忓繀椤诲ぇ浜�0");
+ }
+ if (assignedQuantity.compareTo(totalRequiredQuantity) > 0) {
+ throw new ServiceException("涓嬪彂澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庤鍒掗渶姹傛�婚噺");
+ }
+
ProductionOrder productionOrder = new ProductionOrder();
- productionOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
+ productionOrder.setProductionPlanIds(formatPlanIds(planIds));
+ productionOrder.setProductModelId(firstPlan.getProductModelId());
+ productionOrder.setQuantity(assignedQuantity);
productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
-// // 鍙犲姞鍓╀綑鏂规暟
-// BigDecimal totalRemainingVolume = plans.stream()
-// .map(ProductionPlan::getRemainingVolume)
-// .filter(Objects::nonNull)
-// .reduce(BigDecimal.ZERO, BigDecimal::add);
-// // 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鍓╀綑鏂规暟
-// if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalRemainingVolume) > 0) {
-// throw new BaseException("鎿嶄綔澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庡墿浣欐柟鏁�");
-// }
-//
-// // 鍒涘缓鐢熶骇璁㈠崟
-// ProductOrder productOrder = new ProductOrder();
-// productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
-// productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
-// productOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
-// productOrder.setStrength(productionPlanDto.getStrength());
-// productOrder.setProductMaterialSkuId(plans.get(0).getProductMaterialSkuId());
-//
-// Long orderId = productOrderService.insertProductOrder(productOrder);
-//
-// // 褰撲笅鍙戠殑浜у搧涓虹爩鍧楁垨鏉挎潗锛屽氨鎷夊彇BOM瀛愰泦涓庡伐鑹鸿矾绾垮瓙闆嗘暟鎹瓨鍏ュ埌闄勮〃涓�
-// if ("鐮屽潡".equals(productionPlanDto.getProductName())) {
-// productOrder.setRouteId(productionOrderAppendixService.populateBlocks(orderId, productionPlanDto));
-// }
-// if ("鏉挎潗".equals(productionPlanDto.getProductName())) {
-// productOrder.setRouteId(productionOrderAppendixService.populatePlates(orderId, productionPlanDto));
-// }
-// // 鏇存柊缁戝畾鐨勫伐鑹鸿矾绾�
-// productOrderService.updateById(productOrder);
-//
-// // 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
-// BigDecimal assignedVolume = BigDecimal.ZERO;
-// for (ProductionPlan plan : plans) {
-// BigDecimal volume = plan.getVolume();
-// if (volume == null) {
-// continue;
-// }
-// // 璁＄畻鍓╀綑鏂规暟
-// BigDecimal remainingVolume = plan.getRemainingVolume();
-// if (remainingVolume.compareTo(BigDecimal.ZERO) <= 0) {
-// continue;
-// }
-//
-// ProductOrderPlan productOrderPlan = new ProductOrderPlan();
-// productOrderPlan.setProductOrderId(productOrder.getId());
-// productOrderPlan.setProductionPlanId(plan.getId());
-//
-// if (assignedVolume.add(remainingVolume).compareTo(productionPlanDto.getTotalAssignedQuantity()) >= 0) {
-// // 鏈�鍚庝竴涓鍒掞紝鍒嗛厤鍓╀綑鏂规暟
-// BigDecimal lastRemainingVolume = productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume);
-// BigDecimal assignedQuantity = Optional.ofNullable(plan.getAssignedQuantity()).orElse(BigDecimal.ZERO).add(lastRemainingVolume);
-// plan.setAssignedQuantity(assignedQuantity);
-// plan.setStatus(assignedQuantity.compareTo(plan.getVolume()) >= 0 ? 2 : 1);
-// productOrderPlan.setAssignedQuantity(lastRemainingVolume);
-// productionPlanMapper.updateById(plan);
-// productOrderPlanMapper.insert(productOrderPlan);
-// break;
-// }
-//
-// // 鍒嗛厤褰撳墠璁″垝鏂规暟
-// BigDecimal assignedQuantity = Optional.ofNullable(plan.getAssignedQuantity()).orElse(BigDecimal.ZERO).add(remainingVolume);
-// plan.setAssignedQuantity(assignedQuantity);
-// plan.setStatus(assignedQuantity.compareTo(plan.getVolume()) >= 0 ? 2 : 1);
-// productOrderPlan.setAssignedQuantity(remainingVolume);
-// // 鏇存柊鐢熶骇璁″垝
-// productionPlanMapper.updateById(plan);
-// // 鍒涘缓鍏宠仈鍏崇郴
-// productOrderPlanMapper.insert(productOrderPlan);
-// assignedVolume = assignedVolume.add(remainingVolume);
-// }
-//
-// for (ProductionPlan plan : plans) {
-// BigDecimal assignedQuantity = Optional.ofNullable(plan.getAssignedQuantity()).orElse(BigDecimal.ZERO);
-// BigDecimal volume = Optional.ofNullable(plan.getVolume()).orElse(BigDecimal.ZERO);
-// if (assignedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
-// plan.setStatus(0);
-// } else if (assignedQuantity.compareTo(volume) >= 0) {
-// plan.setStatus(2);
-// } else {
-// plan.setStatus(1);
-// }
-// productionPlanMapper.updateById(plan);
-// }
+
+ boolean saved = productionOrderService.saveProductionOrder(productionOrder);
+ if (!saved) {
+ throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍗曚繚瀛樺け璐�");
+ }
+
+ int targetStatus = assignedQuantity.compareTo(totalRequiredQuantity) < 0 ? PLAN_STATUS_PARTIAL : PLAN_STATUS_ISSUED;
+ List<ProductionPlan> updates = planIds.stream().map(id -> {
+ ProductionPlan update = new ProductionPlan();
+ update.setId(id);
+ update.setStatus(targetStatus);
+ return update;
+ }).collect(Collectors.toList());
+ if (!updates.isEmpty()) {
+ this.updateBatchById(updates);
+ }
return true;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(ProductionPlanDto dto) {
- if (StringUtils.isBlank(dto.getApplyNo())) {
- throw new ServiceException("鏂板澶辫触锛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
- }
- checkApplyNoUnique(dto.getApplyNo(), null);
-
- dto.setStatus(0);
+ 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;
}
@@ -179,51 +150,49 @@
@Transactional(rollbackFor = Exception.class)
public boolean update(ProductionPlanDto dto) {
if (dto == null || dto.getId() == null) {
- throw new ServiceException("缂栬緫澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ throw new ServiceException("缂栬緫澶辫触锛屾暟鎹笉鑳戒负绌�");
}
ProductionPlan old = getById(dto.getId());
if (old == null) {
- throw new ServiceException("缂栬緫澶辫触,涓荤敓浜ц鍒掍笉瀛樺湪");
+ throw new ServiceException("缂栬緫澶辫触锛岀敓浜ц鍒掍笉瀛樺湪");
}
- // 鐘舵�佹牎楠�
- if (old.getStatus() != 0) {
- throw new BaseException("缂栬緫澶辫触,璇ョ敓浜ц鍒掑凡涓嬪彂鎴栭儴鍒嗕笅鍙戠姸鎬�,绂佹缂栬緫");
+ if (old.getStatus() != PLAN_STATUS_WAIT) {
+ throw new BaseException("缂栬緫澶辫触锛岃鐢熶骇璁″垝宸蹭笅鍙戞垨閮ㄥ垎涓嬪彂锛岀姝㈢紪杈�");
}
- // applyNo鍙樻洿鎵嶆牎楠�
- 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 + " 宸插瓨鍦�");
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean delete(List<Long> ids) {
- // 濡傛灉瀛樺湪宸蹭笅鍙戠殑璁″垝锛屽垯涓嶈兘鍒犻櫎
- if (productionPlanMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery().in(ProductionPlan::getId, ids)).stream().anyMatch(p -> p.getStatus() == 1 || p.getStatus() == 2)) {
+ if (productionPlanMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery().in(ProductionPlan::getId, ids))
+ .stream()
+ .anyMatch(p -> p.getStatus() == PLAN_STATUS_PARTIAL || p.getStatus() == PLAN_STATUS_ISSUED)) {
throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ凡涓嬪彂鎴栭儴鍒嗕笅鍙戠殑璁″垝");
}
- // 濡傛灉鏈夊叧鑱旇鍗曪紝鍒欎笉鑳藉垹闄�
- if (productionOrderMapper.selectList(Wrappers.<ProductionOrder>lambdaQuery().in(ProductionOrder::getProductionPlanIds, ids)).stream().anyMatch(p -> p.getId() != null)) {
- throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ叧鑱旇鍗�");
+
+ if (productionOrderMapper.selectList(Wrappers.<ProductionOrder>lambdaQuery().in(ProductionOrder::getProductionPlanIds, ids))
+ .stream()
+ .anyMatch(p -> p.getId() != null)) {
+ throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ叧鑱旂敓浜ц鍗�");
}
return productionPlanMapper.deleteBatchIds(ids) > 0;
@@ -240,80 +209,81 @@
try {
list = excelUtil.importExcel(file.getInputStream());
} catch (Exception e) {
- log.error("鐢熶骇闇�姹侲xcel瀵煎叆澶辫触", 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)) {
- if (!"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))
- .stream().map(ProductionPlan::getApplyNo).collect(Collectors.toList());
- throw new ServiceException("瀵煎叆澶辫触锛岀敵璇峰崟缂栧彿宸插瓨鍦�: " + String.join(", ", existApplyNos));
+ List<String> existMpsNos = baseMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery()
+ .in(ProductionPlan::getMpsNo, mpsNos))
+ .stream()
+ .map(ProductionPlan::getMpsNo)
+ .collect(Collectors.toList());
+ 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(0);
+ 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) {
+ return planIds.stream()
+ .filter(Objects::nonNull)
+ .distinct()
+ .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 56cfbb0..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,20 +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.ProductionAccount;
-import com.ruoyi.production.pojo.ProductionOperationTask;
-import com.ruoyi.production.pojo.ProductionOrder;
-import com.ruoyi.production.pojo.ProductionProductMain;
+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;
@@ -68,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;
@@ -256,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
@@ -432,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);
// 鎵归噺鍒犻櫎浜у搧瀛愯〃
diff --git a/src/main/resources/mapper/production/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml
index a7ad8f7..da0d293 100644
--- a/src/main/resources/mapper/production/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -23,31 +23,25 @@
<select id="listPage" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
SELECT
pp.*,
- pms.material_code AS materialCode,
- pmdl.model,
- pms.product_id AS productMaterialId,
+ pm.model,
+ p.id as productId,
p.product_name AS productName,
- pmdl.unit
+ pm.unit
FROM production_plan pp
- left join product_material_sku pms on pp.product_material_sku_id = pms.id
- left join product_model pmdl on pp.product_model_id = pmdl.id
- left join product p on pmdl.product_id = p.id
-
- ORDER BY COALESCE(pp.form_modified_time, pp.id) DESC
+ left join product_model pm on pp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ ORDER BY COALESCE(pp.id) DESC
</select>
<select id="selectWithMaterialByIds" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
SELECT
pp.*,
- pms.material_code AS materialCode,
- pmdl.model,
+ pm.model,
p.product_name AS productName,
- pmdl.unit,
- pms.product_id AS productMaterialId
+ pm.unit
FROM production_plan pp
- LEFT JOIN product_material_sku pms ON pp.product_material_sku_id = pms.id
- LEFT JOIN product_model pmdl ON pp.product_model_id = pmdl.id
- LEFT JOIN product p ON pmdl.product_id = p.id
+ LEFT JOIN product_model pm ON pp.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
WHERE pp.id IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
@@ -57,15 +51,12 @@
<select id="selectProductionPlanDtoById" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
SELECT
pp.*,
- pms.material_code AS materialCode,
- pmdl.model,
- pms.product_id AS productMaterialId,
+ pm.model,
p.product_name AS productName,
- pmdl.unit
+ pm.unit
FROM production_plan pp
- left join product_material_sku pms on pp.product_material_sku_id = pms.id
- left join product_model pmdl on pp.product_model_id = pmdl.id
- left join product p on pmdl.product_id = p.id
+ left join product_model pm on pp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
WHERE pp.id = #{productionPlanId}
</select>
</mapper>
--
Gitblit v1.9.3