生产质量页面新增接口
parent
66f7b98578
commit
ddb9a98d5b
@ -0,0 +1,94 @@
|
||||
package com.hw.mes.controller;
|
||||
|
||||
import com.hw.common.core.web.controller.BaseController;
|
||||
import com.hw.common.core.web.domain.AjaxResult;
|
||||
import com.hw.common.core.web.page.TableDataInfo;
|
||||
import com.hw.mes.domain.MesProductionQualified;
|
||||
import com.hw.mes.service.MesProductionQualifiedService;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产合格情况(MesProductionQualified)表控制层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-11-25 11:14:21
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("mesProductionQualified")
|
||||
public class MesProductionQualifiedController extends BaseController {
|
||||
/**
|
||||
* 服务对象
|
||||
*/
|
||||
@Resource
|
||||
private MesProductionQualifiedService mesProductionQualifiedService;
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*
|
||||
* @param mesProductionQualified 筛选条件
|
||||
* @param
|
||||
* @return 查询结果
|
||||
*/
|
||||
@GetMapping
|
||||
public TableDataInfo queryByPage(MesProductionQualified mesProductionQualified) {
|
||||
startPage();
|
||||
List<MesProductionQualified> list = mesProductionQualifiedService.selectMesProductionQualifiedList(mesProductionQualified);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过主键查询单条数据
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 单条数据
|
||||
*/
|
||||
@GetMapping("{qualifiedId}")
|
||||
public ResponseEntity<MesProductionQualified> queryById(@PathVariable("qualifiedId") Long id) {
|
||||
return ResponseEntity.ok(this.mesProductionQualifiedService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增数据
|
||||
*
|
||||
* @param mesProductionQualified 实体
|
||||
* @return 新增结果
|
||||
*/
|
||||
@PostMapping
|
||||
public ResponseEntity<MesProductionQualified> add(@RequestBody MesProductionQualified mesProductionQualified) {
|
||||
mesProductionQualified.setCreateTime(new Date());
|
||||
mesProductionQualified.setCreateBy(mesProductionQualified.getName());
|
||||
return ResponseEntity.ok(this.mesProductionQualifiedService.insert(mesProductionQualified));
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑数据
|
||||
*
|
||||
* @param mesProductionQualified 实体
|
||||
* @return 编辑结果
|
||||
*/
|
||||
@PutMapping
|
||||
public ResponseEntity<MesProductionQualified> edit(@RequestBody MesProductionQualified mesProductionQualified) {
|
||||
mesProductionQualified.setUpdateBy(mesProductionQualified.getName());
|
||||
return ResponseEntity.ok(this.mesProductionQualifiedService.update(mesProductionQualified));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除数据
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 删除是否成功
|
||||
*/
|
||||
@DeleteMapping
|
||||
public ResponseEntity<Boolean> deleteById(Long id) {
|
||||
return ResponseEntity.ok(this.mesProductionQualifiedService.deleteById(id));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,103 @@
|
||||
package com.hw.mes.domain;
|
||||
|
||||
import com.hw.common.core.web.domain.BaseEntity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 生产合格情况(MesProductionQualified)实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-11-25 11:14:22
|
||||
*/
|
||||
public class MesProductionQualified implements Serializable {
|
||||
private static final long serialVersionUID = 552085890413243010L;
|
||||
/**
|
||||
* 主键标识;此表不会长期保存
|
||||
*/
|
||||
private Long qualifiedId;
|
||||
/**
|
||||
* 生产者姓名
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 合格率
|
||||
*/
|
||||
private String passRate;
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
private String createBy;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
private String updateBy;
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
private Date updateTime;
|
||||
|
||||
|
||||
public Long getQualifiedId() {
|
||||
return qualifiedId;
|
||||
}
|
||||
|
||||
public void setQualifiedId(Long qualifiedId) {
|
||||
this.qualifiedId = qualifiedId;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getPassRate() {
|
||||
return passRate;
|
||||
}
|
||||
|
||||
public void setPassRate(String passRate) {
|
||||
this.passRate = passRate;
|
||||
}
|
||||
|
||||
public String getCreateBy() {
|
||||
return createBy;
|
||||
}
|
||||
|
||||
public void setCreateBy(String createBy) {
|
||||
this.createBy = createBy;
|
||||
}
|
||||
|
||||
public Date getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
|
||||
public void setCreateTime(Date createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
public String getUpdateBy() {
|
||||
return updateBy;
|
||||
}
|
||||
|
||||
public void setUpdateBy(String updateBy) {
|
||||
this.updateBy = updateBy;
|
||||
}
|
||||
|
||||
public Date getUpdateTime() {
|
||||
return updateTime;
|
||||
}
|
||||
|
||||
public void setUpdateTime(Date updateTime) {
|
||||
this.updateTime = updateTime;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
package com.hw.mes.service;
|
||||
|
||||
import com.hw.mes.domain.MesProductionQualified;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产合格情况(MesProductionQualified)表服务接口
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-11-25 11:14:31
|
||||
*/
|
||||
public interface MesProductionQualifiedService {
|
||||
|
||||
/**
|
||||
* 通过ID查询单条数据
|
||||
*
|
||||
* @param qualifiedId 主键
|
||||
* @return 实例对象
|
||||
*/
|
||||
MesProductionQualified queryById(Long qualifiedId);
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*
|
||||
* @param mesProductionQualified 筛选条件
|
||||
* @param pageRequest 分页对象
|
||||
* @return 查询结果
|
||||
*/
|
||||
Page<MesProductionQualified> queryByPage(MesProductionQualified mesProductionQualified, PageRequest pageRequest);
|
||||
|
||||
/**
|
||||
* 新增数据
|
||||
*
|
||||
* @param mesProductionQualified 实例对象
|
||||
* @return 实例对象
|
||||
*/
|
||||
MesProductionQualified insert(MesProductionQualified mesProductionQualified);
|
||||
|
||||
/**
|
||||
* 修改数据
|
||||
*
|
||||
* @param mesProductionQualified 实例对象
|
||||
* @return 实例对象
|
||||
*/
|
||||
MesProductionQualified update(MesProductionQualified mesProductionQualified);
|
||||
|
||||
/**
|
||||
* 通过主键删除数据
|
||||
*
|
||||
* @param qualifiedId 主键
|
||||
* @return 是否成功
|
||||
*/
|
||||
boolean deleteById(Long qualifiedId);
|
||||
|
||||
List<MesProductionQualified> selectMesProductionQualifiedList(MesProductionQualified mesProductionQualified);
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
package com.hw.mes.service.impl;
|
||||
|
||||
import com.hw.mes.domain.MesProductionQualified;
|
||||
import com.hw.mes.mapper.MesProductionQualifiedDao;
|
||||
import com.hw.mes.service.MesProductionQualifiedService;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageImpl;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产合格情况(MesProductionQualified)表服务实现类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-11-25 11:14:31
|
||||
*/
|
||||
@Service("mesProductionQualifiedService")
|
||||
public class MesProductionQualifiedServiceImpl implements MesProductionQualifiedService {
|
||||
@Resource
|
||||
private MesProductionQualifiedDao mesProductionQualifiedDao;
|
||||
|
||||
@Override
|
||||
public MesProductionQualified queryById(Long qualifiedId) {
|
||||
return mesProductionQualifiedDao.selectMesProductionQualifiedListById(qualifiedId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过ID查询单条数据
|
||||
*
|
||||
* @param qualifiedId 主键
|
||||
* @return 实例对象
|
||||
*/
|
||||
|
||||
|
||||
@Override
|
||||
public Page<MesProductionQualified> queryByPage(MesProductionQualified mesProductionQualified, PageRequest pageRequest) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增数据
|
||||
*
|
||||
* @param mesProductionQualified 实例对象
|
||||
* @return 实例对象
|
||||
*/
|
||||
@Override
|
||||
public MesProductionQualified insert(MesProductionQualified mesProductionQualified) {
|
||||
this.mesProductionQualifiedDao.insert(mesProductionQualified);
|
||||
return mesProductionQualified;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改数据
|
||||
*
|
||||
* @param mesProductionQualified 实例对象
|
||||
* @return 实例对象
|
||||
*/
|
||||
@Override
|
||||
public MesProductionQualified update(MesProductionQualified mesProductionQualified) {
|
||||
mesProductionQualified.setUpdateTime(new Date());
|
||||
this.mesProductionQualifiedDao.update(mesProductionQualified);
|
||||
return this.queryById(mesProductionQualified.getQualifiedId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesProductionQualified> selectMesProductionQualifiedList(MesProductionQualified mesProductionQualified) {
|
||||
return mesProductionQualifiedDao.selectMesProductionQualifiedList(mesProductionQualified);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过主键删除数据
|
||||
*
|
||||
* @param qualifiedId 主键
|
||||
* @return 是否成功
|
||||
*/
|
||||
@Override
|
||||
public boolean deleteById(Long qualifiedId) {
|
||||
return this.mesProductionQualifiedDao.deleteById(qualifiedId) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,139 @@
|
||||
<?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.hw.mes.mapper.MesProductionQualifiedDao">
|
||||
|
||||
<resultMap type="MesAlarmInfo" id="MesAlarmInfoResult">
|
||||
<result property="alarmInfoId" column="alarm_info_id" />
|
||||
<result property="alarmInfoType" column="alarm_info_type" />
|
||||
<result property="handleStatus" column="handle_status" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createDate" column="create_date" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateDate" column="update_date" />
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="MesAlarmInfoMesStockAlarmDetailResult" type="MesAlarmInfo" extends="MesAlarmInfoResult">
|
||||
<collection property="mesStockAlarmDetailList" notNullColumn="sub_stock_alarm_detail_id" javaType="java.util.List" resultMap="MesStockAlarmDetailResult" />
|
||||
</resultMap>
|
||||
|
||||
<resultMap type="MesStockAlarmDetail" id="MesStockAlarmDetailResult">
|
||||
<result property="stockAlarmDetailId" column="sub_stock_alarm_detail_id" />
|
||||
<result property="alarmInfoId" column="sub_alarm_info_id" />
|
||||
<result property="materialId" column="sub_material_id" />
|
||||
<result property="materialCode" column="sub_material_code" />
|
||||
<result property="materialName" column="sub_material_name" />
|
||||
<result property="materialSpec" column="sub_material_spec" />
|
||||
<result property="safeStockAmount" column="sub_safe_stock_amount" />
|
||||
<result property="stockAmount" column="sub_stock_amount" />
|
||||
<result property="createBy" column="sub_create_by" />
|
||||
<result property="createDate" column="sub_create_date" />
|
||||
<result property="updateBy" column="sub_update_by" />
|
||||
<result property="updateDate" column="sub_update_date" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectMesAlarmInfoVo">
|
||||
select alarm_info_id, alarm_info_type, handle_status, create_by, create_date, update_by, update_date from mes_alarm_info
|
||||
</sql>
|
||||
|
||||
<select id="selectMesAlarmInfoList" parameterType="MesAlarmInfo" resultMap="MesAlarmInfoResult">
|
||||
<include refid="selectMesAlarmInfoVo"/>
|
||||
<where>
|
||||
<if test="alarmInfoType != null and alarmInfoType != ''"> and alarm_info_type = #{alarmInfoType}</if>
|
||||
<if test="handleStatus != null and handleStatus != ''"> and handle_status = #{handleStatus}</if>
|
||||
<if test="createDate != null "> and create_date = #{createDate}</if>
|
||||
<if test="updateDate != null "> and update_date = #{updateDate}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectMesAlarmInfoByAlarmInfoId" parameterType="Long" resultMap="MesAlarmInfoMesStockAlarmDetailResult">
|
||||
select a.alarm_info_id, a.alarm_info_type, a.handle_status, a.create_by, a.create_date, a.update_by, a.update_date,
|
||||
b.stock_alarm_detail_id as sub_stock_alarm_detail_id, b.alarm_info_id as sub_alarm_info_id, b.material_id as sub_material_id, b.material_code as sub_material_code, b.material_name as sub_material_name, b.material_spec as sub_material_spec, b.safe_stock_amount as sub_safe_stock_amount, b.stock_amount as sub_stock_amount, b.create_by as sub_create_by, b.create_date as sub_create_date, b.update_by as sub_update_by, b.update_date as sub_update_date
|
||||
from mes_alarm_info a
|
||||
left join mes_stock_alarm_detail b on b.alarm_info_id = a.alarm_info_id
|
||||
where a.alarm_info_id = #{alarmInfoId}
|
||||
</select>
|
||||
<select id="selectMesProductionQualifiedList" resultType="com.hw.mes.domain.MesProductionQualified"
|
||||
parameterType="com.hw.mes.domain.MesProductionQualified">
|
||||
select * from mes_production_qualified
|
||||
<where>
|
||||
<if test="name != null and name != ''"> and name = #{name}</if>
|
||||
<if test="passRate != null and passRate != ''"> and pass_rate = #{passRate}</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
<select id="selectMesProductionQualifiedListById" resultType="com.hw.mes.domain.MesProductionQualified"
|
||||
parameterType="java.lang.Long">
|
||||
select * from mes_production_qualified where qualified_id = #{qualifiedId}
|
||||
</select>
|
||||
|
||||
<insert id="insertMesAlarmInfo" parameterType="MesAlarmInfo" useGeneratedKeys="true" keyProperty="alarmInfoId">
|
||||
insert into mes_alarm_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="alarmInfoType != null and alarmInfoType != ''">alarm_info_type,</if>
|
||||
<if test="handleStatus != null and handleStatus != ''">handle_status,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createDate != null">create_date,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateDate != null">update_date,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="alarmInfoType != null and alarmInfoType != ''">#{alarmInfoType},</if>
|
||||
<if test="handleStatus != null and handleStatus != ''">#{handleStatus},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createDate != null">#{createDate},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateDate != null">#{updateDate},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateMesAlarmInfo" parameterType="MesAlarmInfo">
|
||||
update mes_alarm_info
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="alarmInfoType != null and alarmInfoType != ''">alarm_info_type = #{alarmInfoType},</if>
|
||||
<if test="handleStatus != null and handleStatus != ''">handle_status = #{handleStatus},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createDate != null">create_date = #{createDate},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateDate != null">update_date = #{updateDate},</if>
|
||||
</trim>
|
||||
where alarm_info_id = #{alarmInfoId}
|
||||
</update>
|
||||
<update id="update" parameterType="com.hw.mes.domain.MesProductionQualified">
|
||||
update mes_production_qualified
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="name != null and name != ''">name = #{name},</if>
|
||||
<if test="passRate != null and passRate != ''">pass_rate = #{passRate},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where qualified_id = #{qualifiedId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteMesAlarmInfoByAlarmInfoId" parameterType="Long">
|
||||
delete from mes_alarm_info where alarm_info_id = #{alarmInfoId}
|
||||
</delete>
|
||||
|
||||
<insert id="insert" parameterType="com.hw.mes.domain.MesProductionQualified">
|
||||
insert into mes_production_qualified
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="name != null and name != ''">name,</if>
|
||||
<if test="passRate != null and passRate != ''">pass_rate,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="name != null and name != ''">#{name},</if>
|
||||
<if test="passRate != null and passRate != ''">#{passRate},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue