企业卡

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);
             }
         });