| Line 1058... |
Line 1058... |
| 1058 |
//System.out.println(fofoIdImeiReturnMap.entrySet().stream().flatMap(x -> x.getValue().stream()).collect(Collectors.toList()).size());
|
1058 |
//System.out.println(fofoIdImeiReturnMap.entrySet().stream().flatMap(x -> x.getValue().stream()).collect(Collectors.toList()).size());
|
| 1059 |
|
1059 |
|
| 1060 |
List<String> serialNumbers = fofoIdImeiReturnMap.entrySet().stream().flatMap(x -> x.getValue().stream()).collect(Collectors.toList());
|
1060 |
List<String> serialNumbers = fofoIdImeiReturnMap.entrySet().stream().flatMap(x -> x.getValue().stream()).collect(Collectors.toList());
|
| 1061 |
List<WarehouseInventoryItem> warehouseInventoryItems = warehouseInventoryItemRepository.selectWarehouseInventoryItemBySerailNumbers(serialNumbers);
|
1061 |
List<WarehouseInventoryItem> warehouseInventoryItems = warehouseInventoryItemRepository.selectWarehouseInventoryItemBySerailNumbers(serialNumbers);
|
| 1062 |
for (WarehouseInventoryItem warehouseInventoryItem : warehouseInventoryItems) {
|
1062 |
for (WarehouseInventoryItem warehouseInventoryItem : warehouseInventoryItems) {
|
| 1063 |
if (warehouseInventoryItem.getCurrentQuantity() - warehouseInventoryItem.getInitialQuantity() > 0) {
|
1063 |
if (warehouseInventoryItem.getCurrentQuantity() - warehouseInventoryItem.getInitialQuantity() >= 0) {
|
| 1064 |
int diff = warehouseInventoryItem.getCurrentQuantity() - warehouseInventoryItem.getInitialQuantity();
|
1064 |
int diff = 1 + warehouseInventoryItem.getCurrentQuantity() - warehouseInventoryItem.getInitialQuantity();
|
| 1065 |
System.out.println(warehouseInventoryItem.getId() + " --- " + diff);
|
1065 |
System.out.println(warehouseInventoryItem.getId() + " --- " + diff);
|
| 1066 |
List<WarehouseScan> warehouseScans = warehouseScanRepository.selectAllByInventoryItemIds(Arrays.asList(warehouseInventoryItem.getId()));
|
1066 |
List<WarehouseScan> warehouseScans = warehouseScanRepository.selectAllByInventoryItemIds(Arrays.asList(warehouseInventoryItem.getId()));
|
| 1067 |
WarehouseScan previousSaleScan = warehouseScans.stream().filter(x->x.getType().equals(in.shop2020.warehouse.ScanType.SALE)).sorted(Comparator.comparingInt(WarehouseScan::getOrderId).reversed()).skip(1).findFirst().get();
|
1067 |
WarehouseScan previousSaleScan = warehouseScans.stream().filter(x->x.getType().equals(in.shop2020.warehouse.ScanType.SALE)).sorted(Comparator.comparingInt(WarehouseScan::getOrderId).reversed()).skip(1).findFirst().get();
|
| 1068 |
List<WarehouseScan> scansToDelete = warehouseScans.stream().filter(x -> x.getType().equals(in.shop2020.warehouse.ScanType.SALE_RET) && x.getSupplierWarehouseId()==0).skip(1).collect(Collectors.toList());
|
1068 |
List<WarehouseScan> scansToDelete = warehouseScans.stream().filter(x -> x.getType().equals(in.shop2020.warehouse.ScanType.SALE_RET) && x.getSupplierWarehouseId()==0).skip(1).collect(Collectors.toList());
|
| 1069 |
if(scansToDelete.size() > 0) {
|
1069 |
if(scansToDelete.size() > 0) {
|