From 443df8faa38d9985f68bd205721881aae4266b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Sat, 3 Aug 2024 18:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TbConCheckServiceImpl.java     |  8 ++++----
 .../service/impl/TbConsInfoServiceImpl.java     | 17 ++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java
index a5c50c38..44236cb4 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java
@@ -66,9 +66,9 @@ public class TbConCheckServiceImpl implements TbConCheckService {
             throw new Exception("耗材信息不存在");
         }
 
-        BigDecimal stonum=consInfo.getStockNumber().subtract(consInfo.getStockConsume());
 
-        consInfo.setStockConsume(consInfo.getStockConsume().add(resources.getLpNum().negate()));
+        consInfo.setStockConsume(BigDecimal.ZERO);
+        consInfo.setStockNumber(resources.getStockNumber());
         consInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
         tbConsInfoRepository.save(consInfo);
 
@@ -77,8 +77,8 @@ public class TbConCheckServiceImpl implements TbConCheckService {
         conCheck.setConInfoId(consInfo.getId());
         conCheck.setConName(consInfo.getConName());
         conCheck.setPrice(consInfo.getPrice());
-        conCheck.setAcStockNumber(consInfo.getStockNumber().subtract(consInfo.getStockConsume()));
-        conCheck.setStockNumber(stonum);
+        conCheck.setAcStockNumber(resources.getStockNumber());
+        conCheck.setStockNumber(resources.getStockNumber());
         conCheck.setLpNum(resources.getLpNum());
         conCheck.setLpAmount(consInfo.getPrice().multiply(resources.getLpNum()));
         conCheck.setCreateTime(new Timestamp(System.currentTimeMillis()));
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 191c0188..c7ba1027 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
@@ -184,18 +184,17 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
         if (Objects.isNull(tbShopInfo)) {
             throw new Exception("店铺信息不存在");
         }
-        TbShopPurveyor purveyor = tbShopPurveyorRepository.getById(resources.getSupplierId());
+
+        TbShopPurveyor purveyor=null;
         TbProductStockOperate stockOperate = new TbProductStockOperate();
-        if (Objects.isNull(purveyor)) {
-            stockOperate.setPurveyorId(null);
-            stockOperate.setPurveyorName(null);
-        }else {
-            stockOperate.setPurveyorId(resources.getSupplierId().toString());
-            stockOperate.setPurveyorName(purveyor.getPurveyorName());
+        if(Objects.nonNull(resources.getSupplierId())){
+            purveyor = tbShopPurveyorRepository.getById(resources.getSupplierId());
+            if (Objects.nonNull(purveyor)) {
+                stockOperate.setPurveyorId(resources.getSupplierId().toString());
+                stockOperate.setPurveyorName(purveyor.getPurveyorName());
+            }
         }
 
-
-
         stockOperate.setShopId(tbShopInfo.getId().toString());
         stockOperate.setStockSnap("");
         stockOperate.setType(resources.getType().equals("in")?"cons_in":"cons_out");