|
@@ -85,16 +85,16 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
|
|
for (int i = 1; i <= goodsVO.getNumber(); i++) {
|
|
for (int i = 1; i <= goodsVO.getNumber(); i++) {
|
|
GoodsNo goodsNo = new GoodsNo();
|
|
GoodsNo goodsNo = new GoodsNo();
|
|
goodsNo.setGoodsId(goods.getId());
|
|
goodsNo.setGoodsId(goods.getId());
|
|
- goodsNo.setModelNo(goodsPrefix.getPrefixStr() + String.format("%07d", i));
|
|
|
|
|
|
+ goodsNo.setModelNo(goodsPrefix.getPrefixStr() +"-"+ String.format("%07d", i));
|
|
list.add(goodsNo);
|
|
list.add(goodsNo);
|
|
}
|
|
}
|
|
goodsNoService.saveBatch(list);
|
|
goodsNoService.saveBatch(list);
|
|
} else {
|
|
} else {
|
|
- Integer start = Integer.parseInt(lastGoodsNo.getModelNo().substring(goodsPrefix.getPrefixStr().length()));
|
|
|
|
|
|
+ Integer start = Integer.parseInt(lastGoodsNo.getModelNo().substring(goodsPrefix.getPrefixStr().length()+1));
|
|
for (int i = 1; i <= goodsVO.getNumber(); i++) {
|
|
for (int i = 1; i <= goodsVO.getNumber(); i++) {
|
|
GoodsNo goodsNo = new GoodsNo();
|
|
GoodsNo goodsNo = new GoodsNo();
|
|
goodsNo.setGoodsId(goods.getId());
|
|
goodsNo.setGoodsId(goods.getId());
|
|
- goodsNo.setModelNo(goodsPrefix.getPrefixStr() + String.format("%07d", start + 1));
|
|
|
|
|
|
+ goodsNo.setModelNo(goodsPrefix.getPrefixStr() +"-"+ String.format("%07d", start + 1));
|
|
list.add(goodsNo);
|
|
list.add(goodsNo);
|
|
}
|
|
}
|
|
goodsNoService.saveBatch(list);
|
|
goodsNoService.saveBatch(list);
|
|
@@ -291,7 +291,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
|
|
goodsNoService.saveBatch(goodsNoList);
|
|
goodsNoService.saveBatch(goodsNoList);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- Integer start = Integer.parseInt(lastGoodsNo.getModelNo().substring(goodsPrefix.getPrefixStr().length()));
|
|
|
|
|
|
+ Integer start = Integer.parseInt(lastGoodsNo.getModelNo().substring(goodsPrefix.getPrefixStr().length()+1));
|
|
for (int i = 1; i <= count; i++) {
|
|
for (int i = 1; i <= count; i++) {
|
|
goodsNo.setGoodsId(goods.getId());
|
|
goodsNo.setGoodsId(goods.getId());
|
|
goodsNo.setModelNo(goodsPrefix.getPrefixStr() + String.format("%07d", start + 1));
|
|
goodsNo.setModelNo(goodsPrefix.getPrefixStr() + String.format("%07d", start + 1));
|