From d48849cfcc2e45340921edab4685a8f260793b50 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 11 四月 2026 10:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductFrozen.java | 49 +++++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductFrozenServiceImpl.java | 20 ++
src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java | 30 ++-
src/main/java/com/ruoyi/sales/service/ISalesLedgerProductFrozenService.java | 16 +
src/main/resources/mapper/sales/SalesLedgerProductFrozenMapper.xml | 14 +
doc/长治-祥雨远见.sql | 13 +
src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java | 7
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 138 ++++++++++++++
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 29 +++
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 3
src/main/java/com/ruoyi/sales/service/ISalesLedgerProductService.java | 2
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 119 ++++++++----
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 13 +
src/main/java/com/ruoyi/sales/mapper/SalesLedgerProductFrozenMapper.java | 16 +
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 27 ++
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductFrozenController.java | 20 ++
16 files changed, 448 insertions(+), 68 deletions(-)
diff --git "a/doc/\351\225\277\346\262\273-\347\245\245\351\233\250\350\277\234\350\247\201.sql" "b/doc/\351\225\277\346\262\273-\347\245\245\351\233\250\350\277\234\350\247\201.sql"
index 8a82d43..8755301 100644
--- "a/doc/\351\225\277\346\262\273-\347\245\245\351\233\250\350\277\234\350\247\201.sql"
+++ "b/doc/\351\225\277\346\262\273-\347\245\245\351\233\250\350\277\234\350\247\201.sql"
@@ -2,4 +2,15 @@
ADD COLUMN `worker_id` bigint NULL COMMENT '鎸囨淳宸ヤ汉ID',
ADD COLUMN `worker_name` varchar(100) NULL COMMENT '鎸囨淳宸ヤ汉濮撳悕',
ADD COLUMN `handover_user_id` bigint NULL COMMENT '浜ゆ帴浜哄憳ID',
- ADD COLUMN `handover_user_name` varchar(100) NULL COMMENT '浜ゆ帴浜哄憳鍚嶇О';
\ No newline at end of file
+ ADD COLUMN `handover_user_name` varchar(100) NULL COMMENT '浜ゆ帴浜哄憳鍚嶇О';
+
+CREATE TABLE `sales_ledger_product_frozen`
+(
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭id',
+ `sales_ledger_product_id` bigint(20) NOT NULL COMMENT '閿�鍞鍗曚骇鍝乮d',
+ `product_model_id` bigint(20) NOT NULL COMMENT '浜у搧瑙勬牸id',
+ `frozen_quantity` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '鍐荤粨鏁伴噺',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+ DEFAULT CHARSET = utf8mb4 COMMENT ='閿�鍞骇鍝佸喕缁撳簱瀛樿〃';
diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index f1348db..b62d7e9 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -5,21 +5,21 @@
import com.ruoyi.approve.pojo.ApproveProcess;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.Calendar;
-import java.util.Date;
import java.util.concurrent.TimeUnit;
//鍩轰簬redis鐨勪竴涓瘡鏃ヨ鏁板櫒
@Component
-public class DailyRedisCounter {
+public class DailyRedisCounter implements ApplicationRunner {
private static final String KEY_PREFIX = "daily_counter:";
private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMdd");
private final StringRedisTemplate redisTemplate;
@@ -30,6 +30,44 @@
@Value("${ruoyi.approvalNumberPrefix}")
private String approvalNumberPrefix;
+
+ @Autowired
+ private ApproveProcessMapper approveProcessMapper;
+
+ @Override
+ public void run(ApplicationArguments args) {
+ syncFromDb();
+ }
+
+ /**
+ * 寮哄埗浠庢暟鎹簱鍚屾褰撳墠璁℃暟鍒� Redis
+ */
+ public void syncFromDb() {
+ String key = approvalNumberPrefix + ":approveNum";
+ String lockKey = key + ":sync_lock";
+ Boolean lock = redisTemplate.opsForValue().setIfAbsent(lockKey, "1", 30, TimeUnit.SECONDS);
+ if (Boolean.TRUE.equals(lock)) {
+ try {
+ long dbCount = getCountFromDb();
+ redisTemplate.opsForValue().set(key, String.valueOf(dbCount), calculateSecondsUntilMidnight(), TimeUnit.SECONDS);
+ } finally {
+ redisTemplate.delete(lockKey);
+ }
+ }
+ }
+
+ /**
+ * 浠庢暟鎹簱鑾峰彇浠婃棩瀹℃壒鍗曟�婚噺
+ */
+ private long getCountFromDb() {
+ StartAndEndDateDto dateTime = getDateTime();
+ LambdaQueryWrapper<ApproveProcess> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ApproveProcess::getApproveDelete, 0)
+ .ge(ApproveProcess::getCreateTime, dateTime.getStartDate())
+ .lt(ApproveProcess::getCreateTime, dateTime.getEndDate());
+ Long count = approveProcessMapper.selectCount(wrapper);
+ return count == null ? 0 : count;
+ }
/**鏌ョ紦瀛�
* 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勬暟鍊硷紝骞惰嚜澧�1
@@ -49,21 +87,14 @@
return count;
}
- @Autowired
- private ApproveProcessMapper approveProcessMapper;
-
/**
* 鑾峰彇褰撳墠鏃堕棿鐨� 寮�濮嬫棩鏈� 锛岀粨鏉熸棩鏈�
* @return
*/
public static StartAndEndDateDto getDateTime(){
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
- Date date = new Date();
- Calendar cal = Calendar.getInstance();
- cal.setTime(date);
- cal.add(Calendar.DATE,1);
- String startDateTime = simpleDateFormat.format(date);
- String endDateTime = simpleDateFormat.format(cal.getTime());
+ LocalDate now = LocalDate.now();
+ String startDateTime = now.toString();
+ String endDateTime = now.plusDays(1).toString();
StartAndEndDateDto startAndEndDateDto = new StartAndEndDateDto();
startAndEndDateDto.setStartDate(startDateTime);
startAndEndDateDto.setEndDate(endDateTime);
@@ -75,29 +106,36 @@
* @return 浠婃棩鑷鍚庣殑璁℃暟鍊�
*/
public long incrementAndGetByDb() {
- String approveId = redisTemplate.opsForValue().get(approvalNumberPrefix + ":approveNum");
- if(approveId == null){
- StartAndEndDateDto dateTime = getDateTime();
- LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
- approveProcessLambdaQueryWrapper
- .eq(ApproveProcess::getApproveDelete,0)
- .gt(ApproveProcess::getCreateTime,dateTime.getStartDate())
- .lt(ApproveProcess::getCreateTime,dateTime.getEndDate());
- Long aLong = approveProcessMapper.selectCount(approveProcessLambdaQueryWrapper);
- if(aLong == null){
- redisTemplate.opsForValue().set(approvalNumberPrefix + ":approveNum","1",1L, TimeUnit.HOURS);
- return 1;
- }else{
- aLong += 1;
- redisTemplate.opsForValue().set(approvalNumberPrefix + ":approveNum",aLong.toString(),1L, TimeUnit.HOURS);
- return aLong;
- }
- }else{
- Long num = Long.parseLong(approveId) + 1;
- redisTemplate.opsForValue().set(approvalNumberPrefix + ":approveNum",num.toString(),1L, TimeUnit.HOURS);
- return Long.parseLong(approveId);
- }
+ String key = approvalNumberPrefix + ":approveNum";
+ // 鑾峰彇鐜版湁鍊�
+ String approveId = redisTemplate.opsForValue().get(key);
+ if (approveId == null) {
+ // 缂撳瓨涓嶅瓨鍦ㄨ繘琛屽垵濮嬪寲
+ String lockKey = key + ":lock";
+ Boolean lock = redisTemplate.opsForValue().setIfAbsent(lockKey, "1", 10, TimeUnit.SECONDS);
+ if (Boolean.TRUE.equals(lock)) {
+ try {
+ approveId = redisTemplate.opsForValue().get(key);
+ if (approveId == null) {
+ long count = getCountFromDb();
+ long nextVal = count + 1;
+ redisTemplate.opsForValue().set(key, String.valueOf(nextVal), calculateSecondsUntilMidnight(), TimeUnit.SECONDS);
+ return nextVal;
+ }
+ } finally {
+ redisTemplate.delete(lockKey);
+ }
+ } else {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ return incrementAndGetByDb();
+ }
+ }
+ return redisTemplate.opsForValue().increment(key);
}
/**
@@ -115,12 +153,9 @@
* 璁＄畻璺濈娆℃棩鍑屾櫒鐨勭鏁�
*/
private long calculateSecondsUntilMidnight() {
- LocalDate tomorrow = LocalDate.now().plusDays(1);
- LocalDate midnight = tomorrow.atStartOfDay().toLocalDate();
- return java.time.Duration.between(
- LocalDate.now().atTime(23, 59, 59),
- midnight.atTime(0, 0, 0)
- ).getSeconds() + 1;
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime midnight = now.toLocalDate().plusDays(1).atStartOfDay();
+ return java.time.Duration.between(now, midnight).getSeconds();
}
/**
diff --git a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
index 819ce65..4bb3a84 100644
--- a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
+++ b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -21,7 +21,9 @@
import java.math.BigDecimal;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Component
@RequiredArgsConstructor
@@ -35,12 +37,13 @@
/**
* 涓嶅悎鏍煎叆搴�
+ *
* @param productModelId
* @param quantity
* @param recordType
* @param recordId
*/
- public void addUnStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) {
+ public void addUnStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId) {
StockUninventoryDto stockUninventoryDto = new StockUninventoryDto();
stockUninventoryDto.setRecordId(recordId);
stockUninventoryDto.setRecordType(String.valueOf(recordType));
@@ -51,12 +54,13 @@
/**
* 涓嶅悎鏍煎嚭搴�
+ *
* @param productModelId
* @param quantity
* @param recordType
* @param recordId
*/
- public void subtractUnStock(Long productModelId, BigDecimal quantity, Integer recordType,Long recordId) {
+ public void subtractUnStock(Long productModelId, BigDecimal quantity, Integer recordType, Long recordId) {
StockUninventoryDto stockUninventoryDto = new StockUninventoryDto();
stockUninventoryDto.setRecordId(recordId);
stockUninventoryDto.setRecordType(String.valueOf(recordType));
@@ -67,12 +71,13 @@
/**
* 鍚堟牸鍏ュ簱
+ *
* @param productModelId
* @param quantity
* @param recordType
* @param recordId
*/
- public void addStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) {
+ public void addStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId) {
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setRecordId(recordId);
stockInventoryDto.setRecordType(String.valueOf(recordType));
@@ -83,12 +88,13 @@
/**
* 鍚堟牸鍑哄簱
+ *
* @param productModelId
* @param quantity
* @param recordType
* @param recordId
*/
- public void substractStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) {
+ public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId) {
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setRecordId(recordId);
stockInventoryDto.setRecordType(String.valueOf(recordType));
@@ -99,19 +105,23 @@
//涓嶅悎鏍煎簱瀛樺垹闄�
public void deleteStockInRecord(Long recordId, String recordType) {
- StockInRecord one = stockInRecordService.getOne(new QueryWrapper<StockInRecord>()
+ List<StockInRecord> stockInRecords = stockInRecordService.list(new QueryWrapper<StockInRecord>()
.lambda().eq(StockInRecord::getRecordId, recordId)
.eq(StockInRecord::getRecordType, recordType));
- if (ObjectUtils.isNotEmpty(one)) {
- stockInRecordService.batchDelete(Collections.singletonList(one.getId()));
+ if (ObjectUtils.isNotEmpty(stockInRecords)) {
+ List<Long> collect = stockInRecords.stream().map(StockInRecord::getId).collect(Collectors.toList());
+ stockInRecordService.batchDelete(collect);
}
}
+
public void deleteStockOutRecord(Long recordId, String recordType) {
- StockOutRecord one = stockOutRecordService.getOne(new QueryWrapper<StockOutRecord>()
+ List<StockOutRecord> stockOutRecords = stockOutRecordService.list(new QueryWrapper<StockOutRecord>()
.lambda().eq(StockOutRecord::getRecordId, recordId)
.eq(StockOutRecord::getRecordType, recordType));
- if (ObjectUtils.isNotEmpty(one)) {
- stockOutRecordService.batchDelete(Collections.singletonList(one.getId()));
+
+ if (ObjectUtils.isNotEmpty(stockOutRecords)) {
+ List<Long> collect = stockOutRecords.stream().map(StockOutRecord::getId).collect(Collectors.toList());
+ stockOutRecordService.batchDelete(collect);
}
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductFrozenController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductFrozenController.java
new file mode 100644
index 0000000..d59af4d
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductFrozenController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.sales.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 閿�鍞骇鍝佸喕缁撳簱瀛樿〃 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-04-09
+ */
+@RestController
+@RequestMapping("/sales-ledger-product-frozen")
+public class SalesLedgerProductFrozenController {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
index 49548e1..96e9828 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
@@ -86,8 +86,11 @@
// }
- //鍑哄簱
- stockUtils.addStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
+ // 瀹℃壒鍚屾剰骞跺彂鍑虹墿鏂欙紝閲婃斁 locked_quantity
+ salesLedgerProductService.revertFrozenStock(salesLedgerProduct.getId());
+
+ // 鎵ｅ噺搴撳瓨鎬绘暟
+ stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
}
return AjaxResult.success();
diff --git a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerProductFrozenMapper.java b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerProductFrozenMapper.java
new file mode 100644
index 0000000..254ef61
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerProductFrozenMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.sales.mapper;
+
+import com.ruoyi.sales.pojo.SalesLedgerProductFrozen;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 閿�鍞骇鍝佸喕缁撳簱瀛樿〃 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-04-09
+ */
+public interface SalesLedgerProductFrozenMapper extends BaseMapper<SalesLedgerProductFrozen> {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductFrozen.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductFrozen.java
new file mode 100644
index 0000000..c795ece
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductFrozen.java
@@ -0,0 +1,49 @@
+package com.ruoyi.sales.pojo;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 閿�鍞骇鍝佸喕缁撳簱瀛樿〃
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-04-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sales_ledger_product_frozen")
+@ApiModel(value="SalesLedgerProductFrozen瀵硅薄", description="閿�鍞骇鍝佸喕缁撳簱瀛樿〃")
+public class SalesLedgerProductFrozen implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "涓婚敭id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "閿�鍞鍗曚骇鍝乮d")
+ private Long salesLedgerProductId;
+
+ @ApiModelProperty(value = "浜у搧瑙勬牸id")
+ private Long productModelId;
+
+ @ApiModelProperty(value = "鍐荤粨鏁伴噺")
+ private BigDecimal frozenQuantity;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+
+}
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerProductFrozenService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerProductFrozenService.java
new file mode 100644
index 0000000..3d0b594
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerProductFrozenService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.sales.service;
+
+import com.ruoyi.sales.pojo.SalesLedgerProductFrozen;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 閿�鍞骇鍝佸喕缁撳簱瀛樿〃 鏈嶅姟绫�
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-04-09
+ */
+public interface ISalesLedgerProductFrozenService extends IService<SalesLedgerProductFrozen> {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerProductService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerProductService.java
index 47e0616..b006da4 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerProductService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerProductService.java
@@ -23,6 +23,8 @@
int deleteSalesLedgerProductByIds(Long[] ids);
+ void revertFrozenStock(Long salesLedgerProductId);
+
int addOrUpdateSalesLedgerProduct(SalesLedgerProduct salesLedgerProduct);
IPage<SalesLedgerProductDto> listPage(Page page, SalesLedgerProductDto salesLedgerProduct);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductFrozenServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductFrozenServiceImpl.java
new file mode 100644
index 0000000..e4223e5
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductFrozenServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.sales.service.impl;
+
+import com.ruoyi.sales.pojo.SalesLedgerProductFrozen;
+import com.ruoyi.sales.mapper.SalesLedgerProductFrozenMapper;
+import com.ruoyi.sales.service.ISalesLedgerProductFrozenService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 閿�鍞骇鍝佸喕缁撳簱瀛樿〃 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-04-09
+ */
+@Service
+public class SalesLedgerProductFrozenServiceImpl extends ServiceImpl<SalesLedgerProductFrozenMapper, SalesLedgerProductFrozen> implements ISalesLedgerProductFrozenService {
+
+}
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 68b52cb..1d165ad 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -26,8 +26,10 @@
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.SalesLedgerProductFrozen;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ISalesLedgerProductService;
+import com.ruoyi.sales.service.ISalesLedgerProductFrozenService;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.pojo.StockInventory;
import lombok.AllArgsConstructor;
@@ -92,6 +94,8 @@
private StockInventoryMapper stockInventoryMapper;
@Autowired
private ProductOrderServiceImpl productOrderServiceImpl;
+ @Autowired
+ private ISalesLedgerProductFrozenService salesLedgerProductFrozenService;
@Override
public SalesLedgerProduct selectSalesLedgerProductById(Long id) {
@@ -158,6 +162,8 @@
return 0;
}
+ checkProductionDataExist(Arrays.asList(ids));
+
// 1. 鍏堟煡璇㈣鍒犻櫎鐨勫瓙琛ㄨ褰曪紝鑾峰彇瀵瑰簲鐨� salesLedgerId
List<SalesLedgerProduct> deletedProducts = salesLedgerProductMapper.selectBatchIds(Arrays.asList(ids));
if (deletedProducts.isEmpty()) {
@@ -180,6 +186,10 @@
int result = salesLedgerProductMapper.deleteBatchIds(Arrays.asList(ids));
//鍒犻櫎瀵瑰簲鐨勭敓浜ц鍗�
deleteProductionData(Arrays.asList(ids));
+
+ for (Long id : ids) {
+ revertFrozenStock(id);
+ }
// 3. 瀵规瘡涓富琛↖D杩涜閲戦鏇存柊
for (Long salesLedgerId : mainIds) {
@@ -220,8 +230,12 @@
if (salesLedgerProduct.getId() == null) {
salesLedgerProduct.setRegisterDate(LocalDateTime.now());
result = salesLedgerProductMapper.insert(salesLedgerProduct);
- addProductionData(salesLedgerProduct);
+ processStockAndProduction(salesLedgerProduct);
} else {
+ checkProductionDataExist(Collections.singletonList(salesLedgerProduct.getId()));
+
+ revertFrozenStock(salesLedgerProduct.getId());
+
//鏌ヨ鍘熸湰鐨勪骇鍝佸瀷鍙穒d
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
result = salesLedgerProductMapper.updateById(salesLedgerProduct);
@@ -229,7 +243,7 @@
deleteProductionData(Arrays.asList(salesLedgerProduct.getId()));
// 鍒犻櫎鐢熶骇鏍哥畻鏁版嵁
- addProductionData(salesLedgerProduct);
+ processStockAndProduction(salesLedgerProduct);
}
// 濡傛灉鎻掑叆鎴栨洿鏂版垚鍔燂紝骞朵笖鏈� salesLedgerId锛屾墠缁х画鏇存柊涓昏〃閲戦
@@ -262,17 +276,87 @@
return result;
}
+ public void processStockAndProduction(SalesLedgerProduct salesLedgerProduct) {
+ BigDecimal salesQty = salesLedgerProduct.getQuantity();
+ if (salesQty == null) salesQty = BigDecimal.ZERO;
+
+ BigDecimal frozenQty = BigDecimal.ZERO;
+ BigDecimal productionQty = salesQty;
+
+ // 鏌ヨ鍙敤搴撳瓨
+ StockInventory stockInventory = stockInventoryMapper.selectOne(new LambdaQueryWrapper<StockInventory>()
+ .eq(StockInventory::getProductModelId, salesLedgerProduct.getProductModelId())
+ .last("for update"));
+ if (stockInventory != null) {
+ BigDecimal quality = stockInventory.getQualitity() != null ? stockInventory.getQualitity() : BigDecimal.ZERO;
+ BigDecimal lockedQty = stockInventory.getLockedQuantity() != null ? stockInventory.getLockedQuantity() : BigDecimal.ZERO;
+ BigDecimal availableStock = quality.subtract(lockedQty);
+
+ if (availableStock.compareTo(BigDecimal.ZERO) > 0) {
+ // 鏈夊彲鐢ㄥ簱瀛�
+ if (availableStock.compareTo(salesQty) >= 0) {
+ frozenQty = salesQty;
+ productionQty = BigDecimal.ZERO;
+ } else {
+ frozenQty = availableStock;
+ productionQty = salesQty.subtract(frozenQty);
+ }
+ }
+ }
+
+ // 鍐荤粨搴撳瓨
+ if (frozenQty.compareTo(BigDecimal.ZERO) > 0) {
+ SalesLedgerProductFrozen frozenRecord = new SalesLedgerProductFrozen();
+ frozenRecord.setSalesLedgerProductId(salesLedgerProduct.getId());
+ frozenRecord.setProductModelId(salesLedgerProduct.getProductModelId());
+ frozenRecord.setFrozenQuantity(frozenQty);
+ frozenRecord.setCreateTime(LocalDateTime.now());
+ salesLedgerProductFrozenService.save(frozenRecord);
+
+ if (stockInventory != null) {
+ BigDecimal currentLocked = stockInventory.getLockedQuantity() != null ? stockInventory.getLockedQuantity() : BigDecimal.ZERO;
+ stockInventory.setLockedQuantity(currentLocked.add(frozenQty));
+ stockInventoryMapper.updateById(stockInventory);
+ }
+ }
+
+ // 濡傛灉闇�瑕佺敓浜э紝鍒欑敓鎴愮敓浜ф暟鎹�
+ if (productionQty.compareTo(BigDecimal.ZERO) > 0) {
+ addProductionData(salesLedgerProduct, productionQty);
+ }
+ }
+
+ public void revertFrozenStock(Long salesLedgerProductId) {
+ SalesLedgerProductFrozen frozenRecord = salesLedgerProductFrozenService.getOne(new LambdaQueryWrapper<SalesLedgerProductFrozen>()
+ .eq(SalesLedgerProductFrozen::getSalesLedgerProductId, salesLedgerProductId)
+ .last("limit 1"));
+ if (frozenRecord != null) {
+ BigDecimal frozenQty = frozenRecord.getFrozenQuantity();
+ if (frozenQty != null && frozenQty.compareTo(BigDecimal.ZERO) > 0) {
+ StockInventory stockInventory = stockInventoryMapper.selectOne(new LambdaQueryWrapper<StockInventory>()
+ .eq(StockInventory::getProductModelId, frozenRecord.getProductModelId())
+ .last("for update"));
+ if (stockInventory != null) {
+ BigDecimal currentLocked = stockInventory.getLockedQuantity() != null ? stockInventory.getLockedQuantity() : BigDecimal.ZERO;
+ stockInventory.setLockedQuantity(currentLocked.subtract(frozenQty));
+ stockInventoryMapper.updateById(stockInventory);
+ }
+ }
+ salesLedgerProductFrozenService.removeById(frozenRecord.getId());
+ }
+ }
+
/**
* 鏂板鐢熶骇鏁版嵁
*/
- public void addProductionData(SalesLedgerProduct salesLedgerProduct) {
+ public void addProductionData(SalesLedgerProduct salesLedgerProduct, BigDecimal productionQty) {
ProductOrder productOrder = new ProductOrder();
productOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
productOrder.setProductModelId(salesLedgerProduct.getProductModelId());
productOrder.setSaleLedgerProductId(salesLedgerProduct.getId());
String string = productOrderServiceImpl.generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
productOrder.setNpsNo(string);
- productOrder.setQuantity(salesLedgerProduct.getQuantity());//闇�姹傛暟閲�
+ productOrder.setQuantity(productionQty);//闇�姹傛暟閲�
productOrder.setCompleteQuantity(BigDecimal.ZERO);//瀹屾垚鏁伴噺
productOrderMapper.insert(productOrder);
@@ -320,7 +404,7 @@
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
productWorkOrder.setProductOrderId(productOrder.getId());
- productWorkOrder.setPlanQuantity(salesLedgerProduct.getQuantity());
+ productWorkOrder.setPlanQuantity(productionQty);
productWorkOrder.setWorkOrderNo(workOrderNoStr);
productWorkOrder.setStatus(1);
@@ -334,6 +418,50 @@
}
/**
+ * 妫�鏌ユ槸鍚︽湁鎶ュ伐鏁版嵁
+ */
+ public void checkProductionDataExist(List<Long> productIds) {
+ if (org.springframework.util.CollectionUtils.isEmpty(productIds)) {
+ return;
+ }
+ // 鏌ヨproductOrder
+ List<ProductOrder> productOrders = productOrderMapper.selectList(new LambdaQueryWrapper<ProductOrder>()
+ .in(ProductOrder::getSaleLedgerProductId, productIds));
+ if (!CollectionUtils.isEmpty(productOrders)) {
+ List<Long> orderIds = productOrders.stream()
+ .map(ProductOrder::getId)
+ .collect(Collectors.toList());
+
+ // 鏌ヨprocessRouteItems
+ List<ProductProcessRouteItem> allRouteItems = productProcessRouteItemMapper.selectList(new LambdaQueryWrapper<ProductProcessRouteItem>()
+ .in(ProductProcessRouteItem::getProductOrderId, orderIds));
+
+ if (!CollectionUtils.isEmpty(allRouteItems)) {
+ // 鑾峰彇宸ュ簭椤笽D
+ List<Long> routeItemIds = allRouteItems.stream()
+ .map(ProductProcessRouteItem::getId)
+ .collect(Collectors.toList());
+
+ // 鏌ヨ鍏宠仈鐨勫伐鍗旾D
+ List<ProductWorkOrder> workOrders = productWorkOrderMapper.selectList(new LambdaQueryWrapper<ProductWorkOrder>()
+ .in(ProductWorkOrder::getProductProcessRouteItemId, routeItemIds));
+ if (!CollectionUtils.isEmpty(workOrders)) {
+ List<Long> workOrderIds = workOrders.stream()
+ .map(ProductWorkOrder::getId)
+ .collect(Collectors.toList());
+
+ // 鏌ヨ鍏宠仈鐨勭敓浜т富琛↖D鏄惁鏈夋暟鎹�
+ Long count = productionProductMainMapper.selectCount(new LambdaQueryWrapper<ProductionProductMain>()
+ .in(ProductionProductMain::getWorkOrderId, workOrderIds));
+ if (count != null && count > 0L) {
+ throw new RuntimeException("褰撳墠閿�鍞鍗曞凡鏈夋姤宸ユ暟鎹紝涓嶈兘鍒犻櫎鍜屼慨鏀�");
+ }
+ }
+ }
+ }
+ }
+
+ /**
* 鍒犻櫎鐢熶骇鏁版嵁
*/
public void deleteProductionData(List<Long> productIds) {
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 3b0cc55..38c4b12 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -437,8 +437,8 @@
salesLedgerProduct.setApproveStatus(0);
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
- // 娣诲姞鐢熶骇鏁版嵁
- salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
+ // 娣诲姞鐢熶骇鏁版嵁锛屽苟澶勭悊鍐荤粨搴撳瓨
+ salesLedgerProductServiceImpl.processStockAndProduction(salesLedgerProduct);
}
}
@@ -539,6 +539,11 @@
.collect(Collectors.toList());
//鍒犻櫎鐢熶骇鏁版嵁
salesLedgerProductServiceImpl.deleteProductionData(productIds);
+
+ // 杩樺師鍐荤粨鐨勭墿鐞嗗簱瀛�
+ for (Long productId : productIds) {
+ salesLedgerProductServiceImpl.revertFrozenStock(productId);
+ }
// 鎵归噺鍒犻櫎浜у搧瀛愯〃
if (!productIds.isEmpty()) {
@@ -737,8 +742,8 @@
salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
- // 娣诲姞鐢熶骇鏁版嵁
- salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
+ // 娣诲姞鐢熶骇鏁版嵁锛屽苟澶勭悊鍐荤粨搴撳瓨
+ salesLedgerProductServiceImpl.processStockAndProduction(salesLedgerProduct);
}
}
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index c9651a7..97f1105 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -15,14 +15,19 @@
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.SalesLedgerProductFrozen;
import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.service.ISalesLedgerProductFrozenService;
import com.ruoyi.sales.service.ShippingInfoService;
+import com.ruoyi.stock.mapper.StockInventoryMapper;
+import com.ruoyi.stock.pojo.StockInventory;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
@@ -45,6 +50,10 @@
private StockUtils stockUtils;
@Autowired
private CommonFileServiceImpl commonFileService;
+ @Autowired
+ private ISalesLedgerProductFrozenService salesLedgerProductFrozenService;
+ @Autowired
+ private StockInventoryMapper stockInventoryMapper;
@Autowired
private ApproveProcessServiceImpl approveProcessService;
@@ -67,6 +76,26 @@
//鎵ｅ噺搴撳瓨
if(!"宸插彂璐�".equals(byId.getStatus())){
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(byId.getSalesLedgerProductId());
+ // 鍚屾鎵ｅ噺鎴栭噴鏀惧喕缁撶殑搴撳瓨
+ SalesLedgerProductFrozen frozenRecord = salesLedgerProductFrozenService.getOne(new LambdaQueryWrapper<SalesLedgerProductFrozen>()
+ .eq(SalesLedgerProductFrozen::getSalesLedgerProductId, byId.getSalesLedgerProductId())
+ .last("limit 1"));
+ if (frozenRecord != null) {
+ java.math.BigDecimal frozenQty = frozenRecord.getFrozenQuantity();
+ if (frozenQty != null && frozenQty.compareTo(BigDecimal.ZERO) > 0) {
+ StockInventory stockInventory = stockInventoryMapper.selectOne(new LambdaQueryWrapper<StockInventory>()
+ .eq(StockInventory::getProductModelId, frozenRecord.getProductModelId())
+ .last("for update"));
+ if (stockInventory != null) {
+ BigDecimal currentLocked = stockInventory.getLockedQuantity() != null ? stockInventory.getLockedQuantity() : BigDecimal.ZERO;
+ stockInventory.setLockedQuantity(currentLocked.subtract(frozenQty));
+ stockInventoryMapper.updateById(stockInventory);
+ }
+ }
+ salesLedgerProductFrozenService.removeById(frozenRecord.getId());
+ }
+
+ // 鎵ｅ噺搴撳瓨
stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
}
byId.setExpressNumber(req.getExpressNumber());
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index 5cb6dda..86bc3ab 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -1,16 +1,18 @@
package com.ruoyi.stock.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.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.SalesLedgerProductFrozen;
+import com.ruoyi.sales.service.ISalesLedgerProductFrozenService;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockOutRecordDto;
@@ -46,6 +48,7 @@
private StockInRecordService stockInRecordService;
private StockOutRecordService stockOutRecordService;
private SalesLedgerProductMapper salesLedgerProductMapper;
+ private ISalesLedgerProductFrozenService salesLedgerProductFrozenService;
@Override
public IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
return stockInventoryMapper.pagestockInventory(page, stockInventoryDto);
@@ -201,10 +204,28 @@
@Override
public Boolean thawStock(StockInventoryDto stockInventoryDto) {
StockInventory stockInventory = stockInventoryMapper.selectById(stockInventoryDto.getId());
- if (stockInventory.getLockedQuantity().compareTo(stockInventoryDto.getLockedQuantity())<0) {
+ if (stockInventory.getLockedQuantity().compareTo(stockInventoryDto.getLockedQuantity()) < 0) {
throw new RuntimeException("瑙ｅ喕鏁伴噺涓嶈兘瓒呰繃鍐荤粨鏁伴噺");
}
- stockInventory.setLockedQuantity(stockInventory.getLockedQuantity().subtract(stockInventoryDto.getLockedQuantity()));
+
+ BigDecimal newLockedQty = stockInventory.getLockedQuantity().subtract(stockInventoryDto.getLockedQuantity());
+
+ // 涓嶈兘灏忎簬绯荤粺宸茬粦瀹氱殑鍐荤粨鏁伴噺
+ List<SalesLedgerProductFrozen> frozenList = salesLedgerProductFrozenService.list(new LambdaQueryWrapper<SalesLedgerProductFrozen>()
+ .eq(SalesLedgerProductFrozen::getProductModelId, stockInventory.getProductModelId()));
+ BigDecimal systemFrozenTotal = BigDecimal.ZERO;
+ if (frozenList != null) {
+ for (SalesLedgerProductFrozen frozen : frozenList) {
+ if (frozen.getFrozenQuantity() != null) {
+ systemFrozenTotal = systemFrozenTotal.add(frozen.getFrozenQuantity());
+ }
+ }
+ }
+ if (newLockedQty.compareTo(systemFrozenTotal) < 0) {
+ throw new RuntimeException("鎿嶄綔澶辫触锛屽綋鍓嶄骇鍝佽閿�鍞鍗曠‖鎬у喕缁撴暟閲忎负: " + systemFrozenTotal + "锛屽墿浣欒В鍐绘暟閲忎笉鑳戒綆浜庢鏁板��");
+ }
+
+ stockInventory.setLockedQuantity(newLockedQty);
return this.updateById(stockInventory);
}
}
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductFrozenMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductFrozenMapper.xml
new file mode 100644
index 0000000..011a4b4
--- /dev/null
+++ b/src/main/resources/mapper/sales/SalesLedgerProductFrozenMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.sales.mapper.SalesLedgerProductFrozenMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.sales.pojo.SalesLedgerProductFrozen">
+ <id column="id" property="id" />
+ <result column="sales_ledger_product_id" property="salesLedgerProductId" />
+ <result column="product_model_id" property="productModelId" />
+ <result column="frozen_quantity" property="frozenQuantity" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 712124a..e0e22c3 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -8,12 +8,13 @@
SELECT
T1.*,
CASE
- WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >= IFNULL(T1.quantity, 0) THEN 1
+ WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0) + IFNULL(t3.frozen_quantity, 0)) >= IFNULL(T1.quantity, 0) THEN 1
ELSE 0
END as has_sufficient_stock
FROM
sales_ledger_product T1
LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_id
+ LEFT JOIN sales_ledger_product_frozen t3 ON T1.id = t3.sales_ledger_product_id
<where>
<if test="salesLedgerProduct.salesLedgerId != null">
AND T1.sales_ledger_id = #{salesLedgerProduct.salesLedgerId}
--
Gitblit v1.9.3