库存: 仓库版本控制

houjie

2023-09-01 25bea9b16d66e9ae716997601d01319db55e258b

 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java

@@ -206,6 +206,11 @@
                List<SparesPartInventory> list = ExcelImportUtil.importExcel(file.getInputStream(), SparesPartInventory.class, params);
                long start = System.currentTimeMillis();
                for (int i = 0; i < list.size(); i++) {
                    Supplier supplierId = null;
                    Unit unitById = null;
                    Warehouse warehouseId = null;
                    WarehouseArea warehouseAreaId = null;
                    WarehouseLocation warehouseLocationId = null;
                    SparesPartInventory sparesPartInventory = list.get(i);
                    sparesPartInventory.setSparePartId(mainId);
                    String mainUnitName = sparesPartInventory.getMainUnitId();
@@ -213,11 +218,27 @@
                    String warehouseName = sparesPartInventory.getWarehouseId();
                    String warehouseAreaName = sparesPartInventory.getWarehouseAreaId();
                    String warehouseLocationName = sparesPartInventory.getWarehouseLocationId();
                    Supplier supplierId = supplierService.getByName(supplierName);
                    Unit unitById = unitService.getUnitByName(mainUnitName);
                    Warehouse warehouseId = warehouseService.getByName(warehouseName);
                    WarehouseArea warehouseAreaId = warehouseAreaService.getByName(warehouseAreaName);
                    WarehouseLocation warehouseLocationId = warehouseLocationService.getByName(warehouseLocationName);

                    if (supplierName != null) {
                        supplierId = supplierService.getByName(supplierName);
                    }
                    if (mainUnitName != null) {
                        unitById = unitService.getUnitByName(mainUnitName);
                    }
                    if (warehouseName != null) {
                        warehouseId = warehouseService.getByName(warehouseName);
                    }
                    if (warehouseAreaName != null) {
                        warehouseAreaId = warehouseAreaService.getByName(warehouseAreaName);
                    }
                    if (warehouseLocationName != null) {
                        warehouseLocationId = warehouseLocationService.getByName(warehouseLocationName);
                    }

                    if (!StringUtils.isNotEmpty(sparesPartInventory.getBatchNum()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行批次号不能为空");
                    if (sparesPartInventory.getMainQuantity() <= 0)
                        return Result.error("文件导入失败: 第" + (i + 1) + "行数量不能为小于等于0");
                    if (!StringUtils.isNotEmpty(unitById.getId()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行单位不存在");
                    if (!StringUtils.isNotEmpty(supplierId.getId()))
@@ -226,17 +247,14 @@
                        return Result.error("文件导入失败: 第" + (i + 1) + "行仓库不存在");
                    if (!StringUtils.isNotEmpty(warehouseAreaId.getId()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行库区不存在");
                    if (!StringUtils.isNotEmpty(warehouseLocationId.getId()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行库位不存在");
                   /* if (!StringUtils.isNotEmpty(warehouseLocationId.getId()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行库位不存在");*/
                    list.get(i).setMainUnitId(unitById.getId());
                    list.get(i).setSupplierId(supplierId.getId());
                    list.get(i).setSupplierId(warehouseId.getId());
                    list.get(i).setSupplierId(warehouseAreaId.getId());
                    list.get(i).setSupplierId(warehouseLocationId.getId());
                    if (!StringUtils.isNotEmpty(sparesPartInventory.getBatchNum()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行批次号不能为空");
                    if (sparesPartInventory.getMainQuantity() <= 0)
                        return Result.error("文件导入失败: 第" + (i + 1) + "行数量不能为小于等于0");
                 /*   list.get(i).setSupplierId(warehouseLocationId.getId());*/

                }

                sparesPartInventoryService.saveBatch(list);