From 040ffed149baa741b1de65bc3f1f4eb8d2cd4ef6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 12 Sep 2024 23:53:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8Fcpk=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/device/EquEquipmentDTO.java | 39 +++++ .../com/op/mes/domain/MesPrepareDetail.java | 9 ++ .../impl/MesPrepareDetailServiceImpl.java | 22 ++- .../mapper/mes/MesReportWorkMapper.xml | 7 +- .../op/open/controller/OpenController.java | 10 ++ .../java/com/op/open/mapper/OpenMapper.java | 4 + .../java/com/op/open/service/OpenService.java | 3 + .../op/open/service/impl/OpenServiceImpl.java | 67 +++++++- .../QcProductCpkUpdownController.java | 111 +++++++++++++ .../op/quality/domain/QcProductCpkUpdown.java | 153 ++++++++++++++++++ .../mapper/QcProductCpkUpdownMapper.java | 64 ++++++++ .../service/IQcProductCpkUpdownService.java | 64 ++++++++ .../impl/QcProductCpkUpdownServiceImpl.java | 104 ++++++++++++ .../impl/QcStaticTableServiceImpl.java | 1 + .../quality/QcCheckReportIncomeMapper.xml | 2 +- .../quality/QcCheckTaskIncomeMapper.xml | 2 +- .../quality/QcCheckTaskInventoryMapper.xml | 40 ++++- .../quality/QcProductCpkUpdownMapper.xml | 152 +++++++++++++++++ 18 files changed, 841 insertions(+), 13 deletions(-) create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/controller/QcProductCpkUpdownController.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/domain/QcProductCpkUpdown.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProductCpkUpdownMapper.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/IQcProductCpkUpdownService.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProductCpkUpdownServiceImpl.java create mode 100644 op-modules/op-quality/src/main/resources/mapper/quality/QcProductCpkUpdownMapper.xml diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquEquipmentDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquEquipmentDTO.java index 1cbb4b54..85521ca2 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquEquipmentDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquEquipmentDTO.java @@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date; +import java.util.List; /** * 设备管理对象 base_equipment @@ -156,6 +157,44 @@ public class EquEquipmentDTO extends BaseEntity { @Excel(name = "SAP资产号") private String sapAsset; + private String factoryCode; + private String sapCode; + private String sapName; + + private List details; + + public List getDetails() { + return details; + } + + public void setDetails(List details) { + this.details = details; + } + + public String getSapCode() { + return sapCode; + } + + public void setSapCode(String sapCode) { + this.sapCode = sapCode; + } + + public String getSapName() { + return sapName; + } + + public void setSapName(String sapName) { + this.sapName = sapName; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + public void setEquipmentId(Long equipmentId) { this.equipmentId = equipmentId; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java index d1754627..5c26bc03 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java @@ -119,6 +119,15 @@ public class MesPrepareDetail extends BaseEntity { private String workorderCode; private String parentOrder; private String prodLineCode; + private int xh; + + public int getXh() { + return xh; + } + + public void setXh(int xh) { + this.xh = xh; + } public String getProductDateStr() { return productDateStr; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java index fefd8f1d..a997aa3a 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java @@ -113,11 +113,16 @@ public class MesPrepareDetailServiceImpl implements IMesPrepareDetailService { .replace("\"","") .replace("\"","") .replace("]]","")); + mesPrepareDetailList = mesPrepareDetailList.stream() + .filter(dto ->!dto.getQuantity().equals("0.00")) + .collect(Collectors.toList()); PrintPrepareVo printPrepareVo = new PrintPrepareVo(); printPrepareVo.setMesPrepare(mesPrepare); - printPrepareVo.setMesPrepareDetailList(mesPrepareDetailList.stream() - .filter(dto ->!dto.getQuantity().equals("0.00")) - .collect(Collectors.toList())); + int i = 1; + for(MesPrepareDetail dto:mesPrepareDetailList){ + dto.setXh(i++); + } + printPrepareVo.setMesPrepareDetailList(mesPrepareDetailList); return AjaxResult.success(printPrepareVo); } @@ -134,11 +139,16 @@ public class MesPrepareDetailServiceImpl implements IMesPrepareDetailService { qodetail.setProductDateStr(productDate); qodetail.setRecoil("X"); List mesPrepareDetailList = mesPrepareDetailMapper.selectPreDetailHzList(qodetail); + mesPrepareDetailList = mesPrepareDetailList.stream() + .filter(dto ->!dto.getQuantity().equals("0.00")) + .collect(Collectors.toList()); + int i = 1; + for(MesPrepareDetail dto:mesPrepareDetailList){ + dto.setXh(i++); + } PrintPrepareVo printPrepareVo = new PrintPrepareVo(); printPrepareVo.setMesPrepare(mesPrepare); - printPrepareVo.setMesPrepareDetailList(mesPrepareDetailList.stream() - .filter(dto ->!dto.getQuantity().equals("0.00")) - .collect(Collectors.toList())); + printPrepareVo.setMesPrepareDetailList(mesPrepareDetailList); return AjaxResult.success(printPrepareVo); } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 916dcf51..caedb7d4 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -955,9 +955,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index 97a431b3..5569f571 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -10,6 +10,7 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.common.datasource.creator.DynamicDatasourceCreator; import com.op.open.service.OpenService; import com.op.system.api.domain.DataSourcePropertyDTO; +import com.op.system.api.domain.device.EquEquipmentDTO; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WechartDTO; @@ -257,4 +258,13 @@ public class OpenController extends BaseController { public AjaxResult sendProductCheckNo(@RequestBody List dots) { return openService.sendProductCheckNo(dots); } + + //给oa提供的设备sap设备增加 + @PostMapping("/addEquSapInfo") + public AjaxResult addEquSapInfo(@RequestBody EquEquipmentDTO dto) { + if(StringUtils.isNotBlank(dto.getFactoryCode())){ + return error("[factoryCode] is null "); + } + return openService.addEquSapInfo(dto); + } } diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java index e8d52529..6a3a9824 100644 --- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java +++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java @@ -96,5 +96,9 @@ public interface OpenMapper { int updateProductNoBatchs(@Param("list") List updates); int addProductNoBatchs(@Param("list")List everyList); +// +// int updateEquBatchs(@Param("list") List updates); +// +// int addEquBatchs(@Param("list") List everyList); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java index 8baf0832..2e764755 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java @@ -1,6 +1,7 @@ package com.op.open.service; import com.op.common.core.web.domain.AjaxResult; +import com.op.system.api.domain.device.EquEquipmentDTO; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WechartDTO; @@ -43,4 +44,6 @@ public interface OpenService { AjaxResult getDeliveryNoteDetail(Map paramMap); AjaxResult sendProductCheckNo(List dots); + + AjaxResult addEquSapInfo(EquEquipmentDTO dto); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index b1f8ca10..0627c90b 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -706,7 +706,72 @@ public class OpenServiceImpl implements OpenService { return error(e.getMessage()); } } - + @Override + public AjaxResult addEquSapInfo(EquEquipmentDTO dto) { +// try { +// logger.info("oa增加sap设备发送参数"+JSONObject.toJSONString(dto)); +// List dtos = dto.getDetails(); +// if(CollectionUtils.isEmpty(dtos)){ +// return error("oa增加sap设备发送参数为空"); +// } +// DynamicDataSourceContextHolder.push("ds_"+dtos.get(0).getFactoryCode()); +// Date nowDate = DateUtils.getNowDate(); +// String createBy = SecurityUtils.getUsername(); +// for(EquEquipmentDTO equ:dtos){ +// equ.setCreateBy(createBy); +// equ.setUpdateBy(createBy); +// equ.setCreateTime(nowDate); +// equ.setUpdateTime(nowDate); +// } +// +// +// //sap返回的sap设备编码 +// List codes = dtos.stream().map(EquEquipmentDTO::getSapCode).collect(Collectors.toList()); +// //sap返回的客户编码-本地已存在 +// List exsitCodes = openMapper.getExsitCodes(codes); +// //sap返回的产品编码-本地不存在// 差集 (list2 - list1) +// List noExsitCodes = codes.stream().filter(item -> !exsitCodes.contains(item)).collect(Collectors.toList()); +// +// List updates = new ArrayList<>(); +// for (String exsitCode : exsitCodes) { +// List updates0 = dtos.stream().filter(up -> up.getSapCode().equals(exsitCode)).collect(Collectors.toList()); +// updates.addAll(updates0); +// } +// if (!CollectionUtils.isEmpty(updates)) { +// int m = openMapper.updateEquBatchs(updates); +// System.out.println("oa更新设备成功条数：" + m); +// } +// List adds = new ArrayList<>(); +// for (String noExsitCode : noExsitCodes) { +// List adds0 = dtos.stream().filter(ad -> ad.getSapCode().equals(noExsitCode)).collect(Collectors.toList()); +// adds.addAll(adds0); +// } +// if (!CollectionUtils.isEmpty(adds)) { +// +// int allsize = adds.size(); +// int inserttimes = allsize / 100 + 1; +// for (int m = 0; m < inserttimes; m++) { +// List everyList; +// if (m < (inserttimes - 1)) { +// everyList = adds.subList(m * 100, (m + 1) * 100); +// } else { +// everyList = adds.subList(m * 100, allsize); +// } +// if (everyList.size() > 0) { +// openMapper.addEquBatchs(everyList); +// } +// } +// +// System.out.println("oa新增设备成功条数：" + allsize); +// } +// +// return success(); +// } catch (Exception e) { +// e.printStackTrace(); +// return error(e.getMessage()); +// } + return success(); + } protected Boolean oneMinHas(Date lastData){ if(lastData != null){ int year= Integer.parseInt(String.format("%tY", lastData)); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProductCpkUpdownController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProductCpkUpdownController.java new file mode 100644 index 00000000..0e8794c8 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProductCpkUpdownController.java @@ -0,0 +1,111 @@ +package com.op.quality.controller; + +import java.security.Security; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.QcProductCpkUpdown; +import com.op.quality.service.IQcProductCpkUpdownService; +import org.apache.catalina.security.SecurityUtil; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.web.page.TableDataInfo; + +/** + * CPK上下限维护Controller + * + * @author Open Platform + * @date 2024-09-12 + */ +@RestController +@RequestMapping("/cpkUpdown") +public class QcProductCpkUpdownController extends BaseController { + @Autowired + private IQcProductCpkUpdownService qcProductCpkUpdownService; + +/** + * 查询CPK上下限维护列表 + */ + +@GetMapping("/list") + public TableDataInfo list(QcProductCpkUpdown qcProductCpkUpdown) { + startPage(); + List list = qcProductCpkUpdownService.selectQcProductCpkUpdownList(qcProductCpkUpdown); + return getDataTable(list); + } + + /** + * 导出CPK上下限维护列表 + */ + @Log(title = "CPK上下限维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcProductCpkUpdown qcProductCpkUpdown) { + List list = qcProductCpkUpdownService.selectQcProductCpkUpdownList(qcProductCpkUpdown); + ExcelUtil util = new ExcelUtil(QcProductCpkUpdown. class); + util.exportExcel(response, list, "CPK上下限维护数据"); + } + + /** + * 获取CPK上下限维护详细信息 + */ + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(qcProductCpkUpdownService.selectQcProductCpkUpdownById(id)); + } + + /** + * 新增CPK上下限维护 + */ + @RequiresPermissions("quality:cpkUpDowConfig:add") + @Log(title = "CPK上下限维护", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcProductCpkUpdown qcProductCpkUpdown) { + qcProductCpkUpdown.setId(IdUtils.fastSimpleUUID()); + qcProductCpkUpdown.setCreateBy(SecurityUtils.getUsername()); + qcProductCpkUpdown.setCreateTime(DateUtils.getNowDate()); + QcProductCpkUpdown exsit = qcProductCpkUpdownService.checkCpkUpdown(qcProductCpkUpdown); + if(exsit!=null){ + return AjaxResult.error("数据已存在"); + } + + return toAjax(qcProductCpkUpdownService.insertQcProductCpkUpdown(qcProductCpkUpdown)); + } + + /** + * 修改CPK上下限维护 + */ + @RequiresPermissions("quality:cpkUpDowConfig:edit") + @Log(title = "CPK上下限维护", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcProductCpkUpdown qcProductCpkUpdown) { + qcProductCpkUpdown.setUpdateBy(SecurityUtils.getUsername()); + qcProductCpkUpdown.setUpdateTime(DateUtils.getNowDate()); + return toAjax(qcProductCpkUpdownService.updateQcProductCpkUpdown(qcProductCpkUpdown)); + } + + /** + * 删除CPK上下限维护 + */ + @RequiresPermissions("quality:cpkUpDowConfig:remove") + @Log(title = "CPK上下限维护", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(qcProductCpkUpdownService.deleteQcProductCpkUpdownByIds(ids)); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProductCpkUpdown.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProductCpkUpdown.java new file mode 100644 index 00000000..68cf6b28 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProductCpkUpdown.java @@ -0,0 +1,153 @@ +package com.op.quality.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 检验节点维护对象 qc_product_cpk_updown + * + * @author Open Platform + * @date 2024-09-12 + */ +public class QcProductCpkUpdown extends BaseEntity { +private static final long serialVersionUID=1L; + + /** id */ + private String id; + + /** 类型编码：material来料检验、produce生产检验、product成品检验 */ + @Excel(name = "类型编码：material来料检验、produce生产检验、product成品检验") + private String typeCode; + + /** 检验节点 */ + @Excel(name = "检验节点") + private String checkType; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 上限 */ + @Excel(name = "上限") + private BigDecimal upVal; + + /** 下限 */ + @Excel(name = "下限") + private BigDecimal downVal; + + private String ruleCode; + private String ruleName; + + public String getRuleCode() { + return ruleCode; + } + + public void setRuleCode(String ruleCode) { + this.ruleCode = ruleCode; + } + + public String getRuleName() { + return ruleName; + } + + public void setRuleName(String ruleName) { + this.ruleName = ruleName; + } + + public void setId(String id){ + this.id = id; + } + + public String getId(){ + return id; + } + public void setTypeCode(String typeCode){ + this.typeCode = typeCode; + } + + public String getTypeCode(){ + return typeCode; + } + public void setCheckType(String checkType){ + this.checkType = checkType; + } + + public String getCheckType(){ + return checkType; + } + public void setFactoryCode(String factoryCode){ + this.factoryCode = factoryCode; + } + + public String getFactoryCode(){ + return factoryCode; + } + public void setDelFlag(String delFlag){ + this.delFlag = delFlag; + } + + public String getDelFlag(){ + return delFlag; + } + public void setMaterialCode(String materialCode){ + this.materialCode = materialCode; + } + + public String getMaterialCode(){ + return materialCode; + } + public void setMaterialName(String materialName){ + this.materialName = materialName; + } + + public String getMaterialName(){ + return materialName; + } + public void setUpVal(BigDecimal upVal){ + this.upVal = upVal; + } + + public BigDecimal getUpVal(){ + return upVal; + } + public void setDownVal(BigDecimal downVal){ + this.downVal = downVal; + } + + public BigDecimal getDownVal(){ + return downVal; + } + +@Override +public String toString(){ + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id",getId()) + .append("typeCode",getTypeCode()) + .append("checkType",getCheckType()) + .append("createBy",getCreateBy()) + .append("createTime",getCreateTime()) + .append("updateBy",getUpdateBy()) + .append("updateTime",getUpdateTime()) + .append("factoryCode",getFactoryCode()) + .append("delFlag",getDelFlag()) + .append("materialCode",getMaterialCode()) + .append("materialName",getMaterialName()) + .append("upVal",getUpVal()) + .append("downVal",getDownVal()) + .toString(); + } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProductCpkUpdownMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProductCpkUpdownMapper.java new file mode 100644 index 00000000..c56ad8bc --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProductCpkUpdownMapper.java @@ -0,0 +1,64 @@ +package com.op.quality.mapper; + +import com.op.quality.domain.QcProductCpkUpdown; + +import java.util.List; + + +/** + * 检验节点维护Mapper接口 + * + * @author Open Platform + * @date 2024-09-12 + */ +public interface QcProductCpkUpdownMapper { + /** + * 查询检验节点维护 + * + * @param id 检验节点维护主键 + * @return 检验节点维护 + */ + public QcProductCpkUpdown selectQcProductCpkUpdownById(String id); + + /** + * 查询检验节点维护列表 + * + * @param qcProductCpkUpdown 检验节点维护 + * @return 检验节点维护集合 + */ + public List selectQcProductCpkUpdownList(QcProductCpkUpdown qcProductCpkUpdown); + + /** + * 新增检验节点维护 + * + * @param qcProductCpkUpdown 检验节点维护 + * @return 结果 + */ + public int insertQcProductCpkUpdown(QcProductCpkUpdown qcProductCpkUpdown); + + /** + * 修改检验节点维护 + * + * @param qcProductCpkUpdown 检验节点维护 + * @return 结果 + */ + public int updateQcProductCpkUpdown(QcProductCpkUpdown qcProductCpkUpdown); + + /** + * 删除检验节点维护 + * + * @param id 检验节点维护主键 + * @return 结果 + */ + public int deleteQcProductCpkUpdownById(String id); + + /** + * 批量删除检验节点维护 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcProductCpkUpdownByIds(String[] ids); + + QcProductCpkUpdown checkCpkUpdown(QcProductCpkUpdown qcProductCpkUpdown); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcProductCpkUpdownService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcProductCpkUpdownService.java new file mode 100644 index 00000000..d352c347 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcProductCpkUpdownService.java @@ -0,0 +1,64 @@ +package com.op.quality.service; + +import com.op.quality.domain.QcProductCpkUpdown; + +import java.util.List; + + +/** + * 检验节点维护Service接口 + * + * @author Open Platform + * @date 2024-09-12 + */ +public interface IQcProductCpkUpdownService { + /** + * 查询检验节点维护 + * + * @param id 检验节点维护主键 + * @return 检验节点维护 + */ + public QcProductCpkUpdown selectQcProductCpkUpdownById(String id); + + /** + * 查询检验节点维护列表 + * + * @param qcProductCpkUpdown 检验节点维护 + * @return 检验节点维护集合 + */ + public List selectQcProductCpkUpdownList(QcProductCpkUpdown qcProductCpkUpdown); + + /** + * 新增检验节点维护 + * + * @param qcProductCpkUpdown 检验节点维护 + * @return 结果 + */ + public int insertQcProductCpkUpdown(QcProductCpkUpdown qcProductCpkUpdown); + + /** + * 修改检验节点维护 + * + * @param qcProductCpkUpdown 检验节点维护 + * @return 结果 + */ + public int updateQcProductCpkUpdown(QcProductCpkUpdown qcProductCpkUpdown); + + /** + * 批量删除检验节点维护 + * + * @param ids 需要删除的检验节点维护主键集合 + * @return 结果 + */ + public int deleteQcProductCpkUpdownByIds(String[] ids); + + /** + * 删除检验节点维护信息 + * + * @param id 检验节点维护主键 + * @return 结果 + */ + public int deleteQcProductCpkUpdownById(String id); + + QcProductCpkUpdown checkCpkUpdown(QcProductCpkUpdown qcProductCpkUpdown); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProductCpkUpdownServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProductCpkUpdownServiceImpl.java new file mode 100644 index 00000000..20233ec0 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProductCpkUpdownServiceImpl.java @@ -0,0 +1,104 @@ +package com.op.quality.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import com.op.quality.domain.QcProductCpkUpdown; +import com.op.quality.mapper.QcProductCpkUpdownMapper; +import com.op.quality.service.IQcProductCpkUpdownService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * 检验节点维护Service业务层处理 + * + * @author Open Platform + * @date 2024-09-12 + */ +@Service +public class QcProductCpkUpdownServiceImpl implements IQcProductCpkUpdownService { + @Autowired + private QcProductCpkUpdownMapper qcProductCpkUpdownMapper; + + /** + * 查询检验节点维护 + * + * @param id 检验节点维护主键 + * @return 检验节点维护 + */ + @Override + @DS("#header.poolName") + public QcProductCpkUpdown selectQcProductCpkUpdownById(String id) { + return qcProductCpkUpdownMapper.selectQcProductCpkUpdownById(id); + } + + /** + * 查询检验节点维护列表 + * + * @param qcProductCpkUpdown 检验节点维护 + * @return 检验节点维护 + */ + @Override + @DS("#header.poolName") + public List selectQcProductCpkUpdownList(QcProductCpkUpdown qcProductCpkUpdown) { + return qcProductCpkUpdownMapper.selectQcProductCpkUpdownList(qcProductCpkUpdown); + } + + /** + * 新增检验节点维护 + * + * @param qcProductCpkUpdown 检验节点维护 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertQcProductCpkUpdown(QcProductCpkUpdown qcProductCpkUpdown) { + qcProductCpkUpdown.setCreateTime(DateUtils.getNowDate()); + return qcProductCpkUpdownMapper.insertQcProductCpkUpdown(qcProductCpkUpdown); + } + + /** + * 修改检验节点维护 + * + * @param qcProductCpkUpdown 检验节点维护 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateQcProductCpkUpdown(QcProductCpkUpdown qcProductCpkUpdown) { + qcProductCpkUpdown.setUpdateTime(DateUtils.getNowDate()); + return qcProductCpkUpdownMapper.updateQcProductCpkUpdown(qcProductCpkUpdown); + } + + /** + * 批量删除检验节点维护 + * + * @param ids 需要删除的检验节点维护主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcProductCpkUpdownByIds(String[] ids) { + return qcProductCpkUpdownMapper.deleteQcProductCpkUpdownByIds(ids); + } + + /** + * 删除检验节点维护信息 + * + * @param id 检验节点维护主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcProductCpkUpdownById(String id) { + return qcProductCpkUpdownMapper.deleteQcProductCpkUpdownById(id); + } + + @Override + @DS("#header.poolName") + public QcProductCpkUpdown checkCpkUpdown(QcProductCpkUpdown qcProductCpkUpdown) { + return qcProductCpkUpdownMapper.checkCpkUpdown(qcProductCpkUpdown); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index 5a0cfaa0..1989db28 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -768,6 +768,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { if(qcStaticTable.getProjectNoArray()!=null){ qcStaticTable.setProjectNo(qcStaticTable.getProjectNoArray()[0]); QcStaticTable upandown = qcStaticTableMapper.getUpAndDown(qcStaticTable); + if(upandown!=null){ dto.setUpperDiff(upandown.getUpperDiff()); dto.setDownDiff(upandown.getDownDiff()); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 72c7e326..e93e6654 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -100,7 +100,7 @@ qct.check_time, qct.check_result, qct.status, qct.check_type, qct.attr1, qct.attr2, qct.attr3, qct.attr4, qct.create_by, qct.create_time, qct.update_by, qct.update_time, qct.factory_code, qct.del_flag,qct.reason,qct.product_type,qct.order_type,qct.jgy,qct.pgy,qct.cxzz, - bp.mvgr5 standardNo + ISNULL(bp.mvgr5, '成品蚊香【物料组】') standardNo from qc_check_task qct left join base_product bp on bp.product_code = qct.material_code where qct.record_id = #{recordId} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index cbdf1c8d..c4f7ac0d 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -161,7 +161,7 @@ qctp.weight from qc_check_task_detail td left join qc_check_type_project qctp on td.type_project_id = qctp.id - left join lanju_op_cloud.dbo.sys_dict_data dic on dic.dict_value = td.unit_code and dic.status ='0' + left join lanju_op_cloud.dbo.sys_dict_data dic on dic.dict_value = td.unit_code and dic.status ='0' and dic.dict_type = 'unit' where td.belong_to = #{belongTo} and td.del_flag='0' and qctp.del_flag = '0' and td.rule_name is not null order by qctp.sort diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml index 56de2728..61be5714 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml @@ -241,6 +241,7 @@ where CONVERT(varchar(10),create_time, 120) = CONVERT(varchar(10),GETDATE(), 120) + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProductCpkUpdownMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProductCpkUpdownMapper.xml new file mode 100644 index 00000000..d38098f5 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProductCpkUpdownMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, type_code, check_type, create_by, create_time, update_by, update_time, + factory_code, del_flag, material_code, material_name, up_val, down_val, + rule_code,rule_name + from qc_product_cpk_updown + + + + + + + + + insert into qc_product_cpk_updown + + id, + type_code, + check_type, + create_by, + create_time, + update_by, + update_time, + factory_code, + del_flag, + material_code, + material_name, + up_val, + down_val, + rule_code, + rule_name, + + + #{id}, + #{typeCode}, + #{checkType}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + #{materialCode}, + #{materialName}, + #{upVal}, + #{downVal}, + #{ruleCode}, + #{ruleName}, + + + + + update qc_product_cpk_updown + + type_code =#{typeCode}, + check_type = #{checkType}, + update_by =#{updateBy}, + update_time =#{updateTime}, + del_flag =#{delFlag}, + material_code =#{materialCode}, + material_name =#{materialName}, + up_val =#{upVal}, + down_val =#{downVal}, + rule_code =#{ruleCode}, + rule_name = #{ruleName}, + + where id = #{id} + + + + update qc_product_cpk_updown set del_flag = '1' where id = #{id} + + + + update qc_product_cpk_updown set del_flag = '1' where id in + + #{id} + + +