From 1038bc3f2791526a2030587c0d698b3a2648aa0c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 2 Jul 2024 14:56:40 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B4=A8=E9=87=8Foa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/domain/QcCheckTaskIncome.java | 9 ++ .../op/quality/domain/QcCheckUnqualified.java | 9 ++ .../impl/QcCheckTaskIncomeServiceImpl.java | 91 +++++++++++-------- .../impl/QcCheckUnqualifiedServiceImpl.java | 6 +- 4 files changed, 72 insertions(+), 43 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 6509c4d2f..977572e4e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -202,6 +202,15 @@ public class QcCheckTaskIncome extends BaseEntity { private String sampleCode; private String sampleAql; private String reason; + private String sfgyswt;//是否供应商问题 + + public String getSfgyswt() { + return sfgyswt; + } + + public void setSfgyswt(String sfgyswt) { + this.sfgyswt = sfgyswt; + } public String getSampleAql() { return sampleAql; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java index 793327060..23ab32eb7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java @@ -124,6 +124,15 @@ public class QcCheckUnqualified extends BaseEntity { private String qczg;//QC主管 private String user; private String sqr; + private String sfgyswt;//是否供应商问题 + + public String getSfgyswt() { + return sfgyswt; + } + + public void setSfgyswt(String sfgyswt) { + this.sfgyswt = sfgyswt; + } public String getSqr() { return sqr; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 93c0288f7..9ae80d803 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -797,52 +797,63 @@ public class QcCheckTaskIncomeServiceImpl implements n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); logger.info("qc_check_unqualified:" + n); if("1".equals(qcCheckTaskIncome.getStartOA())){ - - unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode()); - //不合格描述 - unqualified.setRemark(qcCheckTaskIncome.getRemark()); - //厂区(小榄固定值) - unqualified.setOaFactory("0"); - //来料类别 - unqualified.setMaterialType(qcCheckTaskIncome.getMaterialType()); - //物料来源 - unqualified.setMaterialFrom(qcCheckTaskIncome.getMaterialFrom()); - //物料编号 - unqualified.setMaterialCode(qcCheckTaskIncome.getMaterialCode()); - //物料名称 - unqualified.setMaterialName(qcCheckTaskIncome.getMaterialName()); - //供应商编码 - unqualified.setSupplierCode(qcCheckTaskIncome.getSupplierCode()); - //供应商名称 - unqualified.setSupplierName(qcCheckTaskIncome.getSupplierName()); - //供应商名称 - unqualified.setSupplierName(qcCheckTaskIncome.getSupplierName()); - //生产批号 - unqualified.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo()); - //来料数量 - unqualified.setQuality(qcCheckTaskIncome.getQuality().toString()); - //来料单位 - unqualified.setUnit(qcCheckTaskIncome.getUnit()); - //检验编号 - unqualified.setCheckNo(qcCheckTaskIncome.getCheckNo()); - //仓储报检人-李爱娟 - unqualified.setCzbjr("284"); - //物料类别 - unqualified.setMaterialType(qcCheckTaskIncome.getMaterialType()); - //物料来源 - unqualified.setMaterialFrom(qcCheckTaskIncome.getMaterialFrom()); - //QC主管-朱继新 - unqualified.setQczg("660"); - //申请人-朱继新 - unqualified.setSqr("660"); - unqualified.setUser(updateBy); - qcCheckUnqualifiedService.updateQcCheckUnqualified(unqualified); + this.setOaFunc(unqualified,qcCheckTaskIncome); } //发送企业微信 this.sendWX(qcCheckTaskIncome); } return 1 ; } + /* 首检巡检都是品质异常流程 + * 成品的是成品检验控制流程 + * 来料的是来料检验不合格流程*/ + private void setOaFunc(QcCheckUnqualified unqualified,QcCheckTaskIncome qcCheckTaskIncome){ + //不合格描述 + unqualified.setRemark(qcCheckTaskIncome.getRemark()); + if("produce".equals(qcCheckTaskIncome.getTypeCode())){ + unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt()); + }else if("material".equals(qcCheckTaskIncome.getTypeCode())){ + unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode()); + + //厂区(小榄固定值) + unqualified.setOaFactory("0"); + //来料类别 + unqualified.setMaterialType(qcCheckTaskIncome.getMaterialType()); + //物料来源 + unqualified.setMaterialFrom(qcCheckTaskIncome.getMaterialFrom()); + //物料编号 + unqualified.setMaterialCode(qcCheckTaskIncome.getMaterialCode()); + //物料名称 + unqualified.setMaterialName(qcCheckTaskIncome.getMaterialName()); + //供应商编码 + unqualified.setSupplierCode(qcCheckTaskIncome.getSupplierCode()); + //供应商名称 + unqualified.setSupplierName(qcCheckTaskIncome.getSupplierName()); + //供应商名称 + unqualified.setSupplierName(qcCheckTaskIncome.getSupplierName()); + //生产批号 + unqualified.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo()); + //来料数量 + unqualified.setQuality(qcCheckTaskIncome.getQuality().toString()); + //来料单位 + unqualified.setUnit(qcCheckTaskIncome.getUnit()); + //检验编号 + unqualified.setCheckNo(qcCheckTaskIncome.getCheckNo()); + //仓储报检人-李爱娟 + unqualified.setCzbjr("284"); + //物料类别 + unqualified.setMaterialType(qcCheckTaskIncome.getMaterialType()); + //物料来源 + unqualified.setMaterialFrom(qcCheckTaskIncome.getMaterialFrom()); + //QC主管-朱继新 + unqualified.setQczg("660"); + //申请人-朱继新 + unqualified.setSqr("660"); + unqualified.setUser(qcCheckTaskIncome.getUpdateBy()); + } + + qcCheckUnqualifiedService.updateQcCheckUnqualified(unqualified); + } protected void sendWX(QcCheckTaskIncome qcCheckTaskIncome){ //发企业微信--------------------开始（跟班组有关） diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java index cae9d89aa..0ebebf285 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java @@ -317,8 +317,8 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService mainObject.append(",\"CPBM\":"+detailInfo.getMaterialCode());//产品编码 mainObject.append(",\"SQBM\":"+"\"0\"");//0品质保障部 mainObject.append(",\"SQR\":"+"\""+SecurityUtils.getUsername()+"\"");//申请人:默认当前用户 - mainObject.append(",\"SQSJ\":"+"\""+detailInfo.getSupplierCode()+"\"");//申请时间 - mainObject.append(",\"SCCJ\":"+"\""+detailInfo.getSupplierName()+"\"");//所属车间 + mainObject.append(",\"SQSJ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getCheckTime())+"\"");//申请时间 + mainObject.append(",\"SCCJ\":"+"\"162\"");//所属车间 mainObject.append(",\"SCPH\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号 mainObject.append(",\"SCSL\":"+"\""+detailInfo.getQuality()+"\"");//生产数量 mainObject.append(",\"FXDD\":"+"\""+detailInfo.getCheckLoc()+"\"");//发现地点 @@ -328,7 +328,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService mainObject.append(",\"PZYCMS\":"+"\""+detailInfo.getRemark()+"\"");//品质异常描述 mainObject.append(",\"Notes\":"+"\"\"");//测试备注 mainObject.append(",\"SFXYZG\":"+"\"0\"");//*是否需要主管审核 1否 0是 - mainObject.append(",\"PGZG\":"+"\""+detailInfo.getRemark()+"\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息 + mainObject.append(",\"PGZG\":"+"\"660\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息 mainObject.append(",\"PGZR\":"+"\"660\"");//质量主管 660：朱继新 mainObject.append(",\"SFGYSWT\":"+"\"1\"");//*是否供应商问题 1非供应商问题 0是供应商问题 From 8ce2bf7e0846b228bb54dff9213e10a80231b062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Tue, 2 Jul 2024 15:46:02 +0800 Subject: [PATCH 2/9] chj --- .../src/main/java/com/op/mes/domain/vo/MesDailyReportBPVo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportBPVo.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportBPVo.java index fbbf2f505..54acbcb96 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportBPVo.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportBPVo.java @@ -11,7 +11,7 @@ public class MesDailyReportBPVo extends BaseEntity { private static final long serialVersionUID = 1L; @Excel(name = "组别") private String equipmentName; - @Excel(name = "产品编码") +// @Excel(name = "产品编码") private String productCode;//产品编码 @Excel(name = "产品名称") private String productName;//产品名称 From af49b3dead6d349792f0114db604932e99cfd231 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 4 Jul 2024 09:21:51 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=B4=A8=E9=87=8FCPK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcStaticTableController.java | 6 ++ .../op/quality/mapper/QcProCheckMapper.java | 3 + .../service/IQcStaticTableService.java | 2 + .../service/impl/QcProCheckServiceImpl.java | 5 + .../impl/QcStaticTableServiceImpl.java | 96 +++++++++++++++++++ .../quality/QcCheckReportIncomeMapper.xml | 8 +- .../mapper/quality/QcProCheckMapper.xml | 10 +- .../resources/mapper/system/SysUserMapper.xml | 3 +- 8 files changed, 124 insertions(+), 9 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java index b524141b2..11aa1cbf5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java @@ -343,6 +343,12 @@ public class QcStaticTableController extends BaseController { return qcStaticTableService.getDLTableAvgInfo(qcStaticTable); } + @GetMapping("/getDLTableCPKInfo") + @Log(title = "定量值分析CPK", businessType = BusinessType.QUERY) + public QcStaticTable getDLTableCPKInfo(QcStaticTable qcStaticTable) { + return qcStaticTableService.getDLTableCPKInfo(qcStaticTable); + } + @PostMapping("/exportDLTable") public void exportDLTable(HttpServletResponse response, QcStaticTable qcStaticTable) { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java index 11e6fe895..13df1054e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java @@ -8,6 +8,7 @@ import com.op.quality.domain.QcProCheck; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; /** @@ -43,4 +44,6 @@ public interface QcProCheckMapper { List getHFnames(QcProCheck qcProCheck); String getWeightInfo(QcCheckTaskDetail qcCheckTaskDetail); + + BigDecimal getMesReportQuality(String orderNo); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java index afda12b5f..08bae2c20 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java @@ -46,5 +46,7 @@ public interface IQcStaticTableService { QcStaticTable getDLTableAvgInfo(QcStaticTable qcStaticTable); + QcStaticTable getDLTableCPKInfo(QcStaticTable qcStaticTable); + List getProjectList(String checkType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index 75cfa0720..f2c56fe22 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -133,7 +133,12 @@ public class QcProCheckServiceImpl implements QcProCheckService { if (StringUtils.isEmpty(dto.getWorkorderCodeSap())) { dto.setWorkorderCodeSap(dto.getOrderNo()); } + + if("checkTypeCP".equals(qcCheckTaskIncome.getCheckType())){//成品检验数量取实际产量 + dto.setQuality(qcProCheckMapper.getMesReportQuality(qcCheckTaskIncome.getOrderNo())); + } } + return dtos; } 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 f5048b842..48bc40b87 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 @@ -558,6 +558,102 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { return dto; } + @Override + @DS("#header.poolName") + public QcStaticTable getDLTableCPKInfo(QcStaticTable qcStaticTable) { + QcStaticTable dto = new QcStaticTable(); + //第一列日期 + List days = this.getDays(qcStaticTable.getYmArrayStart(), + qcStaticTable.getYmArrayEnd(), "ymd"); + qcStaticTable.setDataType("ymd"); + + List titleList = qcStaticTableMapper.getDLTableTitle(qcStaticTable); + Map titleMap = titleList.stream().collect(Collectors.toMap(QcStaticTable::getYearMonth, (a) -> a)); + //表头：第一行 + List colName1 = titleList.stream().map(QcStaticTable::getMaterialName).distinct().collect(Collectors.toList()); + List colCode1 = titleList.stream().map(QcStaticTable::getMaterialCode).distinct().collect(Collectors.toList()); + dto.setTitleCol1(colName1); + //表头：第二行 + List colName2 = titleList.stream().map(QcStaticTable::getRuleName).distinct().collect(Collectors.toList()); + List colCode2 = titleList.stream().map(QcStaticTable::getProjectNo).distinct().collect(Collectors.toList()); + dto.setTitleCol2(colName2); + + //给折线图取上下限制 + 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()); + }else{ + dto.setUpperDiff(BigDecimal.ZERO); + dto.setDownDiff(BigDecimal.ZERO); + } + } + + //cpk列表 + List dxData = new ArrayList<>(); + + for (String day : days) { + HashMap result = new HashMap(); + + result.put("ymdms", day + " AVG"); + int i = 0, j = 0; + for (int m = 0; m < colCode1.size(); m++) { + for (int n = 0; n < colCode2.size(); n++) { + String key = colCode1.get(m) + "-" + colCode2.get(n) + "-" + day; + QcStaticTable avgdto = titleMap.get(key); + if (avgdto != null) { + String avgArrayStr = avgdto.getQuality().replace("[", "") + .replace("]", "") + .replace("\"", ""); + List avgArray = Arrays.asList(avgArrayStr.split(",")); + double[] data = avgArray.stream() + .mapToDouble(Double::parseDouble) // 将String转换为double + .toArray(); // 转换为double数组 ; + double USL = dto.getUpperDiff().doubleValue(); + double LSL = dto.getDownDiff().doubleValue(); + double cpk = calculateCpk(data,USL,LSL); + BigDecimal cpkVal = new BigDecimal(Double.toString(cpk)).setScale(2, BigDecimal.ROUND_HALF_UP); + result.put("mcode" + m + "Pcode" + n, cpkVal); + } else { + result.put("mcode" + m + "Pcode" + n, "0.00"); + + } + } + } + dxData.add(result); + } + dto.setDxData(dxData); + return dto; + } + + // 计算CPK + public static double calculateCpk(double[] data, double USL, double LSL) { + double mean = calculateMean(data); + double stdDev = calculateStandardDeviation(data); + double cpkUpper = (USL - mean) / (3 * stdDev); + double cpkLower = (mean - LSL) / (3 * stdDev); + return Math.min(cpkUpper, cpkLower); + } + // 计算均值 + public static double calculateMean(double[] data) { + double sum = 0.0; + for (double a : data) { + sum += a; + } + return sum / data.length; + } + + // 计算标准差 + public static double calculateStandardDeviation(double[] data) { + double mean = calculateMean(data); + double temp = 0; + for (double a : data) { + temp += (a - mean) * (a - mean); + } + return Math.sqrt(temp / (data.length - 1)); + } @Override @DS("#header.poolName") public List getProjectList(String checkType) { 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 632cf58ac..3c43be897 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 @@ -204,7 +204,7 @@ from qc_check_task where record_id = #{recordId} + + diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml index 773f57031..c73526430 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -49,7 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.wx_id, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, + u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.wx_id, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u From 9779dd80f325cb2916009caf2e21a0d3a4cb3d26 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 4 Jul 2024 15:54:53 +0800 Subject: [PATCH 4/9] =?UTF-8?q?update=20-=20=E8=83=BD=E6=BA=90=E6=95=B4?= =?UTF-8?q?=E7=82=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BaseMonitorInfo1ServiceImpl.java | 46 ++++++++++++++++--- .../mapper/report/ReportPointDnbMapper.xml | 24 +++++----- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseMonitorInfo1ServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseMonitorInfo1ServiceImpl.java index ad994faf5..d1ed9758a 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseMonitorInfo1ServiceImpl.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseMonitorInfo1ServiceImpl.java @@ -107,11 +107,44 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service { @Override @DS("#header.poolName") public int updateBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo) { + // 异常处理：若设备停用则更新所有父级 + if (StringUtils.isNotNull(baseMonitorInfo.getMonitorStatus()) && baseMonitorInfo.getMonitorStatus().equals(1L)){ + this.updateAllBaseMonitorInfo(); + } List baseMonitorInfos = baseMonitorInfoMapper.checkMonitorIdLegal(baseMonitorInfo); - if (baseMonitorInfos.size() > 1) { - throw new ServiceException("计量设备编号重复:" + baseMonitorInfo.getMonitorId()); + if (baseMonitorInfos.size() > 1){ + throw new ServiceException("计量设备编号重复:" + baseMonitorInfo.getMonitorId()); } try { + BaseMonitorInfo newParenMonitorInfo = baseMonitorInfoMapper.selectBaseMonitorInfoByObjid(baseMonitorInfo.getParentId()); + BaseMonitorInfo oldDeptMonitorInfo = selectBaseMonitorInfoByObjid(baseMonitorInfo.getObjid()); + if (StringUtils.isNotNull(newParenMonitorInfo) && StringUtils.isNotNull(oldDeptMonitorInfo)) + { + String newAncestors = newParenMonitorInfo.getAncestors() + "," + oldDeptMonitorInfo.getMonitorId(); + String oldAncestors = oldDeptMonitorInfo.getAncestors(); + baseMonitorInfo.setAncestors(newAncestors); + String[] split = baseMonitorInfo.getAncestors().split(","); + baseMonitorInfo.setGrade(split.length); + + updateMonitorChildren(baseMonitorInfo.getMonitorId(), newAncestors, oldAncestors); + } + + this.insertOrUpdateBaseTypeRelation(baseMonitorInfo.getMonitorId(),baseMonitorInfo.getBuildId(), + baseMonitorInfo.getBusinessId(),baseMonitorInfo.getSubentryId()); + } catch (Exception e) { + e.printStackTrace(); + } + baseMonitorInfo.setUpdateTime(DateUtils.getNowDate()); + baseMonitorInfo.setUpdateBy(SecurityUtils.getUsername()); + return baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); + } + + /** + * 更新所有测控点 + */ + private void updateAllBaseMonitorInfo() { + List monitorInfoList = this.selectBaseMonitorInfoList(new BaseMonitorInfo()); + for (BaseMonitorInfo baseMonitorInfo : monitorInfoList) { BaseMonitorInfo newParenMonitorInfo = baseMonitorInfoMapper.selectBaseMonitorInfoByObjid(baseMonitorInfo.getParentId()); BaseMonitorInfo oldDeptMonitorInfo = selectBaseMonitorInfoByObjid(baseMonitorInfo.getObjid()); if (StringUtils.isNotNull(newParenMonitorInfo) && StringUtils.isNotNull(oldDeptMonitorInfo)) { @@ -126,14 +159,13 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service { this.insertOrUpdateBaseTypeRelation(baseMonitorInfo.getMonitorId(), baseMonitorInfo.getBuildId(), baseMonitorInfo.getBusinessId(), baseMonitorInfo.getSubentryId()); - } catch (Exception e) { - e.printStackTrace(); + baseMonitorInfo.setUpdateTime(DateUtils.getNowDate()); + baseMonitorInfo.setUpdateBy(SecurityUtils.getUsername()); + baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); } - baseMonitorInfo.setUpdateTime(DateUtils.getNowDate()); - baseMonitorInfo.setUpdateBy(SecurityUtils.getUsername()); - return baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); } + /** * 修改子元素关系 * diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml index 10575ea65..84af652da 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml @@ -121,7 +121,7 @@ select ert.monitor_id, ert.monitor_name, ert.pointTime, sum(isnull(ert.expend,0)) expend from ( - select rpd.monitor_id, m.monitor_name, left(rpd.begin_time, 10) pointTime, rpd.expend + select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) pointTime, rpd.expend from report_point_dnb rpd left join base_monitor_info m on m.monitor_id = rpd.monitor_id @@ -167,7 +167,7 @@ - and left(rpd.begin_time, 10) between #{startDay} and #{endDay} + and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay} ) ert @@ -178,21 +178,21 @@ select mlp.use_man standarMan, - ROUND(mlp.efficiency/bp.umrez,2) AS standarXl, - mr.use_man actMan, - mr.work_time, - mr2.quantity_feedback, - ROUND( mr2.quantity_feedback/mr.work_time,2) AS actXl - from ( - select top 1 use_man,work_time,machine_code,report_code,product_code - from mes_report_work where del_flag = '0' and machine_code = #{equCode} - and workorder_code = #{workorderCode} - and parent_order !='0' order by create_time desc - ) mr - left join mes_report_work mr2 on mr2.report_code = mr.report_code and mr2.parent_order ='0' - left join mes_line_product mlp on mlp.line_code = mr.machine_code and mr2.product_code = mlp.product_code + ROUND(mlp.efficiency/bp.umrez,2) AS standarXl + from mes_line_product mlp left join base_product bp on bp.product_code=mlp.product_code - where mlp.line_code = #{equCode} - and mlp.del_flag='0' and mlp.del_flag='0' + where mlp.line_code = #{equCode} and mlp.product_code = #{productCode} + and mlp.del_flag='0' and bp.del_flag='0' 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 85469479f..1fc178f4d 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 @@ -709,7 +709,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select sum(quantity_feedback) quantityFeedbackSum from mes_report_work where workorder_code = #{workorderCode} and del_flag = '0' and machine_code = #{machineCode} + and upload_status = '1' + + + + and in_out_type = #{inOutType} + and order_no = #{orderNo} + and spare_code = #{spareCode} + and spare_name = #{spareName} + and amount = #{amount} + and attr1 = #{attr1} + and attr2 = #{attr2} + and attr3 = #{attr3} + and create_time = #{createTime} + and update_by = #{updateBy} + and update_time = #{updateTime} + and del_flag = #{delFlag} + and factory_code = #{factoryCode} + + + + + + + insert into equ_spareparts_in_out + + id, + in_out_type, + order_no, + spare_code, + spare_name, + amount, + attr11, + attr12, + attr13, + create_by, + create_time, + update_by, + update_time, + del_flag, + factory_code, + storage_id, + + + #{id}, + #{inOutType}, + #{orderNo}, + #{spareCode}, + #{spareName}, + #{amount}, + #{attr1}, + #{attr2}, + #{attr3}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + #{factoryCode}, + #{storageId}, + + + + + update equ_spareparts_in_out + + in_out_type = #{inOutType}, + order_no = #{orderNo}, + spare_code = #{spareCode}, + spare_name = #{spareName}, + amount = #{amount}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + factory_code = #{factoryCode}, + + where id = #{id} + + + + update equ_spareparts_in_out + set del_flag = '1' + where id = #{id} + + + + update equ_spareparts_in_out + set del_flag = '1' + where id in + + #{id} + + + + + diff --git a/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml deleted file mode 100644 index b445f5bc6..000000000 --- a/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select raw_order_in_sn_id, wh_code, wa_code, wl_code, order_no, po_no, po_line, material_code, material_desc, sn, amount, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code from wms_raw_order_in_sn - - - - - - - - insert into wms_raw_order_in_sn - - raw_order_in_sn_id, - wh_code, - wa_code, - wl_code, - order_no, - po_no, - po_line, - material_code, - material_desc, - sn, - amount, - user_defined1, - user_defined2, - user_defined3, - user_defined4, - user_defined5, - user_defined6, - user_defined7, - user_defined8, - user_defined9, - user_defined10, - create_by, - gmt_create, - last_modified_by, - gmt_modified, - active_flag, - factory_code, - sap_factory_code, - - - #{rawOrderInSnId}, - #{whCode}, - #{waCode}, - #{wlCode}, - #{orderNo}, - #{poNo}, - #{poLine}, - #{materialCode}, - #{materialDesc}, - #{sn}, - #{amount}, - #{userDefined1}, - #{userDefined2}, - #{userDefined3}, - #{userDefined4}, - #{userDefined5}, - #{userDefined6}, - #{userDefined7}, - #{userDefined8}, - #{userDefined9}, - #{userDefined10}, - #{createBy}, - #{gmtCreate}, - #{lastModifiedBy}, - #{gmtModified}, - #{activeFlag}, - #{factoryCode}, - #{sapFactoryCode}, - - - - - update wms_raw_order_in_sn - - wh_code = #{whCode}, - wa_code = #{waCode}, - wl_code = #{wlCode}, - order_no = #{orderNo}, - po_no = #{poNo}, - po_line = #{poLine}, - material_code = #{materialCode}, - material_desc = #{materialDesc}, - sn = #{sn}, - amount = #{amount}, - user_defined1 = #{userDefined1}, - user_defined2 = #{userDefined2}, - user_defined3 = #{userDefined3}, - user_defined4 = #{userDefined4}, - user_defined5 = #{userDefined5}, - user_defined6 = #{userDefined6}, - user_defined7 = #{userDefined7}, - user_defined8 = #{userDefined8}, - user_defined9 = #{userDefined9}, - user_defined10 = #{userDefined10}, - create_by = #{createBy}, - gmt_create = #{gmtCreate}, - last_modified_by = #{lastModifiedBy}, - gmt_modified = #{gmtModified}, - active_flag = #{activeFlag}, - factory_code = #{factoryCode}, - sap_factory_code = #{sapFactoryCode}, - - where raw_order_in_sn_id = #{rawOrderInSnId} - - - - delete from wms_raw_order_in_sn where raw_order_in_sn_id = #{rawOrderInSnId} - - - - delete from wms_raw_order_in_sn where raw_order_in_sn_id in - - #{rawOrderInSnId} - - - From fe306c43a7223edc60eb941ffd76d136716821e1 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 4 Jul 2024 18:05:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?2024-07-04=20=E8=AE=BE=E5=A4=87-=E7=82=B9?= =?UTF-8?q?=E6=A3=80=E3=80=81=E5=B7=A1=E6=A3=80=E3=80=81=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E3=80=81=E7=BB=B4=E4=BF=AE-=E6=A3=80=E6=9F=A5=E4=BA=BA?= =?UTF-8?q?=E5=A7=93=E5=90=8D+=E6=A3=80=E6=9F=A5=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/device/domain/EquOrder.java | 15 ++++++++ .../op/device/domain/EquRepairWorkOrder.java | 12 ++++++- .../mapper/device/EquOrderMapper.xml | 36 +++++++++++++------ .../device/EquRepairWorkOrderMapper.xml | 14 +++++--- 4 files changed, 62 insertions(+), 15 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index f25eba5a7..eaa4faa17 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -126,6 +126,12 @@ public class EquOrder extends BaseEntity { @Excel(name = "责任人") private String planPerson; + /** + * 责任人姓名 + */ + @Excel(name = "责任人姓名") + private String planPersonName; + /** * 工单用时 */ @@ -678,6 +684,14 @@ public class EquOrder extends BaseEntity { return planPerson; } + public void setPlanPersonName(String planPersonName) { + this.planPersonName = planPersonName; + } + + public String getPlanPersonName() { + return planPersonName; + } + public void setOrderCostTime(String orderCostTime) { this.orderCostTime = orderCostTime; } @@ -796,6 +810,7 @@ public class EquOrder extends BaseEntity { .append("orderStatus", getOrderStatus()) .append("orderCost", getOrderCost()) .append("planPerson", getPlanPerson()) + .append("planPersonName", getPlanPersonName()) .append("orderCostTime", getOrderCostTime()) .append("orderSignPerson", getOrderSignPerson()) .append("factoryCode", getFactoryCode()) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index 79add390a..0bddf9777 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -46,9 +46,12 @@ public class EquRepairWorkOrder extends BaseEntity { @Excel(name = "关联计划") private String orderRelevance; - @Excel(name = "维修人员") + @Excel(name = "维修人员工号") private String workPerson; + @Excel(name = "维修人员姓名") + private String workPersonName; + @Excel(name = "维修组") private String workTeam; @@ -392,6 +395,13 @@ public class EquRepairWorkOrder extends BaseEntity { return workPerson; } + public void setWorkPersonName(String workPersonName) { + this.workPersonName = workPersonName; + } + public String getWorkPersonName() { + return workPersonName; + } + public void setWorkTeam(String workTeam) { this.workTeam = workTeam; } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index eeb2c007e..c0b2de830 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -22,6 +22,7 @@ + @@ -54,7 +55,7 @@ select order_id, plan_id, plan_code, plan_type, order_code, plan_workshop, plan_prod_line, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, order_start, order_end, equipment_code, order_status, - order_cost, plan_person, order_cost_time, order_sign_person, + order_cost, plan_person, plan_person_name, order_cost_time, order_sign_person, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect,repair_code,work_code,outsource_code from equ_order @@ -79,6 +80,7 @@ eo.order_status, eo.order_cost, eo.plan_person, + eo.plan_person_name, eo.order_cost_time, eo.order_sign_person, eo.factory_code, @@ -120,6 +122,7 @@ and eo.order_status = #{orderStatus} and eo.order_cost = #{orderCost} and eo.plan_person like concat('%', #{planPerson}, '%') + and eo.plan_person_name like concat('%', #{planPersonName}, '%') and eo.order_cost_time = #{orderCostTime} and eo.order_sign_person = #{orderSignPerson} and eo.factory_code = #{factoryCode} @@ -198,6 +201,7 @@ eo.order_status, eo.order_cost, eo.plan_person, + eo.plan_person_name, eo.order_cost_time, eo.order_sign_person, eo.factory_code, @@ -219,14 +223,18 @@ be.equipment_name from equ_order eo left join base_equipment be on eo.equipment_code = be.equipment_code - where eo.plan_type = #{planType} - and eo.del_flag = '0' - and eo.order_status != '1' - and eo.order_code in (select order_code + + CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) + CONVERT(date,eo.create_time) = #{createTime} + and eo.plan_type = #{planType} + and eo.del_flag = '0' + and eo.order_status != '1' + and eo.order_code in (select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code) + order by eo.plan_loop_type, eo.plan_loop, eo.create_time desc, eo.equipment_code @@ -248,6 +256,7 @@ eo.order_status, eo.order_cost, eo.plan_person, + eo.plan_person_name, eo.order_cost_time, eo.order_sign_person, eo.factory_code, @@ -269,14 +278,18 @@ be.equipment_name from equ_order eo left join base_equipment be on eo.equipment_code = be.equipment_code - where eo.del_flag = '0' - and eo.order_status = '1' - and eo.plan_type = #{planType} - and eo.plan_person = #{userId} - and eo.order_code in (select order_code + + CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) + and CONVERT(date,eo.create_time) = #{createTime} + and eo.del_flag = '0' + and eo.order_status = '1' + and eo.plan_type = #{planType} + and eo.plan_person = #{userId} + and eo.order_code in (select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code) + order by eo.update_time desc @@ -304,6 +317,7 @@ order_status, order_cost, plan_person, + plan_person_name, order_cost_time, order_sign_person, factory_code, @@ -343,6 +357,7 @@ #{orderStatus}, #{orderCost}, #{planPerson}, + #{planPersonName}, #{orderCostTime}, #{orderSignPerson}, #{factoryCode}, @@ -384,6 +399,7 @@ order_status = #{orderStatus}, order_cost = #{orderCost}, plan_person = #{planPerson}, + plan_person_name = #{planPersonName}, order_cost_time = #{orderCostTime}, order_sign_person = #{orderSignPerson}, factory_code = #{factoryCode}, diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml index c36427d8e..961bc09ea 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml @@ -16,6 +16,7 @@ + @@ -91,7 +92,7 @@ - select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect from equ_repair_work_order + select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect,work_person_name from equ_repair_work_order + + + + \ No newline at end of file From b418483af2b4c661124176e6b52e1281e2f628c3 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 5 Jul 2024 10:51:41 +0800 Subject: [PATCH 9/9] =?UTF-8?q?2024-07-05=20=E8=AE=BE=E5=A4=87-=E5=A4=87?= =?UTF-8?q?=E5=93=81=E5=A4=87=E4=BB=B6=E5=87=BA=E5=85=A5=E5=BA=93=E5=92=8C?= =?UTF-8?q?=E6=89=8B=E6=8C=81=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DevicePDAController.java | 17 ++++ .../java/com/op/device/domain/dto/PDADTO.java | 15 +++ .../op/device/service/IDevicePDAService.java | 2 + .../service/impl/DevicePDAServiceImpl.java | 97 +++++++++++-------- 4 files changed, 89 insertions(+), 42 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index 92b4292e2..21018d99d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -8,6 +8,7 @@ import com.op.device.domain.*; import com.op.device.domain.dto.PDADTO; import com.op.device.service.IDevicePDAService; import com.op.device.service.IEquRepairOrderService; +import com.op.device.service.IEquSparepartsInOutService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,6 +30,10 @@ public class DevicePDAController extends BaseController { @Autowired private IEquRepairOrderService equRepairOrderService; + @Autowired + private IEquSparepartsInOutService equSparepartsInOutService; + + /** * 获取今日任务工单list * @@ -198,4 +203,16 @@ public class DevicePDAController extends BaseController { public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) { return devicePDAService.selectEquFaultReasonList(equFaultReason); } + + //备品备件查询接口 + @GetMapping(value = "/querySpareDetailBySpareCode/{spareCode}") + public AjaxResult querySpareDetailBySpareCode(@PathVariable("spareCode") String spareCode) { + return devicePDAService.selectSpareDetailBySpareCode(spareCode); + } + + //备品备件出入库 + @PostMapping("/sparePartsInOutStorage") + public AjaxResult sparePartsInOutStorage(@RequestBody EquSparepartsInOut equSparepartsInOut) { + return equSparepartsInOutService.insertEquSparepartsInOut(equSparepartsInOut); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java index ee1d6463c..0d4f0a611 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java @@ -1,5 +1,9 @@ package com.op.device.domain.dto; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + // 手持传参dto public class PDADTO { // 用户名 @@ -10,6 +14,9 @@ public class PDADTO { private String shutDown; +// @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTime; + public String getOrderCode() { return orderCode; } @@ -41,4 +48,12 @@ public class PDADTO { public void setPlanType(String planType) { this.planType = planType; } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java index 70054be92..ab3c75599 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -138,4 +138,6 @@ public interface IDevicePDAService { * 故障维修措施 */ AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason); + + AjaxResult selectSpareDetailBySpareCode(String spareCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 308138089..5ca46a7ce 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -111,48 +111,48 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult getTodayTask(PDADTO pdadto) { List orderList = equOrderMapper.selectTodayTask(pdadto); - List handleList = new ArrayList<>(); - long nowTime = DateUtils.getNowDate().getTime(); - long dayMs = 86400000l; - long hourMs = 1000 * 60 * 60; - if (orderList != null) { - for (EquOrder order : orderList) { - long diff = nowTime - order.getCreateTime().getTime(); - switch (order.getPlanLoopType()) { - case "hour": - if (diff < 1000 * 60 * 60 * Long.valueOf(order.getPlanLoop())) { - handleList.add(order); - } - break; - case "day": - if (diff < (dayMs * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - case "week": - if (diff < (dayMs * 7 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - case "month": - if (diff < (dayMs * 30 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - case "season": - if (diff < (dayMs * 30 * 3 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - case "year": - if (diff < (dayMs * 365 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - } - } - } - return success(handleList); +// List handleList = new ArrayList<>(); +// long nowTime = DateUtils.getNowDate().getTime(); +// long dayMs = 86400000l; +// long hourMs = 1000 * 60 * 60; +// if (orderList != null) { +// for (EquOrder order : orderList) { +// long diff = nowTime - order.getCreateTime().getTime(); +// switch (order.getPlanLoopType()) { +// case "hour": +// if (diff < 1000 * 60 * 60 * Long.valueOf(order.getPlanLoop())) { +// handleList.add(order); +// } +// break; +// case "day": +// if (diff < (dayMs * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// case "week": +// if (diff < (dayMs * 7 * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// case "month": +// if (diff < (dayMs * 30 * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// case "season": +// if (diff < (dayMs * 30 * 3 * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// case "year": +// if (diff < (dayMs * 365 * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// } +// } +// } + return success(orderList); } /** @@ -1211,4 +1211,17 @@ public class DevicePDAServiceImpl implements IDevicePDAService { List list = equFaultReasonMapper.selectEquFaultReasonList(equFaultReason); return success(list); } + + /** + * 查询备品备件 + * + * @param + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult selectSpareDetailBySpareCode(String spareCode) { + SparePartsLedger list = sparePartsLedgerMapper.selectSpareDetailBySpareCode(spareCode); + return success(list); + } }