Merge remote-tracking branch 'origin/0.8.X' into 0.8.X
This commit is contained in:
@@ -0,0 +1,99 @@
|
||||
package com.klp.mes.dv.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.mes.dv.domain.vo.DvSpecialEquipmentVo;
|
||||
import com.klp.mes.dv.domain.bo.DvSpecialEquipmentBo;
|
||||
import com.klp.mes.dv.service.IDvSpecialEquipmentService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-21
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/mes/specialEquipment")
|
||||
public class DvSpecialEquipmentController extends BaseController {
|
||||
|
||||
private final IDvSpecialEquipmentService iDvSpecialEquipmentService;
|
||||
|
||||
/**
|
||||
* 查询特种设备(包含锅炉、压力管道、电梯等特种设备信息)列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<DvSpecialEquipmentVo> list(DvSpecialEquipmentBo bo, PageQuery pageQuery) {
|
||||
return iDvSpecialEquipmentService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出特种设备(包含锅炉、压力管道、电梯等特种设备信息)列表
|
||||
*/
|
||||
@Log(title = "特种设备(包含锅炉、压力管道、电梯等特种设备信息)", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(DvSpecialEquipmentBo bo, HttpServletResponse response) {
|
||||
List<DvSpecialEquipmentVo> list = iDvSpecialEquipmentService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "特种设备(包含锅炉、压力管道、电梯等特种设备信息)", DvSpecialEquipmentVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取特种设备(包含锅炉、压力管道、电梯等特种设备信息)详细信息
|
||||
*
|
||||
* @param equipmentId 主键
|
||||
*/
|
||||
@GetMapping("/{equipmentId}")
|
||||
public R<DvSpecialEquipmentVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long equipmentId) {
|
||||
return R.ok(iDvSpecialEquipmentService.queryById(equipmentId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*/
|
||||
@Log(title = "特种设备(包含锅炉、压力管道、电梯等特种设备信息)", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody DvSpecialEquipmentBo bo) {
|
||||
return toAjax(iDvSpecialEquipmentService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*/
|
||||
@Log(title = "特种设备(包含锅炉、压力管道、电梯等特种设备信息)", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DvSpecialEquipmentBo bo) {
|
||||
return toAjax(iDvSpecialEquipmentService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*
|
||||
* @param equipmentIds 主键串
|
||||
*/
|
||||
@Log(title = "特种设备(包含锅炉、压力管道、电梯等特种设备信息)", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{equipmentIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] equipmentIds) {
|
||||
return toAjax(iDvSpecialEquipmentService.deleteWithValidByIds(Arrays.asList(equipmentIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
package com.klp.mes.dv.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 特种设备(包含锅炉、压力管道、电梯等特种设备信息)对象 dv_special_equipment
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-21
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("dv_special_equipment")
|
||||
public class DvSpecialEquipment extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 设备ID
|
||||
*/
|
||||
@TableId(value = "equipment_id")
|
||||
private Long equipmentId;
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
private String equipmentCode;
|
||||
/**
|
||||
* 设备名称(如:锅炉、压力容器、压力管道、电梯、起重机械等)
|
||||
*/
|
||||
private String equipmentName;
|
||||
/**
|
||||
* 规格型号
|
||||
*/
|
||||
private String specificationModel;
|
||||
/**
|
||||
* 制造单位
|
||||
*/
|
||||
private String manufacturer;
|
||||
/**
|
||||
* 制造日期
|
||||
*/
|
||||
private Date productionDate;
|
||||
/**
|
||||
* 安装日期
|
||||
*/
|
||||
private Date installationDate;
|
||||
/**
|
||||
* 投入使用日期
|
||||
*/
|
||||
private Date useStartDate;
|
||||
/**
|
||||
* 特种设备注册编号
|
||||
*/
|
||||
private String registrationNo;
|
||||
/**
|
||||
* 安全负责人
|
||||
*/
|
||||
private String safetyManager;
|
||||
/**
|
||||
* 附件路径(多个附件用逗号分隔)
|
||||
*/
|
||||
private String attachment;
|
||||
/**
|
||||
* 检验周期(月)
|
||||
*/
|
||||
private Long inspectionCycle;
|
||||
/**
|
||||
* 上次检验时间
|
||||
*/
|
||||
private Date lastInspectionTime;
|
||||
/**
|
||||
* 下次检验时间
|
||||
*/
|
||||
private Date nextInspectionTime;
|
||||
/**
|
||||
* 当前状态(在用、停用、报废等)
|
||||
*/
|
||||
private String currentStatus;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标志(0=正常,1=已删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
package com.klp.mes.dv.domain.bo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* 特种设备(包含锅炉、压力管道、电梯等特种设备信息)业务对象 dv_special_equipment
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-21
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class DvSpecialEquipmentBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 设备ID
|
||||
*/
|
||||
private Long equipmentId;
|
||||
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
private String equipmentCode;
|
||||
|
||||
/**
|
||||
* 设备名称(如:锅炉、压力容器、压力管道、电梯、起重机械等)
|
||||
*/
|
||||
private String equipmentName;
|
||||
|
||||
/**
|
||||
* 规格型号
|
||||
*/
|
||||
private String specificationModel;
|
||||
|
||||
/**
|
||||
* 制造单位
|
||||
*/
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 制造日期
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date productionDate;
|
||||
|
||||
/**
|
||||
* 安装日期
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date installationDate;
|
||||
|
||||
/**
|
||||
* 投入使用日期
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date useStartDate;
|
||||
|
||||
/**
|
||||
* 特种设备注册编号
|
||||
*/
|
||||
private String registrationNo;
|
||||
|
||||
/**
|
||||
* 安全负责人
|
||||
*/
|
||||
private String safetyManager;
|
||||
|
||||
/**
|
||||
* 附件路径(多个附件用逗号分隔)
|
||||
*/
|
||||
private String attachment;
|
||||
|
||||
/**
|
||||
* 检验周期(月)
|
||||
*/
|
||||
private Long inspectionCycle;
|
||||
|
||||
/**
|
||||
* 上次检验时间
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date lastInspectionTime;
|
||||
|
||||
/**
|
||||
* 下次检验时间
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date nextInspectionTime;
|
||||
|
||||
/**
|
||||
* 当前状态(在用、停用、报废等)
|
||||
*/
|
||||
private String currentStatus;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
package com.klp.mes.dv.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 特种设备(包含锅炉、压力管道、电梯等特种设备信息)视图对象 dv_special_equipment
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-21
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class DvSpecialEquipmentVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 设备ID
|
||||
*/
|
||||
@ExcelProperty(value = "设备ID")
|
||||
private Long equipmentId;
|
||||
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
@ExcelProperty(value = "设备编码")
|
||||
private String equipmentCode;
|
||||
|
||||
/**
|
||||
* 设备名称(如:锅炉、压力容器、压力管道、电梯、起重机械等)
|
||||
*/
|
||||
@ExcelProperty(value = "设备名称", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "如=:锅炉、压力容器、压力管道、电梯、起重机械等")
|
||||
private String equipmentName;
|
||||
|
||||
/**
|
||||
* 规格型号
|
||||
*/
|
||||
@ExcelProperty(value = "规格型号")
|
||||
private String specificationModel;
|
||||
|
||||
/**
|
||||
* 制造单位
|
||||
*/
|
||||
@ExcelProperty(value = "制造单位")
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 制造日期
|
||||
*/
|
||||
@ExcelProperty(value = "制造日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date productionDate;
|
||||
|
||||
/**
|
||||
* 安装日期
|
||||
*/
|
||||
@ExcelProperty(value = "安装日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date installationDate;
|
||||
|
||||
/**
|
||||
* 投入使用日期
|
||||
*/
|
||||
@ExcelProperty(value = "投入使用日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date useStartDate;
|
||||
|
||||
/**
|
||||
* 特种设备注册编号
|
||||
*/
|
||||
@ExcelProperty(value = "特种设备注册编号")
|
||||
private String registrationNo;
|
||||
|
||||
/**
|
||||
* 安全负责人
|
||||
*/
|
||||
@ExcelProperty(value = "安全负责人")
|
||||
private String safetyManager;
|
||||
|
||||
/**
|
||||
* 附件路径(多个附件用逗号分隔)
|
||||
*/
|
||||
@ExcelProperty(value = "附件路径", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "多=个附件用逗号分隔")
|
||||
private String attachment;
|
||||
|
||||
/**
|
||||
* 检验周期(月)
|
||||
*/
|
||||
@ExcelProperty(value = "检验周期", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "月=")
|
||||
private Long inspectionCycle;
|
||||
|
||||
/**
|
||||
* 上次检验时间
|
||||
*/
|
||||
@ExcelProperty(value = "上次检验时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date lastInspectionTime;
|
||||
|
||||
/**
|
||||
* 下次检验时间
|
||||
*/
|
||||
@ExcelProperty(value = "下次检验时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date nextInspectionTime;
|
||||
|
||||
/**
|
||||
* 当前状态(在用、停用、报废等)
|
||||
*/
|
||||
@ExcelProperty(value = "当前状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "在=用、停用、报废等")
|
||||
private String currentStatus;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.mes.dv.mapper;
|
||||
|
||||
import com.klp.mes.dv.domain.DvSpecialEquipment;
|
||||
import com.klp.mes.dv.domain.vo.DvSpecialEquipmentVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 特种设备(包含锅炉、压力管道、电梯等特种设备信息)Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-21
|
||||
*/
|
||||
public interface DvSpecialEquipmentMapper extends BaseMapperPlus<DvSpecialEquipmentMapper, DvSpecialEquipment, DvSpecialEquipmentVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.klp.mes.dv.service;
|
||||
|
||||
import com.klp.mes.dv.domain.vo.DvSpecialEquipmentVo;
|
||||
import com.klp.mes.dv.domain.bo.DvSpecialEquipmentBo;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 特种设备(包含锅炉、压力管道、电梯等特种设备信息)Service接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-21
|
||||
*/
|
||||
public interface IDvSpecialEquipmentService {
|
||||
|
||||
/**
|
||||
* 查询特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*/
|
||||
DvSpecialEquipmentVo queryById(Long equipmentId);
|
||||
|
||||
/**
|
||||
* 查询特种设备(包含锅炉、压力管道、电梯等特种设备信息)列表
|
||||
*/
|
||||
TableDataInfo<DvSpecialEquipmentVo> queryPageList(DvSpecialEquipmentBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询特种设备(包含锅炉、压力管道、电梯等特种设备信息)列表
|
||||
*/
|
||||
List<DvSpecialEquipmentVo> queryList(DvSpecialEquipmentBo bo);
|
||||
|
||||
/**
|
||||
* 新增特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*/
|
||||
Boolean insertByBo(DvSpecialEquipmentBo bo);
|
||||
|
||||
/**
|
||||
* 修改特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*/
|
||||
Boolean updateByBo(DvSpecialEquipmentBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除特种设备(包含锅炉、压力管道、电梯等特种设备信息)信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
package com.klp.mes.dv.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.mes.dv.domain.bo.DvSpecialEquipmentBo;
|
||||
import com.klp.mes.dv.domain.vo.DvSpecialEquipmentVo;
|
||||
import com.klp.mes.dv.domain.DvSpecialEquipment;
|
||||
import com.klp.mes.dv.mapper.DvSpecialEquipmentMapper;
|
||||
import com.klp.mes.dv.service.IDvSpecialEquipmentService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 特种设备(包含锅炉、压力管道、电梯等特种设备信息)Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-21
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class DvSpecialEquipmentServiceImpl implements IDvSpecialEquipmentService {
|
||||
|
||||
private final DvSpecialEquipmentMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*/
|
||||
@Override
|
||||
public DvSpecialEquipmentVo queryById(Long equipmentId){
|
||||
return baseMapper.selectVoById(equipmentId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询特种设备(包含锅炉、压力管道、电梯等特种设备信息)列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<DvSpecialEquipmentVo> queryPageList(DvSpecialEquipmentBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<DvSpecialEquipment> lqw = buildQueryWrapper(bo);
|
||||
Page<DvSpecialEquipmentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询特种设备(包含锅炉、压力管道、电梯等特种设备信息)列表
|
||||
*/
|
||||
@Override
|
||||
public List<DvSpecialEquipmentVo> queryList(DvSpecialEquipmentBo bo) {
|
||||
LambdaQueryWrapper<DvSpecialEquipment> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<DvSpecialEquipment> buildQueryWrapper(DvSpecialEquipmentBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<DvSpecialEquipment> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEquipmentCode()), DvSpecialEquipment::getEquipmentCode, bo.getEquipmentCode());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getEquipmentName()), DvSpecialEquipment::getEquipmentName, bo.getEquipmentName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSpecificationModel()), DvSpecialEquipment::getSpecificationModel, bo.getSpecificationModel());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), DvSpecialEquipment::getManufacturer, bo.getManufacturer());
|
||||
lqw.eq(bo.getProductionDate() != null, DvSpecialEquipment::getProductionDate, bo.getProductionDate());
|
||||
lqw.eq(bo.getInstallationDate() != null, DvSpecialEquipment::getInstallationDate, bo.getInstallationDate());
|
||||
lqw.eq(bo.getUseStartDate() != null, DvSpecialEquipment::getUseStartDate, bo.getUseStartDate());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getRegistrationNo()), DvSpecialEquipment::getRegistrationNo, bo.getRegistrationNo());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSafetyManager()), DvSpecialEquipment::getSafetyManager, bo.getSafetyManager());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), DvSpecialEquipment::getAttachment, bo.getAttachment());
|
||||
lqw.eq(bo.getInspectionCycle() != null, DvSpecialEquipment::getInspectionCycle, bo.getInspectionCycle());
|
||||
lqw.eq(bo.getLastInspectionTime() != null, DvSpecialEquipment::getLastInspectionTime, bo.getLastInspectionTime());
|
||||
lqw.eq(bo.getNextInspectionTime() != null, DvSpecialEquipment::getNextInspectionTime, bo.getNextInspectionTime());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCurrentStatus()), DvSpecialEquipment::getCurrentStatus, bo.getCurrentStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(DvSpecialEquipmentBo bo) {
|
||||
DvSpecialEquipment add = BeanUtil.toBean(bo, DvSpecialEquipment.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setEquipmentId(add.getEquipmentId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(DvSpecialEquipmentBo bo) {
|
||||
DvSpecialEquipment update = BeanUtil.toBean(bo, DvSpecialEquipment.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(DvSpecialEquipment entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除特种设备(包含锅炉、压力管道、电梯等特种设备信息)
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.klp.mes.dv.mapper.DvSpecialEquipmentMapper">
|
||||
|
||||
<resultMap type="com.klp.mes.dv.domain.DvSpecialEquipment" id="DvSpecialEquipmentResult">
|
||||
<result property="equipmentId" column="equipment_id"/>
|
||||
<result property="equipmentCode" column="equipment_code"/>
|
||||
<result property="equipmentName" column="equipment_name"/>
|
||||
<result property="specificationModel" column="specification_model"/>
|
||||
<result property="manufacturer" column="manufacturer"/>
|
||||
<result property="productionDate" column="production_date"/>
|
||||
<result property="installationDate" column="installation_date"/>
|
||||
<result property="useStartDate" column="use_start_date"/>
|
||||
<result property="registrationNo" column="registration_no"/>
|
||||
<result property="safetyManager" column="safety_manager"/>
|
||||
<result property="attachment" column="attachment"/>
|
||||
<result property="inspectionCycle" column="inspection_cycle"/>
|
||||
<result property="lastInspectionTime" column="last_inspection_time"/>
|
||||
<result property="nextInspectionTime" column="next_inspection_time"/>
|
||||
<result property="currentStatus" column="current_status"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -25,15 +25,15 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="制造单位" prop="manufacturer">
|
||||
<!-- <el-form-item label="制造单位" prop="manufacturer">
|
||||
<el-input
|
||||
v-model="queryParams.manufacturer"
|
||||
placeholder="请输入制造单位"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="制造日期" prop="productionDate">
|
||||
</el-form-item>-->
|
||||
<!-- <el-form-item label="制造日期" prop="productionDate">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.productionDate"
|
||||
type="date"
|
||||
@@ -48,7 +48,7 @@
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择安装日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<el-form-item label="使用日期" prop="useStartDate">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.useStartDate"
|
||||
@@ -57,15 +57,15 @@
|
||||
placeholder="请选择投入使用日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="注册编号" prop="registrationNo">
|
||||
<!-- <el-form-item label="注册编号" prop="registrationNo">
|
||||
<el-input
|
||||
v-model="queryParams.registrationNo"
|
||||
placeholder="请输入特种设备注册编号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="安全负责人" prop="safetyManager">
|
||||
</el-form-item>-->
|
||||
<el-form-item label="负责人" prop="safetyManager">
|
||||
<el-input
|
||||
v-model="queryParams.safetyManager"
|
||||
placeholder="请输入安全负责人"
|
||||
@@ -138,35 +138,35 @@
|
||||
<el-table-column label="设备名称" align="center" prop="equipmentName" />
|
||||
<el-table-column label="规格型号" align="center" prop="specificationModel" />
|
||||
<el-table-column label="制造单位" align="center" prop="manufacturer" />
|
||||
<el-table-column label="制造日期" align="center" prop="productionDate" width="180">
|
||||
<!-- <el-table-column label="制造日期" align="center" prop="productionDate" width="98">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="安装日期" align="center" prop="installationDate" width="180">
|
||||
<el-table-column label="安装日期" align="center" prop="installationDate" width="98">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.installationDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="投入使用日期" align="center" prop="useStartDate" width="180">
|
||||
</el-table-column>-->
|
||||
<el-table-column label="投入使用日期" align="center" prop="useStartDate" width="98">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.useStartDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="特种设备注册编号" align="center" prop="registrationNo" />
|
||||
<el-table-column label="注册编号" align="center" prop="registrationNo" />
|
||||
<el-table-column label="安全负责人" align="center" prop="safetyManager" />
|
||||
<el-table-column label="附件路径" align="center" prop="attachment" />
|
||||
<!-- <el-table-column label="附件路径" align="center" prop="attachment" />-->
|
||||
<el-table-column label="检验周期" align="center" prop="inspectionCycle" />
|
||||
<el-table-column label="上次检验时间" align="center" prop="lastInspectionTime" width="180">
|
||||
<el-table-column label="上次检验时间" align="center" prop="lastInspectionTime" width="98">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.lastInspectionTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="下次检验时间" align="center" prop="nextInspectionTime" width="180">
|
||||
<!-- <el-table-column label="下次检验时间" align="center" prop="nextInspectionTime" width="98">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.nextInspectionTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>-->
|
||||
<el-table-column label="当前状态" align="center" prop="currentStatus">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.special_equipment_type" :value="scope.row.currentStatus"/>
|
||||
@@ -200,7 +200,7 @@
|
||||
/>
|
||||
|
||||
<!-- 添加或修改特种设备(包含锅炉、压力管道、电梯等特种设备信息)对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="设备编码" prop="equipmentCode">
|
||||
<el-input v-model="form.equipmentCode" placeholder="请输入设备编码" />
|
||||
@@ -217,40 +217,37 @@
|
||||
<el-form-item label="制造日期" prop="productionDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.productionDate"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择制造日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="安装日期" prop="installationDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.installationDate"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择安装日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="投入使用日期" prop="useStartDate">
|
||||
<el-form-item label="使用日期" prop="useStartDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.useStartDate"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择投入使用日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="特种设备注册编号" prop="registrationNo">
|
||||
<el-form-item label="注册编号" prop="registrationNo">
|
||||
<el-input v-model="form.registrationNo" placeholder="请输入特种设备注册编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="安全负责人" prop="safetyManager">
|
||||
<el-input v-model="form.safetyManager" placeholder="请输入安全负责人" />
|
||||
</el-form-item>
|
||||
<el-form-item label="附件路径" prop="attachment">
|
||||
<el-input v-model="form.attachment" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
<el-form-item label="检验周期" prop="inspectionCycle">
|
||||
<el-input v-model="form.inspectionCycle" placeholder="请输入检验周期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="上次检验时间" prop="lastInspectionTime">
|
||||
<el-form-item label="负责人" prop="safetyManager">
|
||||
<el-input v-model="form.safetyManager" placeholder="请输入安全负责人" />
|
||||
</el-form-item>
|
||||
<el-form-item label="上次检验时间" prop="lastInspectionTime" label-width="107px">
|
||||
<el-date-picker clearable
|
||||
v-model="form.lastInspectionTime"
|
||||
type="datetime"
|
||||
@@ -258,7 +255,7 @@
|
||||
placeholder="请选择上次检验时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="下次检验时间" prop="nextInspectionTime">
|
||||
<el-form-item label="下次检验时间" prop="nextInspectionTime" label-width="107px">
|
||||
<el-date-picker clearable
|
||||
v-model="form.nextInspectionTime"
|
||||
type="datetime"
|
||||
@@ -266,6 +263,9 @@
|
||||
placeholder="请选择下次检验时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="attachment">
|
||||
<file-upload v-model="form.attachment" :limit="1" :fileType="fileType" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
<el-form-item label="当前状态" prop="currentStatus">
|
||||
<el-radio-group v-model="form.currentStatus">
|
||||
<el-radio
|
||||
@@ -412,7 +412,7 @@ export default {
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加特种设备(包含锅炉、压力管道、电梯等特种设备信息)";
|
||||
this.title = "添加特种设备";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
@@ -423,7 +423,7 @@ export default {
|
||||
this.loading = false;
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改特种设备(包含锅炉、压力管道、电梯等特种设备信息)";
|
||||
this.title = "修改特种设备";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
@@ -454,7 +454,7 @@ export default {
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const equipmentIds = row.equipmentId || this.ids;
|
||||
this.$modal.confirm('是否确认删除特种设备(包含锅炉、压力管道、电梯等特种设备信息)编号为"' + equipmentIds + '"的数据项?').then(() => {
|
||||
this.$modal.confirm('是否确认删除特种设备编号为"' + equipmentIds + '"的数据项?').then(() => {
|
||||
this.loading = true;
|
||||
return delSpecialEquipment(equipmentIds);
|
||||
}).then(() => {
|
||||
|
||||
442
klp-ui/src/views/wms/purchasePlan/list.vue
Normal file
442
klp-ui/src/views/wms/purchasePlan/list.vue
Normal file
@@ -0,0 +1,442 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
|
||||
<el-form-item label="采购订单编号" prop="detailCode">
|
||||
<el-input v-model="queryParams.detailCode" placeholder="请输入采购订单编号" clearable
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原材料" prop="rawMaterialId">
|
||||
<RawMaterialSelect v-model="queryParams.rawMaterialId" placeholder="请选择原材料" can-add />
|
||||
</el-form-item>
|
||||
<el-form-item label="负责人" prop="owner">
|
||||
<el-input v-model="queryParams.owner" placeholder="请输入负责人" />
|
||||
</el-form-item>
|
||||
<!-- 远程搜索供应商 -->
|
||||
<el-form-item label="供应商" prop="supplierId">
|
||||
<VendorSelect v-model="queryParams.supplierId" />
|
||||
</el-form-item>
|
||||
<el-form-item label="关联订单ID" prop="orderId">
|
||||
<el-input v-model="queryParams.orderId" placeholder="请输入关联订单ID" clearable @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
|
||||
@click="handleUpdate">修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
|
||||
@click="handleDelete">删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="info" plain icon="el-icon-plus" size="mini" :disabled="!hasArrivalItems"
|
||||
@click="handleCreateStockIn">创建入库单</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="purchasePlanDetailList" @selection-change="handleSelectionChange"
|
||||
ref="purchasePlanDetailTable">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- <el-table-column label="明细ID" align="center" prop="detailId" v-if="true"/>
|
||||
<el-table-column label="采购计划ID" align="center" prop="planId" /> -->
|
||||
<el-table-column label="计划编号" align="center" prop="detailCode" />
|
||||
<el-table-column label="原材料" align="center">
|
||||
<template slot-scope="scope">
|
||||
<RawMaterialInfo :material-id="scope.row.rawMaterialId">
|
||||
<template #default="{ material }">
|
||||
{{ material.rawMaterialName }}<span v-if="material.rawMaterialCode">({{ material.rawMaterialCode
|
||||
}})</span>
|
||||
</template>
|
||||
</RawMaterialInfo>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="BOM" align="center">
|
||||
<template slot-scope="scope">
|
||||
<BomInfoMini item-type="raw_material" :item-id="scope.row.rawMaterialId" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="负责人" align="center" prop="owner" />
|
||||
<el-table-column label="供应商" align="center" prop="supplierName" />
|
||||
<el-table-column label="合同编号" align="center" prop="contractNo" />
|
||||
<el-table-column label="计划采购数量" align="center" prop="quantity" />
|
||||
<el-table-column label="单位" align="center" prop="unit" />
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.status"
|
||||
@change="handleStatusChange(scope.row, scope.row.status, scope.row.status)">
|
||||
<el-option v-for="item in dict.type.pruchase_detail_status" :key="item.value" :label="item.label"
|
||||
:value="parseInt(item.value)">
|
||||
<dict-tag :options="dict.type.pruchase_detail_status" :value="item.value" />
|
||||
</el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
|
||||
<!-- 状态修改按钮 -->
|
||||
<el-button v-if="scope.row.status === EPurchaseDetailStatus.NEW" size="mini" type="text"
|
||||
icon="el-icon-refresh"
|
||||
@click="handleStatusChange(scope.row, EPurchaseDetailStatus.ONWAY, '在途')">设为在途</el-button>
|
||||
<el-button v-if="scope.row.status === EPurchaseDetailStatus.ONWAY" size="mini" type="text"
|
||||
icon="el-icon-refresh"
|
||||
@click="handleStatusChange(scope.row, EPurchaseDetailStatus.ARRIVAL, '到货')">设为到货</el-button>
|
||||
<el-button v-if="scope.row.status === EPurchaseDetailStatus.ARRIVAL" size="mini" type="text"
|
||||
icon="el-icon-refresh"
|
||||
@click="handleStatusChange(scope.row, EPurchaseDetailStatus.REVIEW, '待审核')">设为待审核</el-button>
|
||||
<el-button
|
||||
v-if="scope.row.status === EPurchaseDetailStatus.REVIEW || scope.row.status === EPurchaseDetailStatus.FINISH"
|
||||
size="mini" type="text" icon="el-icon-document"
|
||||
@click="handleUploadQualityCertificate(scope.row)">质保单</el-button>
|
||||
<el-button v-if="scope.row.status === EPurchaseDetailStatus.REVIEW" size="mini" type="text"
|
||||
icon="el-icon-refresh"
|
||||
@click="handleStatusChange(scope.row, EPurchaseDetailStatus.FINISH, '采购完成')">设为完成</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
||||
@pagination="getList" />
|
||||
|
||||
<!-- 添加或修改采购计划明细对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="计划编号" prop="detailCode">
|
||||
<el-input v-model="form.detailCode" placeholder="请输入计划编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原材料" prop="rawMaterialId">
|
||||
<RawMaterialSelect v-model="form.rawMaterialId" placeholder="请选择原材料" @change="onRawMaterialChange" can-add />
|
||||
</el-form-item>
|
||||
<el-form-item label="负责人" prop="owner">
|
||||
<el-input v-model="form.owner" placeholder="请输入负责人" />
|
||||
</el-form-item>
|
||||
<!-- 远程搜索供应商 -->
|
||||
<el-form-item label="供应商" prop="supplierId">
|
||||
<VendorSelect v-model="form.supplierId" />
|
||||
</el-form-item>
|
||||
<!-- 远程搜索合同 -->
|
||||
<el-form-item label="合同" prop="contractId">
|
||||
<el-select remote filterable v-model="form.contractId" placeholder="请选择合同"
|
||||
:remote-method="remoteSearchContract" :loading="contractLoading">
|
||||
<el-option v-for="item in contractList" :key="item.contractId" :label="item.contractNo"
|
||||
:value="item.contractId" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="采购数量" prop="quantity">
|
||||
<el-input v-model="form.quantity" placeholder="请输入计划采购数量" />
|
||||
</el-form-item>
|
||||
<el-form-item label="单位" prop="unit">
|
||||
<el-input v-model="form.unit" placeholder="请输入单位" :disabled="true" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 入库单创建对话框 -->
|
||||
<stock-in-dialog :visible.sync="stockInVisible" :selected-items="selectedArrivalItems"
|
||||
@success="handleStockInSuccess" />
|
||||
|
||||
<el-dialog title="上传质保单" :visible.sync="uploadQualityCertificateOpen" width="800px" append-to-body>
|
||||
<quality-certicate :info="uploadQualityCertificateInfo" @confirm="handleUploadQualityCertificateConfirm" />
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listPurchasePlanDetail, getPurchasePlanDetail, delPurchasePlanDetail, addPurchasePlanDetail, updatePurchasePlanDetail } from "@/api/wms/purchasePlanDetail";
|
||||
import { listContract } from "@/api/wms/contract";
|
||||
import { EPurchaseDetailStatus } from "@/utils/enums";
|
||||
import StockInDialog from "./panels/stockin.vue";
|
||||
import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect';
|
||||
import UserSelect from '@/components/KLPService/UserSelect'
|
||||
import { RawMaterialInfo } from '@/components/KLPService';
|
||||
import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
|
||||
import QualityCerticate from './panels/qualityCerticate.vue'
|
||||
import VendorSelect from '@/components/KLPService/VendorSelect/index.vue';
|
||||
|
||||
export default {
|
||||
name: "PurchasePlanDetail",
|
||||
components: {
|
||||
StockInDialog,
|
||||
RawMaterialSelect,
|
||||
UserSelect,
|
||||
RawMaterialInfo,
|
||||
BomInfoMini,
|
||||
QualityCerticate,
|
||||
VendorSelect
|
||||
},
|
||||
dicts: ['pruchase_detail_status'],
|
||||
data() {
|
||||
return {
|
||||
EPurchaseDetailStatus,
|
||||
// 按钮loading
|
||||
buttonLoading: false,
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 采购计划明细表格数据
|
||||
purchasePlanDetailList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
rawMaterialId: undefined,
|
||||
owner: undefined,
|
||||
quantity: undefined,
|
||||
unit: undefined,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
detailCode: [
|
||||
{ required: true, message: "计划编号不能为空", trigger: "blur" }
|
||||
],
|
||||
rawMaterialId: [
|
||||
{ required: true, message: "原材料ID不能为空", trigger: "blur" }
|
||||
],
|
||||
owner: [
|
||||
{ required: true, message: "负责人不能为空", trigger: "blur" }
|
||||
],
|
||||
quantity: [
|
||||
{ required: true, message: "计划采购数量不能为空", trigger: "blur" }
|
||||
],
|
||||
unit: [
|
||||
{ required: true, message: "单位不能为空", trigger: "blur" }
|
||||
],
|
||||
},
|
||||
// 入库单相关
|
||||
stockInVisible: false,
|
||||
selectedArrivalItems: [],
|
||||
uploadQualityCertificateOpen: false,
|
||||
uploadQualityCertificateInfo: undefined,
|
||||
|
||||
vendorList: [],
|
||||
vendorLoading: false,
|
||||
contractList: [],
|
||||
contractLoading: false
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
/** 是否有到货状态的明细 */
|
||||
hasArrivalItems() {
|
||||
return this.purchasePlanDetailList.some(item => item.status === EPurchaseDetailStatus.ARRIVAL);
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
this.remoteSearchContract('');
|
||||
},
|
||||
methods: {
|
||||
remoteSearchContract(query) {
|
||||
this.contractLoading = true;
|
||||
listContract({ contractNo: query, pageNum: 1, pageSize: 10 }).then(response => {
|
||||
this.contractList = response.rows;
|
||||
}).finally(() => {
|
||||
this.contractLoading = false;
|
||||
});
|
||||
},
|
||||
/** 查询采购计划明细列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listPurchasePlanDetail(this.queryParams).then(response => {
|
||||
this.purchasePlanDetailList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
detailCode: undefined,
|
||||
detailId: undefined,
|
||||
rawMaterialId: undefined,
|
||||
owner: undefined,
|
||||
quantity: undefined,
|
||||
unit: undefined,
|
||||
remark: undefined,
|
||||
delFlag: undefined,
|
||||
createTime: undefined,
|
||||
createBy: undefined,
|
||||
updateTime: undefined,
|
||||
updateBy: undefined
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.detailId)
|
||||
this.single = selection.length !== 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加采购计划明细";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.loading = true;
|
||||
this.reset();
|
||||
const detailId = row.detailId || this.ids
|
||||
getPurchasePlanDetail(detailId).then(response => {
|
||||
this.loading = false;
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改采购计划明细";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
this.buttonLoading = true;
|
||||
if (this.form.detailId != null) {
|
||||
updatePurchasePlanDetail(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
} else {
|
||||
addPurchasePlanDetail(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const detailIds = row.detailId || this.ids;
|
||||
this.$modal.confirm('是否确认删除采购计划明细编号为"' + detailIds + '"的数据项?').then(() => {
|
||||
this.loading = true;
|
||||
return delPurchasePlanDetail(detailIds);
|
||||
}).then(() => {
|
||||
this.loading = false;
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('wms/purchasePlanDetail/export', {
|
||||
...this.queryParams
|
||||
}, `purchasePlanDetail_${new Date().getTime()}.xlsx`)
|
||||
},
|
||||
/** 状态修改按钮操作 */
|
||||
handleStatusChange(row, status, label) {
|
||||
// this.$modal.confirm('是否确认将采购计划明细编号为"' + row.detailId + '"的状态改为"' + label + '"?').then(() => {
|
||||
this.loading = true;
|
||||
updatePurchasePlanDetail({ detailId: row.detailId, status: status }).then(response => {
|
||||
this.$modal.msgSuccess("状态修改成功");
|
||||
this.getList();
|
||||
}).catch(error => {
|
||||
console.error(error);
|
||||
this.$modal.msgError("状态修改失败");
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
// });
|
||||
},
|
||||
handleUploadQualityCertificateConfirm() {
|
||||
this.uploadQualityCertificateOpen = false;
|
||||
this.handleStatusChange(this.uploadQualityCertificateInfo, EPurchaseDetailStatus.FINISH, '采购完成');
|
||||
},
|
||||
/** 创建入库单按钮操作 */
|
||||
handleCreateStockIn() {
|
||||
// 获取用户选中的明细
|
||||
const selectedItems = this.$refs.purchasePlanDetailTable.selection;
|
||||
|
||||
if (selectedItems.length === 0) {
|
||||
this.$modal.msgWarning("请先选择要入库的明细");
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查选中的明细是否都是到货状态
|
||||
const nonArrivalItems = selectedItems.filter(item => item.status !== EPurchaseDetailStatus.ARRIVAL);
|
||||
if (nonArrivalItems.length > 0) {
|
||||
this.$modal.msgWarning("只能选择到货状态的明细进行入库操作");
|
||||
return;
|
||||
}
|
||||
|
||||
this.selectedArrivalItems = selectedItems;
|
||||
this.stockInVisible = true;
|
||||
},
|
||||
/** 入库单创建成功后的回调 */
|
||||
handleStockInSuccess() {
|
||||
this.$modal.msgSuccess("入库单创建成功,相关明细状态已更新为采购完成");
|
||||
this.getList();
|
||||
this.stockInVisible = false;
|
||||
this.selectedArrivalItems = []; // 清空选中的明细
|
||||
},
|
||||
onRawMaterialChange(rawMaterial) {
|
||||
if (rawMaterial && rawMaterial.unit) {
|
||||
this.form.unit = rawMaterial.unit;
|
||||
}
|
||||
},
|
||||
handleUploadQualityCertificate(row) {
|
||||
this.uploadQualityCertificateOpen = true;
|
||||
this.uploadQualityCertificateInfo = row;
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Reference in New Issue
Block a user