houjie
2023-09-04 87ac63c5001f2deb6a3132ab75088fd20b6a5653
备件库存/ 导入 判定修改
已修改2个文件
85 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java
@@ -206,54 +206,69 @@
                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();
                    String supplierName = sparesPartInventory.getSupplierId();
                    String warehouseName = sparesPartInventory.getWarehouseId();
                    String warehouseAreaName = sparesPartInventory.getWarehouseAreaId();
                    String warehouseLocationName = sparesPartInventory.getWarehouseLocationId();
                    Supplier supplier = null;
                    Unit unit = null;
                    Warehouse warehouse = null;
                    WarehouseArea warehouseArea = null;
                    WarehouseLocation warehouseLocation = null;
                    list.get(i).setSparePartId(mainId);
                    String mainUnitName = list.get(i).getMainUnitId();
                    String supplierName = list.get(i).getSupplierId();
                    String warehouseName = list.get(i).getWarehouseId();
                    String warehouseAreaName = list.get(i).getWarehouseAreaId();
                    String warehouseLocationName = list.get(i).getWarehouseLocationId();
                    if (supplierName != null) {
                        supplierId = supplierService.getByName(supplierName);
                        supplier = supplierService.getByName(supplierName);
                    }
                    if (mainUnitName != null) {
                        unitById = unitService.getUnitByName(mainUnitName);
                        unit = unitService.getUnitByName(mainUnitName);
                    }
                    if (warehouseName != null) {
                        warehouseId = warehouseService.getByName(warehouseName);
                        warehouse = warehouseService.getByName(warehouseName);
                    }
                    if (warehouseAreaName != null) {
                        warehouseAreaId = warehouseAreaService.getByName(warehouseAreaName);
                        warehouseArea = warehouseAreaService.getByName(warehouseAreaName);
                    }
                    if (warehouseLocationName != null) {
                        warehouseLocationId = warehouseLocationService.getByName(warehouseLocationName);
                        warehouseLocation = warehouseLocationService.getByName(warehouseLocationName);
                    }
                    if (!StringUtils.isNotEmpty(sparesPartInventory.getBatchNum()))
                    if (!StringUtils.isNotEmpty(list.get(i).getBatchNum()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行批次号不能为空");
                    if (sparesPartInventory.getMainQuantity() <= 0)
                    if (list.get(i).getMainQuantity() <= 0)
                        return Result.error("文件导入失败: 第" + (i + 1) + "行数量不能为小于等于0");
                    if (!StringUtils.isNotEmpty(unitById.getId()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行单位不存在");
                    if (!StringUtils.isNotEmpty(supplierId.getId()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行供应商不存在");
                    if (!StringUtils.isNotEmpty(warehouseId.getId()))
                        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) + "行库位不存在");*/
                    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 (unit != null) {
                        if (!StringUtils.isNotEmpty(unit.getId()))
                            return Result.error("文件导入失败: 第" + (i + 1) + "行单位不存在");
                        list.get(i).setMainUnitId(unit.getId());
                    }
                    if (supplier != null) {
                        if (!StringUtils.isNotEmpty(supplier.getId()))
                            return Result.error("文件导入失败: 第" + (i + 1) + "行供应商不存在");
                        list.get(i).setSupplierId(supplier.getId());
                    }
                    if (warehouse != null) {
                        if (!StringUtils.isNotEmpty(warehouse.getId()))
                            return Result.error("文件导入失败: 第" + (i + 1) + "行仓库不存在");
                        list.get(i).setWarehouseId(warehouse.getId());
                    }
                    if (warehouseArea != null) {
                        if (!StringUtils.isNotEmpty(warehouseArea.getId()))
                            return Result.error("文件导入失败: 第" + (i + 1) + "行库区不存在");
                        list.get(i).setWarehouseAreaId(warehouseArea.getId());
                    }
                    if (warehouseLocation != null) {
                        if (!StringUtils.isNotEmpty(warehouseLocation.getId()))
                            return Result.error("文件导入失败: 第" + (i + 1) + "行库位不存在");
                        list.get(i).setWarehouseLocationId(warehouseLocation.getId());
                    }
                }
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
@@ -75,7 +75,6 @@
    @Excel(name = "仓库", width = 15)
    @ApiModelProperty(value = "仓库id")
    @Dict(dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
    private java.lang.String warehouseId;
    @Excel(name = "库区", width = 15)
@@ -114,6 +113,7 @@
     */
    @Excel(name = "供应商", width = 15)
    @ApiModelProperty(value = "供应商id")
    @Dict(dictTable = "mom_base_supplier", dicCode = "id", dicText = "name")
    private String supplierId;