From 946896c1cf0c81befeae145bb363e1a250defc0d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 20 六月 2025 17:38:40 +0800
Subject: [PATCH] 煤种都存id
---
main-business/src/main/java/com/ruoyi/business/entity/ProductionInventory.java | 6 +-----
main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java | 1 -
main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java | 5 -----
main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java | 5 -----
main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java | 1 -
5 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java b/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
index daf440b..f4210cc 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
@@ -43,11 +43,6 @@
@TableField(value = "coal_id")
private Long coalId;
/**
- * 鐓ょ
- */
- @TableField(value = "coal")
- private String coal;
- /**
* 鍗曚綅
*/
@TableField(value = "unit")
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/ProductionInventory.java b/main-business/src/main/java/com/ruoyi/business/entity/ProductionInventory.java
index 678c1ab..4e8633d 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/ProductionInventory.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/ProductionInventory.java
@@ -31,11 +31,7 @@
*/
@TableField(value = "coal_id")
private Long coalId;
- /**
- * 鐓ょ
- */
- @TableField(value = "coal")
- private String coal;
+
/**
* 搴撳瓨鏁伴噺
*/
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java b/main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java
index d35f0f6..8925c3b 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java
@@ -28,11 +28,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- * 鐓ょ
- */
- @TableField(value = "coal")
- private String coal;
- /**
* 鐓ょid
*/
@TableField(value = "coal_id")
diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java
index 4d3b647..a10f889 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java
@@ -220,7 +220,6 @@
master.setLaborCost(totalLabor);
master.setEnergyConsumptionCost(totalEnergy);
master.setEquipmentDepreciation(totalDepreciation);
- master.setCoal(coalInfos.stream().map(CoalInfo::getCoal).collect(Collectors.joining(",")));
master.setCoalId(coalIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
return master;
diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java
index da11924..ed6177c 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java
@@ -88,7 +88,6 @@
// 閲囪喘鐧昏鎴愬姛锛屽悓姝ュ垱寤哄緟鍏ュ簱璁板綍
PendingInventory pendingInventory = createPendingInventory(purchaseRegistration);
pendingInventory.setSupplierName(supply.getSupplierName());
- pendingInventory.setCoal(coalInfo.getCoal());
return pendingInventoryMapper.insert(pendingInventory);
}
return insertCount;
--
Gitblit v1.9.3