Browse Source
制程检验 新增制程检验domian 新增制程检验Mapper 新增制程检验Mapper.xml 新增制程检验Service 新增制程检验ServiceImpl 新增制程工序manufacturingCheckout.html 完成数据填充，页面展示，条件查询操作dev
7 changed files with 903 additions and 0 deletions
@ -0,0 +1,151 @@ |
|||||
|
package com.ruoyi.quality.controller; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Controller; |
||||
|
import org.springframework.ui.ModelMap; |
||||
|
import org.springframework.web.bind.annotation.GetMapping; |
||||
|
import org.springframework.web.bind.annotation.PathVariable; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.ResponseBody; |
||||
|
import com.ruoyi.common.annotation.Log; |
||||
|
import com.ruoyi.common.enums.BusinessType; |
||||
|
import com.ruoyi.quality.domain.QualityManufacturingCheckout; |
||||
|
import com.ruoyi.quality.service.IQualityManufacturingCheckoutService; |
||||
|
import com.ruoyi.common.core.controller.BaseController; |
||||
|
import com.ruoyi.common.core.domain.AjaxResult; |
||||
|
import com.ruoyi.common.utils.poi.ExcelUtil; |
||||
|
import com.ruoyi.common.core.page.TableDataInfo; |
||||
|
|
||||
|
/** |
||||
|
* 品质管理制程检验Controller |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-13 |
||||
|
*/ |
||||
|
@Controller |
||||
|
@RequestMapping("/quality/manufacturingCheckout") |
||||
|
public class QualityManufacturingCheckoutController extends BaseController |
||||
|
{ |
||||
|
private String prefix = "quality/manufacturingCheckout"; |
||||
|
|
||||
|
@Autowired |
||||
|
private IQualityManufacturingCheckoutService qualityManufacturingCheckoutService; |
||||
|
|
||||
|
@RequiresPermissions("quality:manufacturingCheckout:view") |
||||
|
@GetMapping() |
||||
|
public String manufacturingCheckout() |
||||
|
{ |
||||
|
return prefix + "/manufacturingCheckout"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 查询品质管理制程检验列表 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:manufacturingCheckout:list") |
||||
|
@PostMapping("/list") |
||||
|
@ResponseBody |
||||
|
public TableDataInfo list(QualityManufacturingCheckout qualityManufacturingCheckout) |
||||
|
{ |
||||
|
startPage(); |
||||
|
List<QualityManufacturingCheckout> list = qualityManufacturingCheckoutService.selectQualityManufacturingCheckoutList(qualityManufacturingCheckout); |
||||
|
return getDataTable(list); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 导出品质管理制程检验列表 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:manufacturingCheckout:export") |
||||
|
@Log(title = "品质管理制程检验", businessType = BusinessType.EXPORT) |
||||
|
@PostMapping("/export") |
||||
|
@ResponseBody |
||||
|
public AjaxResult export(QualityManufacturingCheckout qualityManufacturingCheckout) |
||||
|
{ |
||||
|
List<QualityManufacturingCheckout> list = qualityManufacturingCheckoutService.selectQualityManufacturingCheckoutList(qualityManufacturingCheckout); |
||||
|
ExcelUtil<QualityManufacturingCheckout> util = new ExcelUtil<QualityManufacturingCheckout>(QualityManufacturingCheckout.class); |
||||
|
return util.exportExcel(list, "品质管理制程检验数据"); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 新增品质管理制程检验 |
||||
|
*/ |
||||
|
@GetMapping("/add") |
||||
|
public String add() |
||||
|
{ |
||||
|
return prefix + "/add"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 新增保存品质管理制程检验 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:manufacturingCheckout:add") |
||||
|
@Log(title = "品质管理制程检验", businessType = BusinessType.INSERT) |
||||
|
@PostMapping("/add") |
||||
|
@ResponseBody |
||||
|
public AjaxResult addSave(QualityManufacturingCheckout qualityManufacturingCheckout) |
||||
|
{ |
||||
|
return toAjax(qualityManufacturingCheckoutService.insertQualityManufacturingCheckout(qualityManufacturingCheckout)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 修改品质管理制程检验 |
||||
|
*/ |
||||
|
@GetMapping("/edit/{manufacturingCheckoutId}") |
||||
|
public String edit(@PathVariable("manufacturingCheckoutId") Long manufacturingCheckoutId, ModelMap mmap) |
||||
|
{ |
||||
|
QualityManufacturingCheckout qualityManufacturingCheckout = qualityManufacturingCheckoutService.selectQualityManufacturingCheckoutById(manufacturingCheckoutId); |
||||
|
mmap.put("qualityManufacturingCheckout", qualityManufacturingCheckout); |
||||
|
return prefix + "/edit"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 修改保存品质管理制程检验 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:manufacturingCheckout:edit") |
||||
|
@Log(title = "品质管理制程检验", businessType = BusinessType.UPDATE) |
||||
|
@PostMapping("/edit") |
||||
|
@ResponseBody |
||||
|
public AjaxResult editSave(QualityManufacturingCheckout qualityManufacturingCheckout) |
||||
|
{ |
||||
|
return toAjax(qualityManufacturingCheckoutService.updateQualityManufacturingCheckout(qualityManufacturingCheckout)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 删除品质管理制程检验 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:manufacturingCheckout:remove") |
||||
|
@Log(title = "品质管理制程检验", businessType = BusinessType.DELETE) |
||||
|
@PostMapping( "/remove") |
||||
|
@ResponseBody |
||||
|
public AjaxResult remove(String ids) |
||||
|
{ |
||||
|
return toAjax(qualityManufacturingCheckoutService.deleteQualityManufacturingCheckoutByIds(ids)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 作废品质管理制程检验 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:manufacturingCheckout:cancel") |
||||
|
@Log(title = "品质管理制程检验", businessType = BusinessType.CANCEL) |
||||
|
@GetMapping( "/cancel/{id}") |
||||
|
@ResponseBody |
||||
|
public AjaxResult cancel(@PathVariable("id") Long id){ |
||||
|
return toAjax(qualityManufacturingCheckoutService.cancelQualityManufacturingCheckoutById(id)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 恢复品质管理制程检验 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:manufacturingCheckout:restore") |
||||
|
@Log(title = "品质管理制程检验", businessType = BusinessType.RESTORE) |
||||
|
@GetMapping( "/restore/{id}") |
||||
|
@ResponseBody |
||||
|
public AjaxResult restore(@PathVariable("id")Long id) |
||||
|
{ |
||||
|
return toAjax(qualityManufacturingCheckoutService.restoreQualityManufacturingCheckoutById(id)); |
||||
|
} |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,197 @@ |
|||||
|
package com.ruoyi.quality.domain; |
||||
|
|
||||
|
import java.util.Date; |
||||
|
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
|
import org.apache.commons.lang3.builder.ToStringBuilder; |
||||
|
import org.apache.commons.lang3.builder.ToStringStyle; |
||||
|
import com.ruoyi.common.annotation.Excel; |
||||
|
import com.ruoyi.common.core.domain.BaseEntity; |
||||
|
|
||||
|
/** |
||||
|
* 品质管理制程检验对象 quality_manufacturing_checkout |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-13 |
||||
|
*/ |
||||
|
public class QualityManufacturingCheckout extends BaseEntity |
||||
|
{ |
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** 制程检验Id */ |
||||
|
private Long manufacturingCheckoutId; |
||||
|
|
||||
|
/** 制程检验单号 */ |
||||
|
@Excel(name = "制程检验单号") |
||||
|
private String manufacturingCheckoutCode; |
||||
|
|
||||
|
/** 生产单号 */ |
||||
|
@Excel(name = "生产单号") |
||||
|
private String makeNo; |
||||
|
|
||||
|
/** 检验时间 */ |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
|
@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd") |
||||
|
private Date checkoutTime; |
||||
|
|
||||
|
/** 料号 */ |
||||
|
@Excel(name = "料号") |
||||
|
private String materialNo; |
||||
|
|
||||
|
/** 物料名称 */ |
||||
|
@Excel(name = "物料名称") |
||||
|
private String materialName; |
||||
|
|
||||
|
/** 物料数合计 */ |
||||
|
@Excel(name = "物料数合计") |
||||
|
private String materialTotal; |
||||
|
|
||||
|
/** 数量合计 */ |
||||
|
@Excel(name = "数量合计") |
||||
|
private String numTotal; |
||||
|
|
||||
|
/** 制程工序合格数 */ |
||||
|
@Excel(name = "制程工序合格数") |
||||
|
private String processQualifiedNum; |
||||
|
|
||||
|
/** 制程工序不合格数 */ |
||||
|
@Excel(name = "制程工序不合格数") |
||||
|
private String processUnqualifiedNum; |
||||
|
|
||||
|
/** 制程工序编号 */ |
||||
|
private String manufacturingProcessCode; |
||||
|
|
||||
|
/** 制程工序名称 */ |
||||
|
private String manufacturingProcessName; |
||||
|
|
||||
|
public void setManufacturingCheckoutId(Long manufacturingCheckoutId) |
||||
|
{ |
||||
|
this.manufacturingCheckoutId = manufacturingCheckoutId; |
||||
|
} |
||||
|
|
||||
|
public Long getManufacturingCheckoutId() |
||||
|
{ |
||||
|
return manufacturingCheckoutId; |
||||
|
} |
||||
|
public void setManufacturingCheckoutCode(String manufacturingCheckoutCode) |
||||
|
{ |
||||
|
this.manufacturingCheckoutCode = manufacturingCheckoutCode; |
||||
|
} |
||||
|
|
||||
|
public String getManufacturingCheckoutCode() |
||||
|
{ |
||||
|
return manufacturingCheckoutCode; |
||||
|
} |
||||
|
public void setMakeNo(String makeNo) |
||||
|
{ |
||||
|
this.makeNo = makeNo; |
||||
|
} |
||||
|
|
||||
|
public String getMakeNo() |
||||
|
{ |
||||
|
return makeNo; |
||||
|
} |
||||
|
public void setCheckoutTime(Date checkoutTime) |
||||
|
{ |
||||
|
this.checkoutTime = checkoutTime; |
||||
|
} |
||||
|
|
||||
|
public Date getCheckoutTime() |
||||
|
{ |
||||
|
return checkoutTime; |
||||
|
} |
||||
|
public void setMaterialNo(String materialNo) |
||||
|
{ |
||||
|
this.materialNo = materialNo; |
||||
|
} |
||||
|
|
||||
|
public String getMaterialNo() |
||||
|
{ |
||||
|
return materialNo; |
||||
|
} |
||||
|
public void setMaterialName(String materialName) |
||||
|
{ |
||||
|
this.materialName = materialName; |
||||
|
} |
||||
|
|
||||
|
public String getMaterialName() |
||||
|
{ |
||||
|
return materialName; |
||||
|
} |
||||
|
public void setMaterialTotal(String materialTotal) |
||||
|
{ |
||||
|
this.materialTotal = materialTotal; |
||||
|
} |
||||
|
|
||||
|
public String getMaterialTotal() |
||||
|
{ |
||||
|
return materialTotal; |
||||
|
} |
||||
|
public void setNumTotal(String numTotal) |
||||
|
{ |
||||
|
this.numTotal = numTotal; |
||||
|
} |
||||
|
|
||||
|
public String getNumTotal() |
||||
|
{ |
||||
|
return numTotal; |
||||
|
} |
||||
|
public void setProcessQualifiedNum(String processQualifiedNum) |
||||
|
{ |
||||
|
this.processQualifiedNum = processQualifiedNum; |
||||
|
} |
||||
|
|
||||
|
public String getProcessQualifiedNum() |
||||
|
{ |
||||
|
return processQualifiedNum; |
||||
|
} |
||||
|
public void setProcessUnqualifiedNum(String processUnqualifiedNum) |
||||
|
{ |
||||
|
this.processUnqualifiedNum = processUnqualifiedNum; |
||||
|
} |
||||
|
|
||||
|
public String getProcessUnqualifiedNum() |
||||
|
{ |
||||
|
return processUnqualifiedNum; |
||||
|
} |
||||
|
public void setManufacturingProcessCode(String manufacturingProcessCode) |
||||
|
{ |
||||
|
this.manufacturingProcessCode = manufacturingProcessCode; |
||||
|
} |
||||
|
|
||||
|
public String getManufacturingProcessCode() |
||||
|
{ |
||||
|
return manufacturingProcessCode; |
||||
|
} |
||||
|
public void setManufacturingProcessName(String manufacturingProcessName) |
||||
|
{ |
||||
|
this.manufacturingProcessName = manufacturingProcessName; |
||||
|
} |
||||
|
|
||||
|
public String getManufacturingProcessName() |
||||
|
{ |
||||
|
return manufacturingProcessName; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public String toString() { |
||||
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
||||
|
.append("manufacturingCheckoutId", getManufacturingCheckoutId()) |
||||
|
.append("manufacturingCheckoutCode", getManufacturingCheckoutCode()) |
||||
|
.append("makeNo", getMakeNo()) |
||||
|
.append("checkoutTime", getCheckoutTime()) |
||||
|
.append("materialNo", getMaterialNo()) |
||||
|
.append("materialName", getMaterialName()) |
||||
|
.append("materialTotal", getMaterialTotal()) |
||||
|
.append("numTotal", getNumTotal()) |
||||
|
.append("processQualifiedNum", getProcessQualifiedNum()) |
||||
|
.append("processUnqualifiedNum", getProcessUnqualifiedNum()) |
||||
|
.append("manufacturingProcessCode", getManufacturingProcessCode()) |
||||
|
.append("manufacturingProcessName", getManufacturingProcessName()) |
||||
|
.append("remark", getRemark()) |
||||
|
.append("createBy", getCreateBy()) |
||||
|
.append("createTime", getCreateTime()) |
||||
|
.append("updateBy", getUpdateBy()) |
||||
|
.append("updateTime", getUpdateTime()) |
||||
|
.toString(); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,77 @@ |
|||||
|
package com.ruoyi.quality.mapper; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import com.ruoyi.quality.domain.QualityManufacturingCheckout; |
||||
|
|
||||
|
/** |
||||
|
* 品质管理制程检验Mapper接口 |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-13 |
||||
|
*/ |
||||
|
public interface QualityManufacturingCheckoutMapper |
||||
|
{ |
||||
|
/** |
||||
|
* 查询品质管理制程检验 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 品质管理制程检验 |
||||
|
*/ |
||||
|
public QualityManufacturingCheckout selectQualityManufacturingCheckoutById(Long manufacturingCheckoutId); |
||||
|
|
||||
|
/** |
||||
|
* 查询品质管理制程检验列表 |
||||
|
* |
||||
|
* @param qualityManufacturingCheckout 品质管理制程检验 |
||||
|
* @return 品质管理制程检验集合 |
||||
|
*/ |
||||
|
public List<QualityManufacturingCheckout> selectQualityManufacturingCheckoutList(QualityManufacturingCheckout qualityManufacturingCheckout); |
||||
|
|
||||
|
/** |
||||
|
* 新增品质管理制程检验 |
||||
|
* |
||||
|
* @param qualityManufacturingCheckout 品质管理制程检验 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int insertQualityManufacturingCheckout(QualityManufacturingCheckout qualityManufacturingCheckout); |
||||
|
|
||||
|
/** |
||||
|
* 修改品质管理制程检验 |
||||
|
* |
||||
|
* @param qualityManufacturingCheckout 品质管理制程检验 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int updateQualityManufacturingCheckout(QualityManufacturingCheckout qualityManufacturingCheckout); |
||||
|
|
||||
|
/** |
||||
|
* 删除品质管理制程检验 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int deleteQualityManufacturingCheckoutById(Long manufacturingCheckoutId); |
||||
|
|
||||
|
/** |
||||
|
* 批量删除品质管理制程检验 |
||||
|
* |
||||
|
* @param manufacturingCheckoutIds 需要删除的数据ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int deleteQualityManufacturingCheckoutByIds(String[] manufacturingCheckoutIds); |
||||
|
|
||||
|
/** |
||||
|
* 作废品质管理制程检验 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int cancelQualityManufacturingCheckoutById(Long manufacturingCheckoutId); |
||||
|
|
||||
|
/** |
||||
|
* 恢复品质管理制程检验 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int restoreQualityManufacturingCheckoutById(Long manufacturingCheckoutId); |
||||
|
} |
||||
@ -0,0 +1,75 @@ |
|||||
|
package com.ruoyi.quality.service; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import com.ruoyi.quality.domain.QualityManufacturingCheckout; |
||||
|
|
||||
|
/** |
||||
|
* 品质管理制程检验Service接口 |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-13 |
||||
|
*/ |
||||
|
public interface IQualityManufacturingCheckoutService |
||||
|
{ |
||||
|
/** |
||||
|
* 查询品质管理制程检验 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 品质管理制程检验 |
||||
|
*/ |
||||
|
public QualityManufacturingCheckout selectQualityManufacturingCheckoutById(Long manufacturingCheckoutId); |
||||
|
|
||||
|
/** |
||||
|
* 查询品质管理制程检验列表 |
||||
|
* |
||||
|
* @param qualityManufacturingCheckout 品质管理制程检验 |
||||
|
* @return 品质管理制程检验集合 |
||||
|
*/ |
||||
|
public List<QualityManufacturingCheckout> selectQualityManufacturingCheckoutList(QualityManufacturingCheckout qualityManufacturingCheckout); |
||||
|
|
||||
|
/** |
||||
|
* 新增品质管理制程检验 |
||||
|
* |
||||
|
* @param qualityManufacturingCheckout 品质管理制程检验 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int insertQualityManufacturingCheckout(QualityManufacturingCheckout qualityManufacturingCheckout); |
||||
|
|
||||
|
/** |
||||
|
* 修改品质管理制程检验 |
||||
|
* |
||||
|
* @param qualityManufacturingCheckout 品质管理制程检验 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int updateQualityManufacturingCheckout(QualityManufacturingCheckout qualityManufacturingCheckout); |
||||
|
|
||||
|
/** |
||||
|
* 批量删除品质管理制程检验 |
||||
|
* |
||||
|
* @param ids 需要删除的数据ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int deleteQualityManufacturingCheckoutByIds(String ids); |
||||
|
|
||||
|
/** |
||||
|
* 删除品质管理制程检验信息 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int deleteQualityManufacturingCheckoutById(Long manufacturingCheckoutId); |
||||
|
|
||||
|
/** |
||||
|
* 作废品质管理制程检验 |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return |
||||
|
*/ |
||||
|
int cancelQualityManufacturingCheckoutById(Long manufacturingCheckoutId); |
||||
|
|
||||
|
/** |
||||
|
* 恢复品质管理制程检验 |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return |
||||
|
*/ |
||||
|
int restoreQualityManufacturingCheckoutById(Long manufacturingCheckoutId); |
||||
|
} |
||||
@ -0,0 +1,126 @@ |
|||||
|
package com.ruoyi.quality.service.impl; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import com.ruoyi.common.utils.DateUtils; |
||||
|
import com.ruoyi.common.utils.ShiroUtils; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
import com.ruoyi.quality.mapper.QualityManufacturingCheckoutMapper; |
||||
|
import com.ruoyi.quality.domain.QualityManufacturingCheckout; |
||||
|
import com.ruoyi.quality.service.IQualityManufacturingCheckoutService; |
||||
|
import com.ruoyi.common.core.text.Convert; |
||||
|
|
||||
|
/** |
||||
|
* 品质管理制程检验Service业务层处理 |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-13 |
||||
|
*/ |
||||
|
@Service |
||||
|
public class QualityManufacturingCheckoutServiceImpl implements IQualityManufacturingCheckoutService |
||||
|
{ |
||||
|
@Autowired |
||||
|
private QualityManufacturingCheckoutMapper qualityManufacturingCheckoutMapper; |
||||
|
|
||||
|
/** |
||||
|
* 查询品质管理制程检验 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 品质管理制程检验 |
||||
|
*/ |
||||
|
@Override |
||||
|
public QualityManufacturingCheckout selectQualityManufacturingCheckoutById(Long manufacturingCheckoutId) |
||||
|
{ |
||||
|
return qualityManufacturingCheckoutMapper.selectQualityManufacturingCheckoutById(manufacturingCheckoutId); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 查询品质管理制程检验列表 |
||||
|
* |
||||
|
* @param qualityManufacturingCheckout 品质管理制程检验 |
||||
|
* @return 品质管理制程检验 |
||||
|
*/ |
||||
|
@Override |
||||
|
public List<QualityManufacturingCheckout> selectQualityManufacturingCheckoutList(QualityManufacturingCheckout qualityManufacturingCheckout) |
||||
|
{ |
||||
|
return qualityManufacturingCheckoutMapper.selectQualityManufacturingCheckoutList(qualityManufacturingCheckout); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 新增品质管理制程检验 |
||||
|
* |
||||
|
* @param qualityManufacturingCheckout 品质管理制程检验 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int insertQualityManufacturingCheckout(QualityManufacturingCheckout qualityManufacturingCheckout) |
||||
|
{ |
||||
|
String loginName = ShiroUtils.getLoginName(); |
||||
|
qualityManufacturingCheckout.setCreateBy(loginName); |
||||
|
qualityManufacturingCheckout.setCreateTime(DateUtils.getNowDate()); |
||||
|
return qualityManufacturingCheckoutMapper.insertQualityManufacturingCheckout(qualityManufacturingCheckout); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 修改品质管理制程检验 |
||||
|
* |
||||
|
* @param qualityManufacturingCheckout 品质管理制程检验 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int updateQualityManufacturingCheckout(QualityManufacturingCheckout qualityManufacturingCheckout) |
||||
|
{ |
||||
|
String loginName = ShiroUtils.getLoginName(); |
||||
|
qualityManufacturingCheckout.setUpdateBy(loginName); |
||||
|
qualityManufacturingCheckout.setUpdateTime(DateUtils.getNowDate()); |
||||
|
return qualityManufacturingCheckoutMapper.updateQualityManufacturingCheckout(qualityManufacturingCheckout); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 删除品质管理制程检验对象 |
||||
|
* |
||||
|
* @param ids 需要删除的数据ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int deleteQualityManufacturingCheckoutByIds(String ids) |
||||
|
{ |
||||
|
return qualityManufacturingCheckoutMapper.deleteQualityManufacturingCheckoutByIds(Convert.toStrArray(ids)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 删除品质管理制程检验信息 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int deleteQualityManufacturingCheckoutById(Long manufacturingCheckoutId) |
||||
|
{ |
||||
|
return qualityManufacturingCheckoutMapper.deleteQualityManufacturingCheckoutById(manufacturingCheckoutId); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 作废品质管理制程检验 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int cancelQualityManufacturingCheckoutById(Long manufacturingCheckoutId) |
||||
|
{ |
||||
|
return qualityManufacturingCheckoutMapper.cancelQualityManufacturingCheckoutById(manufacturingCheckoutId); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 恢复品质管理制程检验信息 |
||||
|
* |
||||
|
* @param manufacturingCheckoutId 品质管理制程检验ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int restoreQualityManufacturingCheckoutById(Long manufacturingCheckoutId) |
||||
|
{ |
||||
|
return qualityManufacturingCheckoutMapper.restoreQualityManufacturingCheckoutById(manufacturingCheckoutId); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,130 @@ |
|||||
|
<?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.ruoyi.quality.mapper.QualityManufacturingCheckoutMapper"> |
||||
|
|
||||
|
<resultMap type="QualityManufacturingCheckout" id="QualityManufacturingCheckoutResult"> |
||||
|
<result property="manufacturingCheckoutId" column="manufacturing_checkout_id" /> |
||||
|
<result property="manufacturingCheckoutCode" column="manufacturing_checkout_code" /> |
||||
|
<result property="makeNo" column="make_no" /> |
||||
|
<result property="checkoutTime" column="checkout_time" /> |
||||
|
<result property="materialNo" column="material_no" /> |
||||
|
<result property="materialName" column="material_name" /> |
||||
|
<result property="materialTotal" column="material_total" /> |
||||
|
<result property="numTotal" column="num_total" /> |
||||
|
<result property="processQualifiedNum" column="process_qualified_num" /> |
||||
|
<result property="processUnqualifiedNum" column="process_unqualified_num" /> |
||||
|
<result property="manufacturingProcessCode" column="manufacturing_process_code" /> |
||||
|
<result property="manufacturingProcessName" column="manufacturing_process_name" /> |
||||
|
<result property="remark" column="remark" /> |
||||
|
<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> |
||||
|
|
||||
|
<sql id="selectQualityManufacturingCheckoutVo"> |
||||
|
select manufacturing_checkout_id, manufacturing_checkout_code, make_no, checkout_time, material_no, material_name, material_total, num_total, process_qualified_num, process_unqualified_num, manufacturing_process_code, manufacturing_process_name, remark, create_by, create_time, update_by, update_time from quality_manufacturing_checkout |
||||
|
</sql> |
||||
|
|
||||
|
<select id="selectQualityManufacturingCheckoutList" parameterType="QualityManufacturingCheckout" resultMap="QualityManufacturingCheckoutResult"> |
||||
|
<include refid="selectQualityManufacturingCheckoutVo"/> |
||||
|
<where> |
||||
|
<if test="manufacturingCheckoutCode != null and manufacturingCheckoutCode != ''"> and manufacturing_checkout_code = #{manufacturingCheckoutCode}</if> |
||||
|
<if test="makeNo != null and makeNo != ''"> and make_no = #{makeNo}</if> |
||||
|
<if test="params.beginCheckoutTime != null and params.beginCheckoutTime != '' and params.endCheckoutTime != null and params.endCheckoutTime != ''"> and checkout_time between #{params.beginCheckoutTime} and #{params.endCheckoutTime}</if> |
||||
|
<if test="materialNo != null and materialNo != ''"> and material_no = #{materialNo}</if> |
||||
|
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if> |
||||
|
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if> |
||||
|
</where> |
||||
|
</select> |
||||
|
|
||||
|
<select id="selectQualityManufacturingCheckoutById" parameterType="Long" resultMap="QualityManufacturingCheckoutResult"> |
||||
|
<include refid="selectQualityManufacturingCheckoutVo"/> |
||||
|
where manufacturing_checkout_id = #{manufacturingCheckoutId} |
||||
|
</select> |
||||
|
|
||||
|
<insert id="insertQualityManufacturingCheckout" parameterType="QualityManufacturingCheckout" useGeneratedKeys="true" keyProperty="manufacturingCheckoutId"> |
||||
|
insert into quality_manufacturing_checkout |
||||
|
<trim prefix="(" suffix=")" suffixOverrides=","> |
||||
|
<if test="manufacturingCheckoutCode != null">manufacturing_checkout_code,</if> |
||||
|
<if test="makeNo != null">make_no,</if> |
||||
|
<if test="checkoutTime != null">checkout_time,</if> |
||||
|
<if test="materialNo != null">material_no,</if> |
||||
|
<if test="materialName != null">material_name,</if> |
||||
|
<if test="materialTotal != null">material_total,</if> |
||||
|
<if test="numTotal != null">num_total,</if> |
||||
|
<if test="processQualifiedNum != null">process_qualified_num,</if> |
||||
|
<if test="processUnqualifiedNum != null">process_unqualified_num,</if> |
||||
|
<if test="manufacturingProcessCode != null">manufacturing_process_code,</if> |
||||
|
<if test="manufacturingProcessName != null">manufacturing_process_name,</if> |
||||
|
<if test="remark != null">remark,</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="manufacturingCheckoutCode != null">#{manufacturingCheckoutCode},</if> |
||||
|
<if test="makeNo != null">#{makeNo},</if> |
||||
|
<if test="checkoutTime != null">#{checkoutTime},</if> |
||||
|
<if test="materialNo != null">#{materialNo},</if> |
||||
|
<if test="materialName != null">#{materialName},</if> |
||||
|
<if test="materialTotal != null">#{materialTotal},</if> |
||||
|
<if test="numTotal != null">#{numTotal},</if> |
||||
|
<if test="processQualifiedNum != null">#{processQualifiedNum},</if> |
||||
|
<if test="processUnqualifiedNum != null">#{processUnqualifiedNum},</if> |
||||
|
<if test="manufacturingProcessCode != null">#{manufacturingProcessCode},</if> |
||||
|
<if test="manufacturingProcessName != null">#{manufacturingProcessName},</if> |
||||
|
<if test="remark != null">#{remark},</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> |
||||
|
|
||||
|
<update id="updateQualityManufacturingCheckout" parameterType="QualityManufacturingCheckout"> |
||||
|
update quality_manufacturing_checkout |
||||
|
<trim prefix="SET" suffixOverrides=","> |
||||
|
<if test="manufacturingCheckoutCode != null">manufacturing_checkout_code = #{manufacturingCheckoutCode},</if> |
||||
|
<if test="makeNo != null">make_no = #{makeNo},</if> |
||||
|
<if test="checkoutTime != null">checkout_time = #{checkoutTime},</if> |
||||
|
<if test="materialNo != null">material_no = #{materialNo},</if> |
||||
|
<if test="materialName != null">material_name = #{materialName},</if> |
||||
|
<if test="materialTotal != null">material_total = #{materialTotal},</if> |
||||
|
<if test="numTotal != null">num_total = #{numTotal},</if> |
||||
|
<if test="processQualifiedNum != null">process_qualified_num = #{processQualifiedNum},</if> |
||||
|
<if test="processUnqualifiedNum != null">process_unqualified_num = #{processUnqualifiedNum},</if> |
||||
|
<if test="manufacturingProcessCode != null">manufacturing_process_code = #{manufacturingProcessCode},</if> |
||||
|
<if test="manufacturingProcessName != null">manufacturing_process_name = #{manufacturingProcessName},</if> |
||||
|
<if test="remark != null">remark = #{remark},</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 manufacturing_checkout_id = #{manufacturingCheckoutId} |
||||
|
</update> |
||||
|
|
||||
|
<delete id="deleteQualityManufacturingCheckoutById" parameterType="Long"> |
||||
|
delete from quality_manufacturing_checkout where manufacturing_checkout_id = #{manufacturingCheckoutId} |
||||
|
</delete> |
||||
|
|
||||
|
<delete id="deleteQualityManufacturingCheckoutByIds" parameterType="String"> |
||||
|
delete from quality_manufacturing_checkout where manufacturing_checkout_id in |
||||
|
<foreach item="manufacturingCheckoutId" collection="array" open="(" separator="," close=")"> |
||||
|
#{manufacturingCheckoutId} |
||||
|
</foreach> |
||||
|
</delete> |
||||
|
|
||||
|
<update id="cancelQualityManufacturingCheckoutById" parameterType="Long"> |
||||
|
update quality_manufacturing_checkout set del_flag = '1' where manufacturing_checkout_id = #{manufacturingCheckoutId} |
||||
|
</update> |
||||
|
|
||||
|
<update id="restoreQualityManufacturingCheckoutById" parameterType="Long"> |
||||
|
update quality_manufacturing_checkout set del_flag = '0' where manufacturing_checkout_id = #{manufacturingCheckoutId} |
||||
|
</update> |
||||
|
|
||||
|
</mapper> |
||||
@ -0,0 +1,147 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> |
||||
|
<head> |
||||
|
<th:block th:include="include :: header('品质管理制程检验列表')" /> |
||||
|
</head> |
||||
|
<body class="gray-bg"> |
||||
|
<div class="container-div"> |
||||
|
<div class="row"> |
||||
|
<div class="col-sm-12 search-collapse"> |
||||
|
<form id="formId"> |
||||
|
<div class="select-list"> |
||||
|
<ul> |
||||
|
<li> |
||||
|
<label>制程检验单号：</label> |
||||
|
<input type="text" name="manufacturingCheckoutCode"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>生产单号：</label> |
||||
|
<input type="text" name="makeNo"/> |
||||
|
</li> |
||||
|
<li class="select-time"> |
||||
|
<label>检验时间：</label> |
||||
|
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCheckoutTime]"/> |
||||
|
<span>-</span> |
||||
|
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCheckoutTime]"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>料号：</label> |
||||
|
<input type="text" name="materialNo"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>物料名称：</label> |
||||
|
<input type="text" name="materialName"/> |
||||
|
</li> |
||||
|
<li class="select-time"> |
||||
|
<label>录入时间：</label> |
||||
|
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> |
||||
|
<span>-</span> |
||||
|
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
||||
|
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a> |
||||
|
</li> |
||||
|
</ul> |
||||
|
</div> |
||||
|
</form> |
||||
|
</div> |
||||
|
|
||||
|
<div class="btn-group-sm" id="toolbar" role="group"> |
||||
|
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="quality:manufacturingCheckout:add"> |
||||
|
<i class="fa fa-plus"></i> 添加 |
||||
|
</a> |
||||
|
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="quality:manufacturingCheckout:export"> |
||||
|
<i class="fa fa-download"></i> 导出 |
||||
|
</a> |
||||
|
</div> |
||||
|
<div class="col-sm-12 select-table table-striped"> |
||||
|
<table id="bootstrap-table"></table> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<script th:inline="javascript"> |
||||
|
var editFlag = [[${@permission.hasPermi('quality:manufacturingCheckout:edit')}]]; |
||||
|
var removeFlag = [[${@permission.hasPermi('quality:manufacturingCheckout:remove')}]]; |
||||
|
var cancelFlag = [[${@permission.hasPermi('quality:manufacturingCheckout:cancel')}]]; |
||||
|
var restoreFlag = [[${@permission.hasPermi('quality:manufacturingCheckout:restore')}]]; |
||||
|
var prefix = ctx + "quality/manufacturingCheckout"; |
||||
|
|
||||
|
$(function() { |
||||
|
var options = { |
||||
|
url: prefix + "/list", |
||||
|
createUrl: prefix + "/add", |
||||
|
updateUrl: prefix + "/edit/{id}", |
||||
|
removeUrl: prefix + "/remove", |
||||
|
cancelUrl: prefix + "/cancel/{id}", |
||||
|
restoreUrl: prefix + "/restore/{id}", |
||||
|
exportUrl: prefix + "/export", |
||||
|
modalName: "品质管理制程检验", |
||||
|
columns: [{ |
||||
|
checkbox: true |
||||
|
}, |
||||
|
{ |
||||
|
title: '制程检验Id', |
||||
|
field: 'manufacturingCheckoutId', |
||||
|
visible: false |
||||
|
}, |
||||
|
{ |
||||
|
title: '制程检验单号', |
||||
|
field: 'manufacturingCheckoutCode', |
||||
|
}, |
||||
|
{ |
||||
|
title: '关联生产单号', |
||||
|
field: 'makeNo', |
||||
|
}, |
||||
|
{ |
||||
|
title: '检验时间', |
||||
|
field: 'checkoutTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '物料数合计', |
||||
|
field: 'materialTotal', |
||||
|
}, |
||||
|
{ |
||||
|
title: '数量合计', |
||||
|
field: 'numTotal', |
||||
|
}, |
||||
|
{ |
||||
|
title: '制程工序合格数', |
||||
|
field: 'processQualifiedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '制程工序不合格数', |
||||
|
field: 'processUnqualifiedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '录入人', |
||||
|
field: 'createBy', |
||||
|
}, |
||||
|
{ |
||||
|
title: '录入时间', |
||||
|
field: 'createTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '更新人', |
||||
|
field: 'updateBy', |
||||
|
}, |
||||
|
{ |
||||
|
title: '上次更新时间', |
||||
|
field: 'updateTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '操作', |
||||
|
align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
var actions = []; |
||||
|
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.manufacturingCheckoutId + '\')"><i class="fa fa-edit"></i>编辑</a> '); |
||||
|
return actions.join(''); |
||||
|
} |
||||
|
}] |
||||
|
}; |
||||
|
$.table.init(options); |
||||
|
}); |
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
Loading…
Reference in new issue