企业卡
This commit is contained in:
@@ -326,19 +326,25 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
|
|||||||
goodsVo.setLNum(0);
|
goodsVo.setLNum(0);
|
||||||
goodsVos.add(goodsVo);
|
goodsVos.add(goodsVo);
|
||||||
} else {
|
} else {
|
||||||
if (null != goods) {
|
if (null != goods && null != goods1) {
|
||||||
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
if ((goods.getGoodsNumber()+goods1.getGoodsNumber()) != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goods1.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goods1.getGoodsNumber());
|
||||||
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
|
goodsVo.setSelect(0);
|
||||||
|
}
|
||||||
|
} 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);
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
goodsVo.setLNum(s.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber());
|
||||||
// goodsVo.setSelect(s.getGoodsNumber());
|
|
||||||
goodsVo.setSelect(0);
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
// goodsVo.setLNum(s.getGoodsNumber());
|
|
||||||
// goodsVo.setSelect(s.getGoodsNumber());
|
|
||||||
goodsVos.add(goodsVo);
|
goodsVos.add(goodsVo);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user