From 461d9240eae649094c088f2ea45657f9e1cdee68 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 13 May 2024 15:38:17 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8C=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8Cdomian=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8CMapper=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8CMapper.xml=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8CService=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8CServiceIm?= =?UTF-8?q?pl=20=E6=96=B0=E5=A2=9E=E5=88=B6=E7=A8=8B=E5=B7=A5=E5=BA=8Fmanu?= =?UTF-8?q?facturingCheckout.html=20=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A1=AB=E5=85=85=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ualityManufacturingCheckoutController.java | 151 ++++++++++++++ .../domain/QualityManufacturingCheckout.java | 197 ++++++++++++++++++ .../QualityManufacturingCheckoutMapper.java | 77 +++++++ .../IQualityManufacturingCheckoutService.java | 75 +++++++ ...alityManufacturingCheckoutServiceImpl.java | 126 +++++++++++ .../QualityManufacturingCheckoutMapper.xml | 130 ++++++++++++ .../manufacturingCheckout.html | 147 +++++++++++++ 7 files changed, 903 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingCheckout.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingCheckoutService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingCheckoutMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/manufacturingCheckout.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java new file mode 100644 index 00000000..ff2da59f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java @@ -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 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 list = qualityManufacturingCheckoutService.selectQualityManufacturingCheckoutList(qualityManufacturingCheckout); + ExcelUtil util = new ExcelUtil(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)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingCheckout.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingCheckout.java new file mode 100644 index 00000000..14431b18 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingCheckout.java @@ -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(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMapper.java new file mode 100644 index 00000000..030d9eea --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMapper.java @@ -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 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); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingCheckoutService.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingCheckoutService.java new file mode 100644 index 00000000..ce42b5b3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingCheckoutService.java @@ -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 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); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutServiceImpl.java new file mode 100644 index 00000000..3e0bae32 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutServiceImpl.java @@ -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 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); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingCheckoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingCheckoutMapper.xml new file mode 100644 index 00000000..9c073c77 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingCheckoutMapper.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into quality_manufacturing_checkout + + 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, + + + #{manufacturingCheckoutCode}, + #{makeNo}, + #{checkoutTime}, + #{materialNo}, + #{materialName}, + #{materialTotal}, + #{numTotal}, + #{processQualifiedNum}, + #{processUnqualifiedNum}, + #{manufacturingProcessCode}, + #{manufacturingProcessName}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update quality_manufacturing_checkout + + manufacturing_checkout_code = #{manufacturingCheckoutCode}, + make_no = #{makeNo}, + checkout_time = #{checkoutTime}, + material_no = #{materialNo}, + material_name = #{materialName}, + material_total = #{materialTotal}, + num_total = #{numTotal}, + process_qualified_num = #{processQualifiedNum}, + process_unqualified_num = #{processUnqualifiedNum}, + manufacturing_process_code = #{manufacturingProcessCode}, + manufacturing_process_name = #{manufacturingProcessName}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where manufacturing_checkout_id = #{manufacturingCheckoutId} + + + + delete from quality_manufacturing_checkout where manufacturing_checkout_id = #{manufacturingCheckoutId} + + + + delete from quality_manufacturing_checkout where manufacturing_checkout_id in + + #{manufacturingCheckoutId} + + + + + update quality_manufacturing_checkout set del_flag = '1' where manufacturing_checkout_id = #{manufacturingCheckoutId} + + + + update quality_manufacturing_checkout set del_flag = '0' where manufacturing_checkout_id = #{manufacturingCheckoutId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/manufacturingCheckout.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/manufacturingCheckout.html new file mode 100644 index 00000000..0e43a9ec --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/manufacturingCheckout.html @@ -0,0 +1,147 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file