From 3d950b8475cc52084cb40ed7a9373900f0606167 Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期一, 21 九月 2026 19:17:00 +0800
Subject: [PATCH] feat(production): 新增生产订单自动领料功能与订单号生成方法
---
src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml | 12 +--
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 4 +
src/main/java/com/ruoyi/production/service/ProductionOrderPickService.java | 3
src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java | 4
src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java | 144 ++++++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 16 +++
src/main/resources/application-dev.yml | 2
src/main/java/com/ruoyi/production/service/ProductionOrderService.java | 9 ++
pom.xml | 6 +
src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java | 4
10 files changed, 191 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 438b235..93bc6c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,6 +375,12 @@
<artifactId>thumbnailator</artifactId>
<version>${thumbnailator.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi</artifactId>
+ <version>3.8.9</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java b/src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java
index 8cdf321..f99b7d0 100644
--- a/src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java
+++ b/src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java
@@ -1,5 +1,8 @@
package com.ruoyi.basic.enums;
+import lombok.Getter;
+
+@Getter
public enum ApplicationTypeEnum {
IMAGE("image"),
FILE("file"),
@@ -10,7 +13,6 @@
private final String type;
ApplicationTypeEnum(String type) { this.type = type; }
- public String getType() { return type; }
/**
* 鏍规嵁 type 鍊艰幏鍙栧搴旂殑鏋氫妇瀹炰緥
diff --git a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
index 6fa2822..68bdcb8 100644
--- a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
+++ b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
@@ -1,5 +1,8 @@
package com.ruoyi.basic.enums;
+import lombok.Getter;
+
+@Getter
public enum RecordTypeEnum {
SHIPPING_INFO("shipping_info"),
INSPECTION_TASK("inspection_task"),
@@ -200,7 +203,6 @@
private final String type;
RecordTypeEnum(String type) { this.type = type; }
- public String getType() { return type; }
/**
* 鏍规嵁 type 鍊艰幏鍙栧搴旂殑鏋氫妇瀹炰緥
diff --git a/src/main/java/com/ruoyi/production/service/ProductionOrderPickService.java b/src/main/java/com/ruoyi/production/service/ProductionOrderPickService.java
index 82ee298..2690321 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionOrderPickService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionOrderPickService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.production.bean.dto.ProductionOrderPickDto;
+import com.ruoyi.production.bean.vo.AutoPickResultVo;
import com.ruoyi.production.bean.vo.ProductionOrderPickVo;
import com.ruoyi.production.pojo.ProductionOrderPick;
@@ -22,4 +23,6 @@
Boolean updatePick(ProductionOrderPickDto dto);
List<ProductionOrderPickVo> listPickedDetail(Long productionOrderId);
+
+ AutoPickResultVo autoPick(List<Long> orderIds);
}
diff --git a/src/main/java/com/ruoyi/production/service/ProductionOrderService.java b/src/main/java/com/ruoyi/production/service/ProductionOrderService.java
index deeb0dd..adcfbd5 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionOrderService.java
@@ -10,6 +10,7 @@
import com.ruoyi.production.bean.vo.ProductionOrderWorkOrderDetailVo;
import com.ruoyi.production.pojo.ProductionOrder;
+import java.time.LocalDate;
import java.util.List;
public interface ProductionOrderService extends IService<ProductionOrder> {
@@ -35,4 +36,12 @@
ProductionOrderWorkOrderDetailVo getWorkOrderReportInspectDetail(ProductionOrderDto productionOrderDto);
int updateOrder(ProductionOrderDto productionOrderDto);
+
+ /**
+ * 鎸夋寚瀹氭棩鏈熺敓鎴愪笅涓�涓敓浜ц鍗曞彿
+ *
+ * @param orderDate 璁㈠崟鏃ユ湡锛屼负 null 鏃朵娇鐢ㄥ綋澶�
+ * @return 鐢熶骇璁㈠崟鍙� SC+鏃ユ湡+4浣嶅簭鍙�
+ */
+ String generateNextOrderNo(LocalDate orderDate);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java
index 554b95e..51d3aad 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.bean.dto.ProductionOrderPickDto;
+import com.ruoyi.production.bean.vo.AutoPickResultVo;
import com.ruoyi.production.bean.vo.ProductionOrderPickVo;
import com.ruoyi.production.mapper.ProductionOperationTaskMapper;
import com.ruoyi.production.mapper.ProductionOrderMapper;
@@ -16,6 +17,7 @@
import com.ruoyi.production.mapper.ProductionOrderPickRecordMapper;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.pojo.ProductionOrderPick;
+import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.production.pojo.ProductionOrderPickRecord;
import com.ruoyi.production.service.ProductionOrderPickService;
import com.ruoyi.stock.dto.StockInventoryDto;
@@ -51,6 +53,7 @@
private static final String FEED_RETURN_IN_RECORD_TYPE = StockInQualifiedRecordTypeEnum.FEED_RETURN_IN.getCode();
private final ProductionOrderMapper productionOrderMapper;
+ private final ProductionOrderService productionOrderService;
private final ProductionOperationTaskMapper productionOperationTaskMapper;
private final ProductionOrderPickRecordMapper productionOrderPickRecordMapper;
private final StockInventoryMapper stockInventoryMapper;
@@ -194,6 +197,147 @@
return detailList;
}
+ @Override
+ public AutoPickResultVo autoPick(List<Long> orderIds) {
+ // 鑷姩棰嗘枡鎬绘祦绋嬶細
+ // 1) 閬嶅巻鐩爣璁㈠崟锛岃鍙朆OM闇�姹傛竻鍗曪紱
+ // 2) 鎸� 璁㈠崟ID+瑙勬牸ID+宸ュ簭ID 鍘婚噸鍒ゆ柇鏄惁宸查鏂欙紱
+ // 3) 瀵规湭棰嗘枡涓旀湁闇�姹傜殑鐗╂枡锛岄�愮瑪鎵ц savePick 棰嗘枡锛�
+ // 4) 姹囨�绘垚鍔�/璺宠繃/澶辫触鏄庣粏骞惰繑鍥炪��
+ AutoPickResultVo result = new AutoPickResultVo();
+ if (orderIds == null || orderIds.isEmpty()) {
+ return result;
+ }
+
+ result.setOrderTotal(orderIds.size());
+
+ for (Long orderId : orderIds) {
+ ProductionOrder order = productionOrderMapper.selectById(orderId);
+ if (order == null) {
+ result.setOrderFail(result.getOrderFail() + 1);
+ AutoPickResultVo.ItemDetail failItem = new AutoPickResultVo.ItemDetail();
+ failItem.setProductionOrderId(orderId);
+ failItem.setReason("鐢熶骇璁㈠崟涓嶅瓨鍦�");
+ result.getFailList().add(failItem);
+ continue;
+ }
+
+ // 鑾峰彇BOM闇�姹傛竻鍗�
+ List<ProductionOrderPickVo> demandList = productionOrderService.pick(orderId);
+ if (demandList == null || demandList.isEmpty()) {
+ result.setOrderFail(result.getOrderFail() + 1);
+ AutoPickResultVo.ItemDetail failItem = new AutoPickResultVo.ItemDetail();
+ failItem.setProductionOrderId(orderId);
+ failItem.setProductionOrderNo(order.getNpsNo());
+ failItem.setReason("鏃燘OM鐗╂枡闇�姹�");
+ result.getFailList().add(failItem);
+ continue;
+ }
+
+ // 鏌ヨ宸查鏂欒褰曪紙鎸� 宸ュ簭ID#瑙勬牸ID 鍘婚噸锛�
+ Set<String> pickedKeys = list(Wrappers.<ProductionOrderPick>lambdaQuery()
+ .eq(ProductionOrderPick::getProductionOrderId, orderId)
+ .eq(ProductionOrderPick::getReturned, false)).stream()
+ .map(p -> (p.getTechnologyOperationId() == null ? "null" : p.getTechnologyOperationId())
+ + "#" + p.getProductModelId())
+ .collect(Collectors.toSet());
+
+ boolean orderHasSuccess = false;
+ boolean orderHasFail = false;
+
+ for (ProductionOrderPickVo demand : demandList) {
+ result.setMaterialTotal(result.getMaterialTotal() + 1);
+
+ String key = (demand.getTechnologyOperationId() == null ? "null" : demand.getTechnologyOperationId())
+ + "#" + demand.getProductModelId();
+
+ // 宸查鏂欑殑璺宠繃
+ if (pickedKeys.contains(key)) {
+ result.setMaterialSkip(result.getMaterialSkip() + 1);
+ AutoPickResultVo.ItemDetail skipItem = new AutoPickResultVo.ItemDetail();
+ skipItem.setProductionOrderId(orderId);
+ skipItem.setProductionOrderNo(order.getNpsNo());
+ skipItem.setProductModelId(demand.getProductModelId());
+ skipItem.setTechnologyOperationId(demand.getTechnologyOperationId());
+ skipItem.setOperationName(demand.getOperationName());
+ skipItem.setDemandedQuantity(demand.getDemandedQuantity());
+ skipItem.setReason("宸查鏂�");
+ result.getSkipList().add(skipItem);
+ continue;
+ }
+
+ BigDecimal demandQty = demand.getDemandedQuantity();
+ if (demandQty == null || demandQty.compareTo(BigDecimal.ZERO) <= 0) {
+ result.setMaterialSkip(result.getMaterialSkip() + 1);
+ AutoPickResultVo.ItemDetail skipItem = new AutoPickResultVo.ItemDetail();
+ skipItem.setProductionOrderId(orderId);
+ skipItem.setProductionOrderNo(order.getNpsNo());
+ skipItem.setProductModelId(demand.getProductModelId());
+ skipItem.setTechnologyOperationId(demand.getTechnologyOperationId());
+ skipItem.setOperationName(demand.getOperationName());
+ skipItem.setDemandedQuantity(demandQty);
+ skipItem.setReason("闇�姹傛暟閲忎负0鎴栫┖");
+ result.getSkipList().add(skipItem);
+ continue;
+ }
+
+ // 鎵ц棰嗘枡
+ try {
+ ProductionOrderPickDto dto = new ProductionOrderPickDto();
+ dto.setProductionOrderId(orderId);
+ dto.setProductModelId(demand.getProductModelId());
+ dto.setPickQuantity(demandQty);
+ dto.setPickType((byte) 1); // 1=姝e父棰嗘枡
+ dto.setBatchNoList(demand.getBatchNoList());
+ dto.setTechnologyOperationId(demand.getTechnologyOperationId());
+ dto.setOperationName(demand.getOperationName());
+ dto.setDemandedQuantity(demand.getDemandedQuantity());
+ dto.setBom(demand.getBom());
+ dto.setRemark("鑷姩棰嗘枡");
+
+ savePick(dto);
+
+ result.setMaterialSuccess(result.getMaterialSuccess() + 1);
+ orderHasSuccess = true;
+ AutoPickResultVo.ItemDetail successItem = new AutoPickResultVo.ItemDetail();
+ successItem.setProductionOrderId(orderId);
+ successItem.setProductionOrderNo(order.getNpsNo());
+ successItem.setProductModelId(demand.getProductModelId());
+ successItem.setTechnologyOperationId(demand.getTechnologyOperationId());
+ successItem.setOperationName(demand.getOperationName());
+ successItem.setDemandedQuantity(demandQty);
+ successItem.setPickQuantity(demandQty);
+ result.getSuccessList().add(successItem);
+ } catch (Exception e) {
+ result.setMaterialFail(result.getMaterialFail() + 1);
+ orderHasFail = true;
+ AutoPickResultVo.ItemDetail failItem = new AutoPickResultVo.ItemDetail();
+ failItem.setProductionOrderId(orderId);
+ failItem.setProductionOrderNo(order.getNpsNo());
+ failItem.setProductModelId(demand.getProductModelId());
+ failItem.setTechnologyOperationId(demand.getTechnologyOperationId());
+ failItem.setOperationName(demand.getOperationName());
+ failItem.setDemandedQuantity(demandQty);
+ failItem.setReason(e.getMessage());
+ result.getFailList().add(failItem);
+ }
+ }
+
+ if (orderHasSuccess) {
+ result.setOrderSuccess(result.getOrderSuccess() + 1);
+ }
+ if (orderHasFail) {
+ result.setOrderFail(result.getOrderFail() + 1);
+ }
+ // 濡傛灉鏃㈡病鏈夋垚鍔熶篃娌℃湁澶辫触锛堝叏璺宠繃锛夛紝璁㈠崟涓嶇畻澶辫触涔熶笉绠楁垚鍔�
+ if (!orderHasSuccess && !orderHasFail) {
+ result.setOrderSuccess(result.getOrderSuccess() + 1);
+ }
+ }
+
+ return result;
+ }
+
private void processDeletePickIds(ProductionOrderPickDto rootDto,
Map<Long, ProductionOrderPick> existingPickMap,
Long productionOrderId) {
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 ecf8978..a47c514 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -441,8 +441,20 @@
}
private String generateNextOrderNo() {
- // 鐢熸垚涓嬩竴涓敓浜ц鍗曞彿
- String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ // 鐢熸垚涓嬩竴涓敓浜ц鍗曞彿锛堥粯璁ゆ寜褰撳ぉ鏃ユ湡锛�
+ return generateNextOrderNo(LocalDate.now());
+ }
+
+ /**
+ * 鎸夋寚瀹氭棩鏈熺敓鎴愪笅涓�涓敓浜ц鍗曞彿
+ *
+ * @param orderDate 璁㈠崟鏃ユ湡锛堢敤浜庣敓鎴愭棩鏈熷墠缂�锛夛紝涓� null 鏃朵娇鐢ㄥ綋澶�
+ */
+ public String generateNextOrderNo(LocalDate orderDate) {
+ if (orderDate == null) {
+ orderDate = LocalDate.now();
+ }
+ String datePrefix = orderDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String prefix = "SC" + datePrefix;
ProductionOrder latestOrder = this.getOne(Wrappers.<ProductionOrder>lambdaQuery()
.likeRight(ProductionOrder::getNpsNo, prefix)
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 b00266b..6a9b4f7 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -151,6 +151,10 @@
productionOrder.setProductModelId(firstPlan.getProductModelId());
productionOrder.setQuantity(assignedQuantity);
productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
+ // 鐢熶骇璁㈠崟鍙锋寜涓荤敓浜ц鍒掔殑闇�姹傛棩鏈熺敓鎴�
+ ProductionPlan primaryPlan = this.getById(firstPlan.getId());
+ LocalDate orderNoDate = primaryPlan != null ? primaryPlan.getRequiredDate() : null;
+ productionOrder.setNpsNo(productionOrderService.generateNextOrderNo(orderNoDate));
if (!productionOrderService.saveProductionOrder(productionOrder)) {
throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍗曚繚瀛樺け璐�");
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 03df577..43ed6de 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -73,7 +73,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://localhost:3306/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/product-inventory-management-rfsy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# 浠庡簱鏁版嵁婧�
diff --git a/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
index c9cbbb0..9112ec0 100644
--- a/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
+++ b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
@@ -89,14 +89,10 @@
<select id="existsByStockInRecordId" resultType="java.lang.Boolean">
SELECT COUNT(*) > 0
FROM account_payment_application
- WHERE status != 2
- <if test="stockInRecordIds != null and stockInRecordIds.size() > 0">
- AND (
- <foreach collection="stockInRecordIds" item="id" separator=" OR ">
- FIND_IN_SET(#{id}, stock_in_record_ids)
- </foreach>
- )
- </if>
+ WHERE status != 2 AND
+ <foreach collection="stockInRecordIds" item="id" open="(" separator=" OR " close=")">
+ FIND_IN_SET(#{id}, stock_in_record_ids)
+ </foreach>
</select>
</mapper>
--
Gitblit v1.9.3