设备台账字段增加查询条件增加

“linengliang”

2023-09-06 8b825a12d64065dd9d8054e5247e374f6cec5390

设备台账字段增加查询条件增加

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

@@ -577,6 +577,22 @@
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备技术缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getFactoryModelId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:车间缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getWorkCenterId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:产线缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
                     else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyStart())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:质保开始日期缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
                     else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyEnd())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:质保结束日期缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getKeyEquipmentIdentification())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:关键设备标识缺失,请填写必填项后再导入;";
                         exceptionNum++;
@@ -671,6 +687,10 @@
                                     .setSourceCountry(equipmentImportVo.getSourceCountry())
                                     .setModel(equipmentImportVo.getModel())
                                     .setSpecification(equipmentImportVo.getSpecification())
                                     .setFactoryModelId(equipmentImportVo.getFactoryModelId())
                                     .setWorkCenterId(equipmentImportVo.getWorkCenterId())
                                     .setWarrantyStart(equipmentImportVo.getWarrantyStart())
                                     .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
                                     .setGpo(equipmentImportVo.getGpo());
                             equipmentService.save(equipment);
                         }else {

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

@@ -137,7 +137,7 @@
        return Result.OK("添加成功！");
    }
     @PostMapping(value = "/addInit")
     @Transactional(rollbackFor = { Exception.class })

     public Result<String> addInit(@RequestBody List<MaintenanceOrderActualMaterial> initList){
        boolean b = maintenanceOrderActualMaterialService.saveOrUpdateBatch(initList);
        if(b){

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java

@@ -297,5 +297,20 @@
    private List<EquipmentProcessParameters> processEditTableList;
    @TableField(exist = false)
    private List<EquipmentPrecisionParameters> precisionEditTableList;
    @Dict(dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name")
    @Excel(width = 15,dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name",orderNum = "39", name = "车间")
    private String factoryModelId;
    @Excel(width = 15,dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "产线",orderNum = "40")
    @Dict(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name")
    private String workCenterId;
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @Excel(name = "质保开始日期", width = 15,orderNum = "37",format = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date warrantyStart;
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @Excel(name = "质保结束日期", width = 15,orderNum = "38",format = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date warrantyEnd;


}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java

@@ -2,9 +2,11 @@

import lombok.Data;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @author lnl
@@ -111,6 +113,18 @@
    @Excel(name = "技术状态",dicCode = "technology_status")
    private String technologyStatus;

    @Excel(dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name", name = "车间")
    private String factoryModelId;

    @Excel(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "产线")
    private String workCenterId;

    @Excel(name = "质保开始日期",format = "yyyyMMdd")
    private Date warrantyStart;

    @Excel(name = "质保结束日期",format = "yyyyMMdd")
    private Date warrantyEnd;