bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修饰管理代码提交

This commit is contained in:
1539530615@qq.com 2024-02-18 09:36:59 +08:00
parent 9928bd19c5
commit 0b5bc3ec52
8 changed files with 247 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
View File

@ -162,7 +162,6 @@
select IFNULL(input_num,0) from purchase_check_details where task_id = #{taskId} and type_id = #{typeId}
</select>
<select id="selectMacodeInfoStatusByTaskId" resultType="java.lang.Integer">
select count(*) from purchase_macode_info where task_id = #{taskId} and status != '1'
select count(*) from purchase_macode_info where task_id = #{taskId} and status not in ('1','2')
</select>
</mapper>

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java
View File

@ -5,6 +5,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.bonus.sgzb.material.domain.RepairAuditDetails;
import com.bonus.sgzb.material.domain.RepairRecord;
import com.bonus.sgzb.material.service.IRepairAuditDetailsService;
import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
@ -88,6 +89,18 @@ public class RepairAuditDetailsController extends BaseController
return getDataTable(list);
}
/**
* 查看维修记录
*/
@ApiOperation("查看维修记录")
@GetMapping("/getRepairRecord")
public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails)
{
startPage();
List<RepairRecord> list = repairAuditDetailsService.getRepairRecord(repairAuditDetails);
return getDataTable(list);
}
/**
* 修饰任务审核

98
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java Normal file
View File

@ -0,0 +1,98 @@
package com.bonus.sgzb.material.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author c liu
* @date 2023/12/11
*/
@Data
@ApiModel(value="维修配件")
public class RepairPart {
/**
* 任务ID
*/
@ApiModelProperty(value = "任务ID")
private String taskId;
/**
* 机具ID
*/
@ApiModelProperty(value = "机具ID")
private String maId;
/**
* 规格ID
*/
@ApiModelProperty(value = "规格ID")
private String typeId;
/**
* 配件ID
*/
@ApiModelProperty(value = "配件ID")
private Long partId;
/**
* 配件名称
*/
@ApiModelProperty(value = "配件名称")
private String partName;
/**
* 返厂id
*/
@ApiModelProperty(value = "返厂id")
private String supplierId;
/**
* 配件数量
*/
@ApiModelProperty(value = "配件数量")
private int partNum;
/**
* 配件费用
*/
@ApiModelProperty(value = "配件费用")
private String partCost;
/**
* 配件单价
*/
@ApiModelProperty(value = "配件单价")
private String partPrice;
/**
* 类型（0不收费，1收费）
*/
@ApiModelProperty(value = "类型（0不收费，1收费）")
private String partType;
/**
* 创建者
*/
@ApiModelProperty(value = "创建者")
private Long createBy;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private String createTime;
/**
* 更新者
*/
@ApiModelProperty(value = "更新者")
private String updateBy;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
private String updateTime;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
/**
* 维修内容
*/
@ApiModelProperty(value = "维修内容")
private String repairContent;
private Long companyId;
private Long repairer;
@ApiModelProperty(value = "维修数量")
private int repairNum;
}

125
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairRecord.java Normal file
View File

@ -0,0 +1,125 @@
package com.bonus.sgzb.material.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @author c liu
* @date 2023/12/11
*/
@Data
@ApiModel(value="维修任务详细")
public class RepairRecord implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
/**
* 任务ID
*/
@ApiModelProperty(value = "任务ID")
private String taskId;
/**
* 机具ID
*/
@ApiModelProperty(value = "机具ID")
private String maId;
/**
* 规格ID
*/
@ApiModelProperty(value = "规格ID")
private String typeId;
/**
* 维修数量
*/
@ApiModelProperty(value = "维修数量")
private int repairNum;
/**
* 报废数量
*/
@ApiModelProperty(value = "报废数量")
private int scrapNum;
/**
* 维修方式（1内部2返厂3报废）
*/
@ApiModelProperty(value = "维修方式（1内部2返厂3报废）")
private String repairType;
/**
* 创建者
*/
@ApiModelProperty(value = "创建者")
private Long createBy;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private String createTime;
/**
* 更新者
*/
@ApiModelProperty(value = "更新者")
private String updateBy;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
private String updateTime;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
/**
* 报废原因
*/
@ApiModelProperty(value = "报废原因")
private String scrapReason;
/**
* 报废类型（0：自然报废，1任务报废）
*/
@ApiModelProperty(value = "报废类型（0：自然报废，1任务报废）")
private String scrapType;
/**
* 返厂id
*/
@ApiModelProperty(value = "返厂id")
private String supplierId;
/**
* 配件数量
*/
@ApiModelProperty(value = "配件数量")
private int partNum;
/**
* 配件单价
*/
@ApiModelProperty(value = "配件单价")
private String partPrice;
/**
* 维修内容
*/
@ApiModelProperty(value = "维修内容")
private String repairContent;
/**
* 类型（0不收费，1收费）
*/
@ApiModelProperty(value = "类型（0不收费，1收费）")
private String partType;
/**
* 配件名称
*/
@ApiModelProperty(value = "配件名称")
private String partName;
/**
* 维修人
*/
@ApiModelProperty(value = "维修人")
private Long repairer;
private String partStrList;
private Long companyId;
/**
* 损坏照片id
*/
@ApiModelProperty(value = "损坏照片id")
private String fileIds;
}

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IRepairAuditDetailsService.java
View File

@ -1,6 +1,7 @@
package com.bonus.sgzb.material.service;
import com.bonus.sgzb.material.domain.RepairAuditDetails;
import com.bonus.sgzb.material.domain.RepairRecord;
import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
import com.bonus.sgzb.material.vo.ScrapAudit;
@ -91,5 +92,7 @@ public interface IRepairAuditDetailsService
* @return
*/
List<RepairAuditDetailsVO> exportRepairQuestList(RepairAuditDetails bean);
List<RepairRecord> getRepairRecord(RepairAuditDetails repairAuditDetails);
}

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -136,6 +136,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
return repairAuditDetailsMapper.exportRepairQuestList(bean);
}
@Override
public List<RepairRecord> getRepairRecord(RepairAuditDetails repairAuditDetails) {
return null;
}
/**
* @param repairAuditDetails
* @return

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
View File

@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt1 on mt.parent_id = mt1.type_id
left join ma_supplier_info msi on pcd.supplier_id = msi.supplier_id
left join tm_task tk on pcd.task_id = tk.task_id
where pcd.status !=3 and pcd.status!=5
where 1=1
<if test="taskId != null ">and pcd.task_id = #{taskId}</if>
<if test="keyWord != null and keyWord != ''">and (mt.type_name like concat('%',#{keyWord},'%')
or mt1.type_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord}))

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
View File

@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<select id="selectMacodeInfoStatusByTaskId" resultType="java.lang.Integer">
select count(*) from purchase_macode_info where task_id = #{taskId} and status != '1'
select count(*) from purchase_macode_info where task_id = #{taskId} and status not in ('1','2')
</select>
<insert id="insertMaInputRecord" parameterType="com.bonus.sgzb.material.domain.MaInputRecord" useGeneratedKeys="true" keyProperty="id">