From 2cced020e07a3424479a1d981e5502fb2594c3c0 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 21 Jun 2024 11:21:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE=E5=8D=95?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E5=A4=A7?=
 =?UTF-8?q?=E4=BA=8E=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/sms/apiadmin/SmsSalesBillRest.java | 13 ++++++++++++-
 .../sms/biz/smssalesbill/SmsSalesBillService.java   | 10 ++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java
index bd4918af2b..86fe3d0add 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java
@@ -42,6 +42,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.List;
 
@@ -118,7 +119,17 @@ public class SmsSalesBillRest {
     @PostMapping("/save")
     public ResultBean<String> save(@RequestBody SmsSalesBillDto dto) {
         ResultBean rb = ResultBean.fireFail();
-       String sid = smsSalesBillService.saveOrUpdateDto(dto);
+        List<SalesGoodsVo> goodsVos = dto.getGoodsVos();
+        if (!goodsVos.isEmpty()) {
+            for (SalesGoodsVo goodsVo : goodsVos) {
+                BigDecimal count = new BigDecimal(goodsVo.getCount());
+                BigDecimal currentCount = new BigDecimal(goodsVo.getCurrentCount());
+                if (count.compareTo(currentCount) > 0) {
+                    return rb.setMsg("商品数量不能大于库存数量");
+                }
+            }
+        }
+        String sid = smsSalesBillService.saveOrUpdateDto(dto);
         return rb.success().setData(sid);
     }
 
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
index acf881b4ee..c09f6a6b97 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
@@ -393,6 +393,16 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
 
     public ResultBean settlement(SmsSalesBillDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        List<SalesGoodsVo> goodsVos = dto.getGoodsVos();
+        if (!goodsVos.isEmpty()) {
+            for (SalesGoodsVo goodsVo : goodsVos) {
+                BigDecimal count = new BigDecimal(goodsVo.getCount());
+                BigDecimal currentCount = new BigDecimal(goodsVo.getCurrentCount());
+                if (count.compareTo(currentCount) > 0) {
+                    return rb.setMsg("商品数量不能大于库存数量");
+                }
+            }
+        }
         String sid = saveOrUpdateDto(dto);
         if (StringUtils.isNotBlank(sid)) {
             SettlementVo settlementVo = dto.getSettlementVo();