From 3e1ef9c5f2a5b4e39ffab05560ef6cddb7b1b668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Fri, 28 Jun 2024 09:44:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=97=E6=9D=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cons/service/impl/TbConsInfoServiceImpl.java       |  4 ----
 .../cons/service/impl/TbProskuConServiceImpl.java      | 10 +++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
index e17e1d3c..58d94720 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
@@ -74,7 +74,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
 
         resources.setConTypeName(tbConsType.getConTypeName());
         resources.setLasterInStock(BigDecimal.ZERO);
-        resources.setSurplusStock(BigDecimal.ZERO);
         resources.setStockNumber(BigDecimal.ZERO);
         resources.setCreateTime(new Timestamp(System.currentTimeMillis()));
         return tbConsInfoMapper.toDto(tbConsInfoRepository.save(resources));
@@ -85,8 +84,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
     public void update(TbConsInfo resources) {
         TbConsInfo tbConsInfo = tbConsInfoRepository.findById(resources.getId()).orElseGet(TbConsInfo::new);
         ValidationUtil.isNull( tbConsInfo.getId(),"TbConsInfo","id",resources.getId());
-
-        tbConsInfo.setSurplusStock(resources.getSurplusStock());
         tbConsInfoRepository.save(tbConsInfo);
     }
 
@@ -108,7 +105,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
             map.put("耗材名称", tbConsInfo.getConName());
             map.put("库存值", tbConsInfo.getStockNumber());
             map.put("单位值", tbConsInfo.getConUnit());
-            map.put("剩余库存", tbConsInfo.getSurplusStock());
             map.put("最近一次入库量", tbConsInfo.getLasterInStock());
             map.put("创建时间", tbConsInfo.getCreateTime());
             map.put("耗材预警值",tbConsInfo.getConWarning());
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
index 886a0f27..885b9eef 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.ysk.cashier.cons.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.ysk.cashier.cons.domain.TbProskuCon;
 import cn.ysk.cashier.utils.FileUtil;
 import cn.ysk.cashier.utils.PageUtil;
@@ -73,7 +74,14 @@ public class TbProskuConServiceImpl implements TbProskuConService {
     public void update(TbProskuCon resources) {
         TbProskuCon tbProskuCon = tbProskuConRepository.findById(resources.getId()).orElseGet(TbProskuCon::new);
         ValidationUtil.isNull( tbProskuCon.getId(),"TbProskuCon","id",resources.getId());
-        tbProskuCon.copy(resources);
+        if(ObjectUtil.isNotEmpty(resources.getStatus())){
+            tbProskuCon.setStatus("1");
+        }
+
+        if(ObjectUtil.isNotEmpty(resources.getSurplusStock())){
+            tbProskuCon.setSurplusStock(resources.getSurplusStock());
+        }
+
         tbProskuConRepository.save(tbProskuCon);
     }