12/21
This commit is contained in:
@@ -293,11 +293,13 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
|
|||||||
if (null != goods) {
|
if (null != goods) {
|
||||||
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
||||||
goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
|
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
|
||||||
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
goodsVo.setLNum(s.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber());
|
||||||
goodsVo.setSelect(s.getGoodsNumber());
|
// goodsVo.setSelect(s.getGoodsNumber());
|
||||||
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
// goodsVo.setLNum(s.getGoodsNumber());
|
// goodsVo.setLNum(s.getGoodsNumber());
|
||||||
// goodsVo.setSelect(s.getGoodsNumber());
|
// goodsVo.setSelect(s.getGoodsNumber());
|
||||||
|
|||||||
@@ -207,11 +207,13 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
|
|||||||
if (null != goods) {
|
if (null != goods) {
|
||||||
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
||||||
goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
|
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
|
||||||
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
goodsVo.setLNum(s.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber());
|
||||||
goodsVo.setSelect(s.getGoodsNumber());
|
// goodsVo.setSelect(s.getGoodsNumber());
|
||||||
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
goodsVos.add(goodsVo);
|
goodsVos.add(goodsVo);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -182,11 +182,13 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
if (null != goods) {
|
if (null != goods) {
|
||||||
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
||||||
goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
|
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
|
||||||
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
goodsVo.setLNum(s.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber());
|
||||||
goodsVo.setSelect(s.getGoodsNumber());
|
// goodsVo.setSelect(s.getGoodsNumber());
|
||||||
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
goodsVos.add(goodsVo);
|
goodsVos.add(goodsVo);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user