From a002e0d83ff1df9f2bb4900fd5739eda3abcd843 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 2 Jan 2024 16:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yyth/biz/empcard/EmpCardService.java  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
index 855c23b..fb174a5 100644
--- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
@@ -326,19 +326,25 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
                 goodsVo.setLNum(0);
                 goodsVos.add(goodsVo);
             } else {
-                if (null != goods) {
-                    if (goods.getGoodsNumber() != s.getGoodsNumber()) {
+                if (null != goods && null != goods1) {
+                    if ((goods.getGoodsNumber()+goods1.getGoodsNumber()) != s.getGoodsNumber()) {
                         goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goods1.getGoodsNumber());
-//                        goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
                         goodsVo.setSelect(0);
                     }
-                } else {
+                } else if(null != goods1){
+                    if (goods1.getGoodsNumber() != s.getGoodsNumber()) {
+                        goodsVo.setLNum(s.getGoodsNumber()- goods1.getGoodsNumber());
+                        goodsVo.setSelect(0);
+                    }
+                }else if(null != goods){
+                    if (goods.getGoodsNumber() != s.getGoodsNumber()) {
+                        goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
+                        goodsVo.setSelect(0);
+                    }
+                }else{
                     goodsVo.setLNum(s.getGoodsNumber());
-//                    goodsVo.setSelect(s.getGoodsNumber());
                     goodsVo.setSelect(0);
                 }
-//                goodsVo.setLNum(s.getGoodsNumber());
-//                goodsVo.setSelect(s.getGoodsNumber());
                 goodsVos.add(goodsVo);
             }
         });