Commit 3f67152a by 胡懿

修复入库单和台账统计中的货架,仓库合并问题

parent da2590cb
...@@ -70,7 +70,7 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> { ...@@ -70,7 +70,7 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> {
int num = 0; int num = 0;
BigDecimal sum = new BigDecimal(0); BigDecimal sum = new BigDecimal(0);
for (int i = 0; i < list.size(); i ++) { for (int i = 0; i < list.size(); i ++) {
CountLedgerInfo c = list.get(0); CountLedgerInfo c = list.get(i);
if (i == 0) { if (i == 0) {
cli.setBatchNum(c.getBatchNum()); cli.setBatchNum(c.getBatchNum());
cli.setModel(c.getModel()); cli.setModel(c.getModel());
......
...@@ -28,10 +28,12 @@ public class ShelvesUtil { ...@@ -28,10 +28,12 @@ public class ShelvesUtil {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i =0; i < wList.size(); i ++) { for (int i =0; i < wList.size(); i ++) {
if (0 != wList.size()) { if (0 != wList.size()) {
sb.append(wList.get(0)); sb.append(wList.get(i));
if (i != wList.size() - 1) {
sb.append(","); sb.append(",");
}
} else { } else {
sb.append(wList.get(0)); sb.append(wList.get(i));
} }
} }
return sb.toString(); return sb.toString();
......
...@@ -83,7 +83,7 @@ public class StorageService extends CrudService<StorageMapper, Storage> { ...@@ -83,7 +83,7 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
int num = 0; int num = 0;
BigDecimal sum = new BigDecimal(0); BigDecimal sum = new BigDecimal(0);
for (int i = 0; i < list.size(); i ++) { for (int i = 0; i < list.size(); i ++) {
CountStorageInfo c = list.get(0); CountStorageInfo c = list.get(i);
if (i == 0) { if (i == 0) {
csi.setGoodsInfo(c.getGoodsInfo()); csi.setGoodsInfo(c.getGoodsInfo());
csi.setModel(c.getModel()); csi.setModel(c.getModel());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment