From 66e910032e4ef806749d958fa15cf3368d411ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 10 四月 2026 10:17:27 +0800
Subject: [PATCH] 仓库字段调整 导入调整
---
src/main/java/com/ruoyi/stock/pojo/StockInventory.java | 5 ++++-
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 1 +
src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java | 6 ++++++
src/main/resources/mapper/stock/StockInventoryMapper.xml | 11 +++++++++++
src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java | 9 ++++++++-
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 5 ++++-
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 2 +-
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 8 ++++++--
8 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
index c8c838a..52ad665 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
@@ -15,10 +15,17 @@
@Data
public class ProductModelExportDto {
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
+
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
- @Excel(name = "鍗曚綅")
+ @Excel(name = "涓诲崟浣�")
private String unit;
+
+ @Excel(name = "杈呭崟浣�")
+ private String subUnit;
+
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 069b665..9a39ec1 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -39,9 +39,12 @@
/**
* 鍗曚綅
*/
- @Excel(name = "鍗曚綅")
+ @Excel(name = "涓诲崟浣�")
private String unit;
+ @Excel(name = "杈呭崟浣�")
+ private String subUnit;
+
/**
* 鐢熶骇鐐掓満
*/
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 70f638e..cf532b7 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -57,7 +57,7 @@
@ApiOperation("鎵ｅ噺搴撳瓨")
public R subtractStockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
stockInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
- stockInventoryDto.setRecordId(0L);
+ stockInventoryDto.setRecordId(stockInventoryDto.getId());
return R.ok(stockInventoryService.subtractStockInventory(stockInventoryDto));
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index fc07569..4c185e2 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -14,6 +14,7 @@
private String productName;
private String model;
private String unit;
+ private String subUnit;
//鍏ュ簱绫诲瀷
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index 08bf4f2..06efa6f 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -25,8 +25,14 @@
@Excel(name = "涓诲崟浣�")
private String unit;
+ @Excel(name = "杈呭崟浣�")
+ private String subUnit;
+
@Excel(name = "鏁伴噺(涓诲崟浣�)")
private BigDecimal qualitity;
+
+ @Excel(name = "鏁伴噺(杈呭崟浣�)")
+ private BigDecimal subQualitity;
//
// @Excel(name = "鏈�鏂版洿鏂版椂闂�")
// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
index 22aca12..c831830 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
@@ -38,9 +38,12 @@
@NotBlank(message = "涓嶈兘涓虹┖")
private Long productModelId;
- @ApiModelProperty("鏁伴噺")
+ @ApiModelProperty("鏁伴噺(涓诲崟浣�)")
private BigDecimal qualitity;
+ @ApiModelProperty("鏁伴噺(杈呭崟浣�)")
+ private BigDecimal subQualitity;
+
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
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 aa83ce8..2881e4c 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -65,7 +65,7 @@
stockInRecordService.add(stockInRecordDto);
//鍐嶈繘琛屾柊澧炲簱瀛樻暟閲忓簱瀛�
//鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪锛屼笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂� 闃冲厜褰╁嵃娣诲姞浠撳簱缂栫爜锛� 娣诲姞姣斿浠撳簱
- StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()).eq(StockInventory::getWarehouseCode,stockInventoryDto.getWarehouseCode()));
+ StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
if (ObjectUtils.isEmpty(oldStockInventory)) {
StockInventory newStockInventory = new StockInventory();
newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
@@ -96,7 +96,7 @@
stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
stockOutRecordDto.setType("0");
stockOutRecordService.add(stockOutRecordDto);
- StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
+ StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()).eq(StockInventory::getProductCode,stockInventoryDto.getProductCode()));
if (ObjectUtils.isEmpty(oldStockInventory)) {
throw new RuntimeException("浜у搧搴撳瓨涓嶅瓨鍦�");
}
@@ -127,6 +127,9 @@
list.forEach(dto -> {
boolean matched = false;
for (SalesLedgerProduct item : salesLedgerProducts) {
+ if (ObjectUtils.isEmpty(dto.getWarehouseCode())) {
+ return;
+ }
if (item.getProductCategory().equals(dto.getProductName()) &&
item.getSpecificationModel().equals(dto.getModel())) {
StockInventoryDto stockInventoryDto = new StockInventoryDto();
@@ -136,6 +139,7 @@
stockInventoryDto.setRecordId(0L);
stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode());
stockInventoryDto.setQualitity(dto.getQualitity());
+ stockInventoryDto.setSubQualitity(dto.getSubQualitity());
stockInventoryDto.setProductModelId(item.getProductModelId());
this.addstockInventory(stockInventoryDto);
matched = true;
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index a9d431f..e98f910 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -31,6 +31,15 @@
<if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
locked_quantity = locked_quantity + #{ew.lockedQuantity},
</if>
+ <if test="ew.warehouseCode != null and ew.warehouseCode !=''">
+ warehouse_code = #{ew.warehouseCode},
+ </if>
+ <if test="ew.warehouseName != null and ew.warehouseName !=''">
+ warehouse_name = #{ew.warehouseName},
+ </if>
+ <if test="ew.productCode != null and ew.productCode !=''">
+ product_code = #{ew.productCode},
+ </if>
update_time = now()
</set>
where product_model_id = #{ew.productModelId}
@@ -73,6 +82,7 @@
)
select si.id,
si.qualitity,
+ si.sub_qualitity,
COALESCE(si.locked_quantity, 0) as locked_quantity,
si.product_model_id,
si.create_time,
@@ -86,6 +96,7 @@
si.warehouse_name,
si.product_code,
pm.unit,
+ pm.sub_unit,
p.product_name
from stock_inventory si
left join product_model pm on si.product_model_id = pm.id
--
Gitblit v1.9.3