From e971f3e10db60982a5c1b67dff47c8bf3a04d679 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 25 Apr 2024 14:18:04 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=B8=8D=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E5=93=81=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 1 + .../RecordExceptionProcessController.java | 102 +++++ .../report/domain/RecordExceptionProcess.java | 402 ++++++++++++++++++ .../report/domain/WeldLeakRateReport.java | 62 ++- .../mapper/RecordExceptionProcessMapper.java | 65 +++ .../IRecordExceptionProcessService.java | 61 +++ .../RecordExceptionProcessServiceImpl.java | 115 +++++ .../mapper/report/GeneralReportMapper.xml | 3 +- .../report/RecordExceptionProcessMapper.xml | 217 ++++++++++ 9 files changed, 1019 insertions(+), 9 deletions(-) create mode 100644 aucma-report/src/main/java/com/aucma/report/controller/RecordExceptionProcessController.java create mode 100644 aucma-report/src/main/java/com/aucma/report/domain/RecordExceptionProcess.java create mode 100644 aucma-report/src/main/java/com/aucma/report/mapper/RecordExceptionProcessMapper.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/IRecordExceptionProcessService.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/impl/RecordExceptionProcessServiceImpl.java create mode 100644 aucma-report/src/main/resources/mapper/report/RecordExceptionProcessMapper.xml diff --git a/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java b/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java index e03d623..4cc90bd 100644 --- a/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java +++ b/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java @@ -94,6 +94,7 @@ public class SysLoginController ajax.put("factoryCode", "1301"); ajax.put("factoryName", "河南民权工厂"); List postList = postService.selectPostListByUserId(user.getUserId()); + ajax.put("postList", postList); if (postList.contains(9L)){ //超级返修措施权限 ajax.put("userPermission", 2); diff --git a/aucma-report/src/main/java/com/aucma/report/controller/RecordExceptionProcessController.java b/aucma-report/src/main/java/com/aucma/report/controller/RecordExceptionProcessController.java new file mode 100644 index 0000000..1e3a83f --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/controller/RecordExceptionProcessController.java @@ -0,0 +1,102 @@ +package com.aucma.report.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.aucma.common.utils.DateUtils; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.report.domain.RecordExceptionProcess; +import com.aucma.report.service.IRecordExceptionProcessService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 不合格品流程管理Controller + * + * @author Yinq + * @date 2024-04-24 + */ +@RestController +@RequestMapping("/report/exceptionProcess") +public class RecordExceptionProcessController extends BaseController { + @Autowired + private IRecordExceptionProcessService recordExceptionProcessService; + + /** + * 查询不合格品流程管理列表 + */ + @PreAuthorize("@ss.hasPermi('report:exceptionProcess:list')") + @GetMapping("/list") + public TableDataInfo list(RecordExceptionProcess recordExceptionProcess) { + startPage(); + List list = recordExceptionProcessService.selectRecordExceptionProcessList(recordExceptionProcess); + return getDataTable(list); + } + + /** + * 导出不合格品流程管理列表 + */ + @PreAuthorize("@ss.hasPermi('report:exceptionProcess:export')") + @Log(title = "不合格品流程管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RecordExceptionProcess recordExceptionProcess) { + List list = recordExceptionProcessService.selectRecordExceptionProcessList(recordExceptionProcess); + ExcelUtil util = new ExcelUtil(RecordExceptionProcess.class); + util.exportExcel(response, list, "不合格品流程管理数据"); + } + + /** + * 获取不合格品流程管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('report:exceptionProcess:query')") + @GetMapping(value = "/{objId}") + public AjaxResult getInfo(@PathVariable("objId") Long objId) { + return success(recordExceptionProcessService.selectRecordExceptionProcessByObjId(objId)); + } + + /** + * 新增不合格品流程管理 + */ +// @PreAuthorize("@ss.hasPermi('report:exceptionProcess:add')") + @Log(title = "不合格品流程管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody RecordExceptionProcess recordExceptionProcess) { + + return toAjax(recordExceptionProcessService.insertRecordExceptionProcess(recordExceptionProcess)); + } + + /** + * 修改不合格品流程管理 + */ +// @PreAuthorize("@ss.hasPermi('report:exceptionProcess:edit')") + @Log(title = "不合格品流程管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody RecordExceptionProcess recordExceptionProcess) { + recordExceptionProcess.setUpdatedBy(getUsername()); + recordExceptionProcess.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(recordExceptionProcessService.updateRecordExceptionProcess(recordExceptionProcess)); + } + + /** + * 删除不合格品流程管理 + */ + @PreAuthorize("@ss.hasPermi('report:exceptionProcess:remove')") + @Log(title = "不合格品流程管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(recordExceptionProcessService.deleteRecordExceptionProcessByObjIds(objIds)); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/RecordExceptionProcess.java b/aucma-report/src/main/java/com/aucma/report/domain/RecordExceptionProcess.java new file mode 100644 index 0000000..3986492 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/RecordExceptionProcess.java @@ -0,0 +1,402 @@ +package com.aucma.report.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.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; + +/** + * 不合格品流程管理对象 record_exception_process + * + * @author Yinq + * @date 2024-04-24 + */ +public class RecordExceptionProcess extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long objId; + + /** + * MES箱体码 + */ + @Excel(name = "MES箱体码") + private String boxBarcode; + + /** + * 产线编号 + */ + @Excel(name = "产线编号") + private String productLineCode; + + /** + * 产线名称 + */ + @Excel(name = "产线名称") + private String productLineName; + + /** + * SAP订单编号 + */ + @Excel(name = "SAP订单编号") + private String orderCode; + + /** 物料型号 */ + @Excel(name = "物料型号") + private String materialModel; + + /** + * 流转标识（1=正常流转，2=质管员拒绝，3=生产经理拒绝，4=质量经理拒绝,9=流转完成） + */ + @Excel(name = "流转标识", readConverterExp = "1=正常流转,2=质管员拒绝,3=生产经理拒绝,4=质量经理拒绝,9=流转完成") + private String productionUserFlag; + + /** + * 班组 + */ + @Excel(name = "班组") + private String teamCode; + + /** + * 申请原因 + */ + @Excel(name = "申请原因") + private String applyReason; + + /** + * 申请时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date applyTime; + + /** + * 质管员标识 + */ + @Excel(name = "质管员标识", readConverterExp = "1=同意,2=拒绝") + private String qualityUserFlag; + + /** + * 不合格原因 + */ + @Excel(name = "不合格原因") + private String failureReason; + + /** + * 不合格类型（1=降级品） + */ +// @Excel(name = "不合格类型", readConverterExp = "1==降级品") + private String failureType; + + /** + * 质管员审核时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "质管员审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date qualityUserTime; + + /** + * 生产经理标识 + */ + @Excel(name = "生产经理标识", readConverterExp = "1=同意,2=拒绝") + private String productionManagerFlag; + + /** + * 生产经理审核时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "生产经理审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date productionManagerTime; + + /** + * 质量经理标识 + */ + @Excel(name = "质量经理标识", readConverterExp = "1=同意,2=拒绝") + private String qualityManagerFlag; + + /** + * 质量经理审核时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "质量经理审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date qualityManagerTime; + + /** + * 巡检班长编号 + */ + @Excel(name = "巡检班长编号") + private String inspectionUserCode; + + /** + * 巡检班长消息标识 + */ + @Excel(name = "巡检班长消息标识") + private String inspectionUserFlag; + + /** + * 图片地址 + */ + @Excel(name = "图片地址") + private String imageAddress; + + /** + * 创建人 + */ + @Excel(name = "创建人") + private String createdBy; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + /** + * 修改人 + */ + @Excel(name = "修改人") + private String updatedBy; + + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + + + public String getProductLineCode() { + return productLineCode; + } + + public void setProductLineCode(String productLineCode) { + this.productLineCode = productLineCode; + } + + public String getProductLineName() { + return productLineName; + } + + public void setProductLineName(String productLineName) { + this.productLineName = productLineName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getMaterialModel() { + return materialModel; + } + + public void setMaterialModel(String materialModel) { + this.materialModel = materialModel; + } + + public void setObjId(Long objId) { + this.objId = objId; + } + + public Long getObjId() { + return objId; + } + + public void setBoxBarcode(String boxBarcode) { + this.boxBarcode = boxBarcode; + } + + public String getBoxBarcode() { + return boxBarcode; + } + + public void setProductionUserFlag(String productionUserFlag) { + this.productionUserFlag = productionUserFlag; + } + + public String getProductionUserFlag() { + return productionUserFlag; + } + + public void setTeamCode(String teamCode) { + this.teamCode = teamCode; + } + + public String getTeamCode() { + return teamCode; + } + + public void setApplyReason(String applyReason) { + this.applyReason = applyReason; + } + + public String getApplyReason() { + return applyReason; + } + + public void setApplyTime(Date applyTime) { + this.applyTime = applyTime; + } + + public Date getApplyTime() { + return applyTime; + } + + public void setQualityUserFlag(String qualityUserFlag) { + this.qualityUserFlag = qualityUserFlag; + } + + public String getQualityUserFlag() { + return qualityUserFlag; + } + + public void setFailureReason(String failureReason) { + this.failureReason = failureReason; + } + + public String getFailureReason() { + return failureReason; + } + + public void setFailureType(String failureType) { + this.failureType = failureType; + } + + public String getFailureType() { + return failureType; + } + + public void setQualityUserTime(Date qualityUserTime) { + this.qualityUserTime = qualityUserTime; + } + + public Date getQualityUserTime() { + return qualityUserTime; + } + + public void setProductionManagerFlag(String productionManagerFlag) { + this.productionManagerFlag = productionManagerFlag; + } + + public String getProductionManagerFlag() { + return productionManagerFlag; + } + + public void setProductionManagerTime(Date productionManagerTime) { + this.productionManagerTime = productionManagerTime; + } + + public Date getProductionManagerTime() { + return productionManagerTime; + } + + public void setQualityManagerFlag(String qualityManagerFlag) { + this.qualityManagerFlag = qualityManagerFlag; + } + + public String getQualityManagerFlag() { + return qualityManagerFlag; + } + + public void setQualityManagerTime(Date qualityManagerTime) { + this.qualityManagerTime = qualityManagerTime; + } + + public Date getQualityManagerTime() { + return qualityManagerTime; + } + + public void setInspectionUserCode(String inspectionUserCode) { + this.inspectionUserCode = inspectionUserCode; + } + + public String getInspectionUserCode() { + return inspectionUserCode; + } + + public void setInspectionUserFlag(String inspectionUserFlag) { + this.inspectionUserFlag = inspectionUserFlag; + } + + public String getInspectionUserFlag() { + return inspectionUserFlag; + } + + public void setImageAddress(String imageAddress) { + this.imageAddress = imageAddress; + } + + public String getImageAddress() { + return imageAddress; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; + } + + public Date getCreatedTime() { + return createdTime; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedTime(Date updatedTime) { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() { + return updatedTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("boxBarcode", getBoxBarcode()) + .append("productionUserFlag", getProductionUserFlag()) + .append("teamCode", getTeamCode()) + .append("applyReason", getApplyReason()) + .append("applyTime", getApplyTime()) + .append("qualityUserFlag", getQualityUserFlag()) + .append("failureReason", getFailureReason()) + .append("failureType", getFailureType()) + .append("qualityUserTime", getQualityUserTime()) + .append("productionManagerFlag", getProductionManagerFlag()) + .append("productionManagerTime", getProductionManagerTime()) + .append("qualityManagerFlag", getQualityManagerFlag()) + .append("qualityManagerTime", getQualityManagerTime()) + .append("inspectionUserCode", getInspectionUserCode()) + .append("inspectionUserFlag", getInspectionUserFlag()) + .append("imageAddress", getImageAddress()) + .append("remark", getRemark()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .toString(); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/WeldLeakRateReport.java b/aucma-report/src/main/java/com/aucma/report/domain/WeldLeakRateReport.java index 2bc5258..171f240 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/WeldLeakRateReport.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/WeldLeakRateReport.java @@ -28,11 +28,25 @@ public class WeldLeakRateReport extends BaseEntity { private String PRODUCT_LINE_NAME; /** - * 产品型号 + * 周数 */ - @Excel(name = "产品型号") - @JsonProperty("MATERIAL_MODEL") - private String MATERIAL_MODEL; + @Excel(name = "周数") + @JsonProperty("WEEK_NUMBER") + private Long WEEK_NUMBER; + + /** + * 开始时间 + */ + @Excel(name = "开始时间") + @JsonProperty("WEEK_START") + private String WEEK_START; + + /** + * 结束时间 + */ + @Excel(name = "结束时间") + @JsonProperty("WEEK_END") + private String WEEK_END; /** * 检验数 @@ -71,12 +85,28 @@ public class WeldLeakRateReport extends BaseEntity { this.PRODUCT_LINE_NAME = PRODUCT_LINE_NAME; } - public String getMATERIAL_MODEL() { - return MATERIAL_MODEL; + public Long getWEEK_NUMBER() { + return WEEK_NUMBER; } - public void setMATERIAL_MODEL(String MATERIAL_MODEL) { - this.MATERIAL_MODEL = MATERIAL_MODEL; + public void setWEEK_NUMBER(Long WEEK_NUMBER) { + this.WEEK_NUMBER = WEEK_NUMBER; + } + + public String getWEEK_START() { + return WEEK_START; + } + + public void setWEEK_START(String WEEK_START) { + this.WEEK_START = WEEK_START; + } + + public String getWEEK_END() { + return WEEK_END; + } + + public void setWEEK_END(String WEEK_END) { + this.WEEK_END = WEEK_END; } public Long getQ_SUM() { @@ -86,4 +116,20 @@ public class WeldLeakRateReport extends BaseEntity { public void setQ_SUM(Long q_SUM) { Q_SUM = q_SUM; } + + public Long getLEAK_SUM() { + return LEAK_SUM; + } + + public void setLEAK_SUM(Long LEAK_SUM) { + this.LEAK_SUM = LEAK_SUM; + } + + public String getREPAIR_RATE() { + return REPAIR_RATE; + } + + public void setREPAIR_RATE(String REPAIR_RATE) { + this.REPAIR_RATE = REPAIR_RATE; + } } diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/RecordExceptionProcessMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/RecordExceptionProcessMapper.java new file mode 100644 index 0000000..d7108ff --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/mapper/RecordExceptionProcessMapper.java @@ -0,0 +1,65 @@ +package com.aucma.report.mapper; + +import java.util.List; +import com.aucma.report.domain.RecordExceptionProcess; +import org.apache.ibatis.annotations.Param; + +/** + * 不合格品流程管理Mapper接口 + * + * @author Yinq + * @date 2024-04-24 + */ +public interface RecordExceptionProcessMapper +{ + /** + * 查询不合格品流程管理 + * + * @param objId 不合格品流程管理主键 + * @return 不合格品流程管理 + */ + public RecordExceptionProcess selectRecordExceptionProcessByObjId(Long objId); + + /** + * 查询不合格品流程管理列表 + * + * @param recordExceptionProcess 不合格品流程管理 + * @return 不合格品流程管理集合 + */ + public List selectRecordExceptionProcessList(RecordExceptionProcess recordExceptionProcess); + + /** + * 新增不合格品流程管理 + * + * @param recordExceptionProcess 不合格品流程管理 + * @return 结果 + */ + public int insertRecordExceptionProcess(RecordExceptionProcess recordExceptionProcess); + + /** + * 修改不合格品流程管理 + * + * @param recordExceptionProcess 不合格品流程管理 + * @return 结果 + */ + public int updateRecordExceptionProcess(RecordExceptionProcess recordExceptionProcess); + + /** + * 删除不合格品流程管理 + * + * @param objId 不合格品流程管理主键 + * @return 结果 + */ + public int deleteRecordExceptionProcessByObjId(Long objId); + + /** + * 批量删除不合格品流程管理 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRecordExceptionProcessByObjIds(Long[] objIds); + + public String checkBoxBarcode(@Param("boxBarcode") String boxBarcode); + +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/IRecordExceptionProcessService.java b/aucma-report/src/main/java/com/aucma/report/service/IRecordExceptionProcessService.java new file mode 100644 index 0000000..236819f --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/IRecordExceptionProcessService.java @@ -0,0 +1,61 @@ +package com.aucma.report.service; + +import java.util.List; +import com.aucma.report.domain.RecordExceptionProcess; + +/** + * 不合格品流程管理Service接口 + * + * @author Yinq + * @date 2024-04-24 + */ +public interface IRecordExceptionProcessService +{ + /** + * 查询不合格品流程管理 + * + * @param objId 不合格品流程管理主键 + * @return 不合格品流程管理 + */ + public RecordExceptionProcess selectRecordExceptionProcessByObjId(Long objId); + + /** + * 查询不合格品流程管理列表 + * + * @param recordExceptionProcess 不合格品流程管理 + * @return 不合格品流程管理集合 + */ + public List selectRecordExceptionProcessList(RecordExceptionProcess recordExceptionProcess); + + /** + * 新增不合格品流程管理 + * + * @param recordExceptionProcess 不合格品流程管理 + * @return 结果 + */ + public int insertRecordExceptionProcess(RecordExceptionProcess recordExceptionProcess); + + /** + * 修改不合格品流程管理 + * + * @param recordExceptionProcess 不合格品流程管理 + * @return 结果 + */ + public int updateRecordExceptionProcess(RecordExceptionProcess recordExceptionProcess); + + /** + * 批量删除不合格品流程管理 + * + * @param objIds 需要删除的不合格品流程管理主键集合 + * @return 结果 + */ + public int deleteRecordExceptionProcessByObjIds(Long[] objIds); + + /** + * 删除不合格品流程管理信息 + * + * @param objId 不合格品流程管理主键 + * @return 结果 + */ + public int deleteRecordExceptionProcessByObjId(Long objId); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/RecordExceptionProcessServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordExceptionProcessServiceImpl.java new file mode 100644 index 0000000..f304fd8 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordExceptionProcessServiceImpl.java @@ -0,0 +1,115 @@ +package com.aucma.report.service.impl; + +import java.util.List; + +import com.aucma.common.exception.ServiceException; +import com.aucma.common.utils.DateUtils; +import com.aucma.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.report.mapper.RecordExceptionProcessMapper; +import com.aucma.report.domain.RecordExceptionProcess; +import com.aucma.report.service.IRecordExceptionProcessService; + +import static com.aucma.common.utils.SecurityUtils.getUsername; + +/** + * 不合格品流程管理Service业务层处理 + * + * @author Yinq + * @date 2024-04-24 + */ +@Service +public class RecordExceptionProcessServiceImpl implements IRecordExceptionProcessService +{ + @Autowired + private RecordExceptionProcessMapper recordExceptionProcessMapper; + + /** + * 查询不合格品流程管理 + * + * @param objId 不合格品流程管理主键 + * @return 不合格品流程管理 + */ + @Override + public RecordExceptionProcess selectRecordExceptionProcessByObjId(Long objId) + { + return recordExceptionProcessMapper.selectRecordExceptionProcessByObjId(objId); + } + + /** + * 查询不合格品流程管理列表 + * + * @param recordExceptionProcess 不合格品流程管理 + * @return 不合格品流程管理 + */ + @Override + public List selectRecordExceptionProcessList(RecordExceptionProcess recordExceptionProcess) + { + return recordExceptionProcessMapper.selectRecordExceptionProcessList(recordExceptionProcess); + } + + /** + * 新增不合格品流程管理 + * + * @param recordExceptionProcess 不合格品流程管理 + * @return 结果 + */ + @Override + public int insertRecordExceptionProcess(RecordExceptionProcess recordExceptionProcess) + { + if (StringUtils.isNotNull(recordExceptionProcess.getBoxBarcode())){ + String boxBarcode = recordExceptionProcessMapper.checkBoxBarcode(recordExceptionProcess.getBoxBarcode()); + if (StringUtils.isEmpty(boxBarcode)){ + throw new ServiceException("箱体码输入错误，请重新输入！"); + } + } + RecordExceptionProcess exceptionProcess = new RecordExceptionProcess(); + exceptionProcess.setBoxBarcode(recordExceptionProcess.getBoxBarcode()); + exceptionProcess.setProductionUserFlag("1"); + List processList = recordExceptionProcessMapper.selectRecordExceptionProcessList(exceptionProcess); + if (processList.size() > 0){ + throw new ServiceException("该箱体码正在流转审批,请勿重复提交流程！"); + } + recordExceptionProcess.setCreatedBy(getUsername()); + recordExceptionProcess.setCreatedTime(DateUtils.getNowDate()); + recordExceptionProcess.setApplyTime(DateUtils.getNowDate()); + return recordExceptionProcessMapper.insertRecordExceptionProcess(recordExceptionProcess); + } + + /** + * 修改不合格品流程管理 + * + * @param recordExceptionProcess 不合格品流程管理 + * @return 结果 + */ + @Override + public int updateRecordExceptionProcess(RecordExceptionProcess recordExceptionProcess) + { + return recordExceptionProcessMapper.updateRecordExceptionProcess(recordExceptionProcess); + } + + /** + * 批量删除不合格品流程管理 + * + * @param objIds 需要删除的不合格品流程管理主键 + * @return 结果 + */ + @Override + public int deleteRecordExceptionProcessByObjIds(Long[] objIds) + { + return recordExceptionProcessMapper.deleteRecordExceptionProcessByObjIds(objIds); + } + + /** + * 删除不合格品流程管理信息 + * + * @param objId 不合格品流程管理主键 + * @return 结果 + */ + @Override + public int deleteRecordExceptionProcessByObjId(Long objId) + { + return recordExceptionProcessMapper.deleteRecordExceptionProcessByObjId(objId); + } +} diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index b33631e..2716834 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -804,7 +804,8 @@ WEEK_END, NVL(COUNT(*), 0) Q_SUM, NVL(SUM(LEAK_SUM), 0) LEAK_SUM, - TO_CHAR(ROUND(SUM(LEAK_SUM) / COUNT(*) * 100, 2), 'FM99990.00') REPAIR_RATE + TO_CHAR(ROUND(SUM(LEAK_SUM) / COUNT(*) * 100, 2), 'FM99990.00') REPAIR_RATE, + '二线' PRODUCT_LINE_NAME FROM ( SELECT TO_NUMBER(COLUMN_A) WEEK_NUMBER, COLUMN_B WEEK_START, diff --git a/aucma-report/src/main/resources/mapper/report/RecordExceptionProcessMapper.xml b/aucma-report/src/main/resources/mapper/report/RecordExceptionProcessMapper.xml new file mode 100644 index 0000000..13219c7 --- /dev/null +++ b/aucma-report/src/main/resources/mapper/report/RecordExceptionProcessMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select rep.obj_id, + PB.ORDER_CODE orderCode, + BP.PRODUCT_LINE_CODE productLineCode, + BP.PRODUCT_LINE_NAME productLineName, + rep.box_barcode, + ML.MATERIAL_SPECIFICATIONS materialModel, + rep.production_user_flag, + rep.team_code, + rep.apply_reason, + rep.apply_time, + rep.quality_user_flag, + rep.failure_reason, + rep.failure_type, + rep.quality_user_time, + rep.production_manager_flag, + rep.production_manager_time, + rep.quality_manager_flag, + rep.quality_manager_time, + rep.inspection_user_code, + rep.inspection_user_flag, + rep.image_address, + rep.remark, + rep.created_by, + rep.created_time, + rep.updated_by, + rep.updated_time + from record_exception_process rep + left join C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = rep.BOX_BARCODE + left join BASE_ORDERINFO bo on bo.ORDER_CODE = pb.ORDER_CODE + left join BASE_PRODUCTLINE BP ON BP.WORK_CENTER_CODE = BO.WORK_CENTER_CODE + LEFT JOIN BASE_MATERIALINFO ML ON ML.MATERIAL_CODE = PB.MATERIAL_CODE + + + + + + + + + + + + SELECT seq_record_exception_process.NEXTVAL as objId FROM DUAL + + insert into record_exception_process + + obj_id, + box_barcode, + production_user_flag, + team_code, + apply_reason, + apply_time, + quality_user_flag, + failure_reason, + failure_type, + quality_user_time, + production_manager_flag, + production_manager_time, + quality_manager_flag, + quality_manager_time, + inspection_user_code, + inspection_user_flag, + image_address, + remark, + created_by, + created_time, + updated_by, + updated_time, + + + #{objId}, + #{boxBarcode}, + #{productionUserFlag}, + #{teamCode}, + #{applyReason}, + #{applyTime}, + #{qualityUserFlag}, + #{failureReason}, + #{failureType}, + #{qualityUserTime}, + #{productionManagerFlag}, + #{productionManagerTime}, + #{qualityManagerFlag}, + #{qualityManagerTime}, + #{inspectionUserCode}, + #{inspectionUserFlag}, + #{imageAddress}, + #{remark}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update record_exception_process + + box_barcode = #{boxBarcode}, + production_user_flag = #{productionUserFlag}, + team_code = #{teamCode}, + apply_reason = #{applyReason}, + apply_time = #{applyTime}, + quality_user_flag = #{qualityUserFlag}, + failure_reason = #{failureReason}, + failure_type = #{failureType}, + quality_user_time = #{qualityUserTime}, + production_manager_flag = #{productionManagerFlag}, + production_manager_time = #{productionManagerTime}, + quality_manager_flag = #{qualityManagerFlag}, + quality_manager_time = #{qualityManagerTime}, + inspection_user_code = #{inspectionUserCode}, + inspection_user_flag = #{inspectionUserFlag}, + image_address = #{imageAddress}, + remark = #{remark}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete + from record_exception_process + where obj_id = #{objId} + + + + delete from record_exception_process where obj_id in + + #{objId} + + + \ No newline at end of file