From 5cbfd0b2270edf6390cc1bb7c683956dbe93d66f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 23 三月 2026 11:08:28 +0800
Subject: [PATCH] feat:耗材物料更改（字段变动）
---
src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml | 3 ++-
src/main/java/com/ruoyi/consumables/pojo/ConsumablesInventory.java | 3 +++
src/main/resources/mapper/consumables/ConsumablesInRecordMapper.xml | 1 +
src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java | 3 +++
src/main/java/com/ruoyi/consumables/dto/ConsumablesOutRecordDto.java | 5 +++++
src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java | 3 +++
src/main/java/com/ruoyi/consumables/dto/ConsumablesInRecordDto.java | 3 +++
src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInventoryServiceImpl.java | 31 +++++++------------------------
src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml | 1 +
9 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/dto/ConsumablesInRecordDto.java b/src/main/java/com/ruoyi/consumables/dto/ConsumablesInRecordDto.java
index 77b36c9..05d3280 100644
--- a/src/main/java/com/ruoyi/consumables/dto/ConsumablesInRecordDto.java
+++ b/src/main/java/com/ruoyi/consumables/dto/ConsumablesInRecordDto.java
@@ -35,4 +35,7 @@
//鐜板噣閲�
private BigDecimal currentWeight;
+
+ //鏁伴噺
+ private BigDecimal qualitity;
}
diff --git a/src/main/java/com/ruoyi/consumables/dto/ConsumablesOutRecordDto.java b/src/main/java/com/ruoyi/consumables/dto/ConsumablesOutRecordDto.java
index 13781ea..3bed963 100644
--- a/src/main/java/com/ruoyi/consumables/dto/ConsumablesOutRecordDto.java
+++ b/src/main/java/com/ruoyi/consumables/dto/ConsumablesOutRecordDto.java
@@ -5,6 +5,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
+
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -25,4 +27,7 @@
private String timeStr;
private String createBy;
+
+ //鏁伴噺
+ private BigDecimal qualitity;
}
diff --git a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java
index d970419..014c762 100644
--- a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java
+++ b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java
@@ -100,4 +100,7 @@
@ApiModelProperty("浜у搧id")
private Long productId;
+
+ @ApiModelProperty("閲囪喘鍛�")
+ private String purchaser;
}
diff --git a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInventory.java b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInventory.java
index de3255c..60573a9 100644
--- a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInventory.java
+++ b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInventory.java
@@ -66,4 +66,7 @@
@ApiModelProperty("浜у搧id")
private Long productId;
+
+ @ApiModelProperty("閲囪喘鍛�")
+ private String purchaser;
}
diff --git a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java
index b3711ee..8f432d3 100644
--- a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java
+++ b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java
@@ -97,4 +97,7 @@
@ApiModelProperty("纾呭崟鏂囦欢璺緞")
private String weighbridgeDocPath;
+
+ @ApiModelProperty("閲囪喘鍛�")
+ private String purchaser;
}
diff --git a/src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInventoryServiceImpl.java b/src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInventoryServiceImpl.java
index b0ecb27..3b69ba0 100644
--- a/src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/consumables/service/impl/ConsumablesInventoryServiceImpl.java
@@ -19,10 +19,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.word.WeighbridgeDocGenerator;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -64,21 +62,12 @@
ConsumablesInRecordDto consumablesInRecordDto = new ConsumablesInRecordDto();
consumablesInRecordDto.setRecordId(consumablesInventoryDto.getRecordId());
consumablesInRecordDto.setRecordType(consumablesInventoryDto.getRecordType());
- consumablesInRecordDto.setStockInNum(consumablesInventoryDto.getNetWeight());
+ consumablesInRecordDto.setStockInNum(consumablesInventoryDto.getQualitity());
consumablesInRecordDto.setWeighingDate(consumablesInventoryDto.getWeighingDate());
- consumablesInRecordDto.setNetWeight(consumablesInventoryDto.getNetWeight());
- consumablesInRecordDto.setGrossWeight(consumablesInventoryDto.getGrossWeight());
- consumablesInRecordDto.setTareWeight(consumablesInventoryDto.getTareWeight());
- consumablesInRecordDto.setLicensePlateNo(consumablesInventoryDto.getLicensePlateNo());
- consumablesInRecordDto.setWeighingOperator(consumablesInventoryDto.getWeighingOperator());
consumablesInRecordDto.setProductModelId(consumablesInventoryDto.getProductModelId());
consumablesInRecordDto.setProductId(consumablesInventoryDto.getProductId());
+ consumablesInRecordDto.setPurchaser(consumablesInventoryDto.getPurchaser());
consumablesInRecordDto.setType("0");
- //鐢熸垚纾呭崟
- StockInRecordDto stockInRecordDto = new StockInRecordDto();
- BeanUtils.copyProperties(consumablesInventoryDto, stockInRecordDto);
- String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
- consumablesInRecordDto.setWeighbridgeDocPath(absoluteDocPath);
consumablesInRecordService.add(consumablesInRecordDto);
//鍐嶈繘琛屾柊澧炲簱瀛樻暟閲忓簱瀛�
//鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪锛屼笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂�
@@ -86,15 +75,16 @@
if (ObjectUtils.isEmpty(oldConsumablesInventory)) {
ConsumablesInventory newConsumablesInventory = new ConsumablesInventory();
newConsumablesInventory.setProductModelId(consumablesInventoryDto.getProductModelId());
- newConsumablesInventory.setQualitity(consumablesInventoryDto.getNetWeight());
+ newConsumablesInventory.setQualitity(consumablesInventoryDto.getQualitity());
newConsumablesInventory.setVersion(1);
newConsumablesInventory.setRemark(consumablesInventoryDto.getRemark());
newConsumablesInventory.setLockedQuantity(consumablesInventoryDto.getLockedQuantity());
newConsumablesInventory.setWarnNum(consumablesInventoryDto.getWarnNum());
newConsumablesInventory.setProductId(consumablesInventoryDto.getProductId());
+ newConsumablesInventory.setPurchaser(consumablesInventoryDto.getPurchaser());
consumablesInventoryMapper.insert(newConsumablesInventory);
} else {
- consumablesInventoryDto.setQualitity(consumablesInventoryDto.getNetWeight());
+ consumablesInventoryDto.setQualitity(consumablesInventoryDto.getQualitity());
consumablesInventoryMapper.updateAddConsumablesInventory(consumablesInventoryDto);
}
return true;
@@ -109,20 +99,13 @@
consumablesOutRecordDto.setRecordId(consumablesInventoryDto.getRecordId());
consumablesOutRecordDto.setRecordType(consumablesInventoryDto.getRecordType());
consumablesOutRecordDto.setWeighingDate(consumablesInventoryDto.getWeighingDate());
- consumablesOutRecordDto.setStockOutNum(consumablesInventoryDto.getNetWeight());
- consumablesOutRecordDto.setNetWeight(consumablesInventoryDto.getNetWeight());
- consumablesOutRecordDto.setGrossWeight(consumablesInventoryDto.getGrossWeight());
- consumablesOutRecordDto.setTareWeight(consumablesInventoryDto.getTareWeight());
+ consumablesOutRecordDto.setStockOutNum(consumablesInventoryDto.getQualitity());
consumablesOutRecordDto.setWeighingOperator(consumablesInventoryDto.getWeighingOperator());
consumablesOutRecordDto.setProductModelId(consumablesInventoryDto.getProductModelId());
consumablesOutRecordDto.setLicensePlateNo(consumablesInventoryDto.getLicensePlateNo());
consumablesOutRecordDto.setProductId(consumablesInventoryDto.getProductId());
+ consumablesOutRecordDto.setPurchaser(consumablesInventoryDto.getPurchaser());
consumablesOutRecordDto.setType("0");
- //鐢熸垚纾呭崟
- StockInRecordDto stockInRecordDto = new StockInRecordDto();
- BeanUtils.copyProperties(consumablesInventoryDto, stockInRecordDto);
- String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
- consumablesOutRecordDto.setWeighbridgeDocPath(absoluteDocPath);
consumablesOutRecordService.add(consumablesOutRecordDto);
ConsumablesInventory oldConsumablesInventory = consumablesInventoryMapper.selectOne(new QueryWrapper<ConsumablesInventory>().lambda().eq(ConsumablesInventory::getProductModelId, consumablesInventoryDto.getProductModelId()));
if (ObjectUtils.isEmpty(oldConsumablesInventory)) {
diff --git a/src/main/resources/mapper/consumables/ConsumablesInRecordMapper.xml b/src/main/resources/mapper/consumables/ConsumablesInRecordMapper.xml
index 3c6ff81..72e6f5a 100644
--- a/src/main/resources/mapper/consumables/ConsumablesInRecordMapper.xml
+++ b/src/main/resources/mapper/consumables/ConsumablesInRecordMapper.xml
@@ -5,6 +5,7 @@
<select id="listPage" resultType="com.ruoyi.consumables.dto.ConsumablesInRecordDto">
SELECT
sir.*,
+ sir.stock_in_num as qualitity,
p.product_name as product_name,
pm.model,
pm.unit,
diff --git a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
index 46c284b..ebc0712 100644
--- a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
+++ b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
@@ -43,7 +43,7 @@
update consumables_inventory
<set>
<if test="ew.netWeight != null">
- qualitity = qualitity - #{ew.netWeight},
+ qualitity = qualitity - #{ew.qualitity},
</if>
<if test="ew.version != null">
version = version + 1,
@@ -62,6 +62,7 @@
-- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
(COALESCE(sir.total_net_weight,0) - COALESCE(sor.total_net_weight,0)) as net_weight,
si.qualitity,
+ si.purchaser,
COALESCE(si.locked_quantity, 0) as locked_quantity,
si.product_model_id,
si.create_time,
diff --git a/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml b/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml
index 71648cd..d900460 100644
--- a/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml
+++ b/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml
@@ -22,6 +22,7 @@
SELECT
sor.*,
p.product_name as productName,
+ sor.stock_out_num as qualitity,
pm.model,
pm.unit,
sor.weighbridge_doc_path,
--
Gitblit v1.9.3