houjie
2023-09-04 a1f67e8727f7af3b3b472446616ab6c591caaebc
备件库存
已修改3个文件
44 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java
@@ -56,6 +56,7 @@
    private IConstructorService constructorService;
    @Autowired
    private IUnitService unitService;
    /**
     * 分页列表查询
     *
@@ -233,31 +234,39 @@
                for (int i = 0; i < list.size(); i++) {
                    SparePart sparePart = list.get(i);
                    String constructorName=sparePart.getConstructorId();
                    String constructorName = sparePart.getConstructorId();
                    String mainUnitName = sparePart.getMainUnitId();
                    String validityPeriodUnitName= sparePart.getValidityPeriodUnitId();
                    Constructor  constructor = constructorService.getByName(constructorName);
                    String validityPeriodUnitName = sparePart.getValidityPeriodUnitId();
                    Constructor constructor = constructorService.getByName(constructorName);
                    Unit unit = unitService.getUnitByName(mainUnitName);
                    Unit validityPeriodUnit = unitService.getUnitByName(validityPeriodUnitName);
                    if (!StringUtils.isNotEmpty(validityPeriodUnit.getId()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行有效期单位不存在");
                    if (!StringUtils.isNotEmpty(constructor.getId()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行制造商不存在");
                    if (!StringUtils.isNotEmpty(unit.getId()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行单位不存在");
                    if (unit != null) {
                        if (!StringUtils.isNotEmpty(validityPeriodUnit.getId()))
                            return Result.error("文件导入失败: 第" + (i + 1) + "行有效期单位不存在");
                        list.get(i).setValidityPeriodUnitId(validityPeriodUnit.getId());
                    }
                    if (constructor != null) {
                        if (!StringUtils.isNotEmpty(constructor.getId()))
                            return Result.error("文件导入失败: 第" + (i + 1) + "行制造商不存在");
                        list.get(i).setConstructorId(constructor.getId());
                    }
                    if (unit != null) {
                        if (!StringUtils.isNotEmpty(unit.getId()))
                            return Result.error("文件导入失败: 第" + (i + 1) + "行单位不存在");
                        list.get(i).setMainUnitId(unit.getId());
                    }
                    if (!StringUtils.isNotEmpty(sparePart.getName()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行备件名称不能为空");
                    if (!StringUtils.isNotEmpty(sparePart.getNum()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行备件编码不能为空");
                    if (!StringUtils.isNotEmpty(sparePart.getSpecification()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行备件规格不能为空");
                    if (!StringUtils.isNotEmpty(sparePart.getModel()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行备件型号不能为空");
                    list.get(i).setConstructorId(constructor.getId());
                    list.get(i).setMainUnitId(unit.getId());
                    list.get(i).setValidityPeriodUnitId(validityPeriodUnit.getId());
                }
                sparePartService.saveBatch(list);
                log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
                return Result.OK("文件导入成功!数据行数:" + list.size());
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java
@@ -218,6 +218,7 @@
                    String warehouseName = list.get(i).getWarehouseId();
                    String warehouseAreaName = list.get(i).getWarehouseAreaId();
                    String warehouseLocationName = list.get(i).getWarehouseLocationId();
                    String  num =list.get(i).getValidityForecast();
                    if (supplierName != null) {
                        supplier = supplierService.getByName(supplierName);
@@ -233,9 +234,7 @@
                    }
                    if (warehouseLocationName != null) {
                        warehouseLocation = warehouseLocationService.getByName(warehouseLocationName);
                    }
                    if (!StringUtils.isNotEmpty(list.get(i).getBatchNum()))
                        return Result.error("文件导入失败: 第" + (i + 1) + "行批次号不能为空");
                    if (list.get(i).getMainQuantity() <= 0)
@@ -268,7 +267,7 @@
                            return Result.error("文件导入失败: 第" + (i + 1) + "行库位不存在");
                        list.get(i).setWarehouseLocationId(warehouseLocation.getId());
                    }
                        list.get(i).setValidityForecast(num);
                }
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
@@ -102,8 +102,8 @@
    /**
     * 出厂日期
     */
    @Excel(name = "出厂日期", width = 15)
    **/
    @Excel(name = "出厂日期", width = 15,format = "yyyy-MM-dd")
    @ApiModelProperty(value = "出厂日期")
    private java.util.Date manufactureDate;