From 50857772d0f785682657fa784219713d1ab4c766 Mon Sep 17 00:00:00 2001 From: zhouhy Date: Fri, 19 Apr 2024 14:32:07 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=83=BD?= =?UTF-8?q?=E6=BA=90=E6=A8=A1=E5=9D=97=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?/=E8=BF=87=E6=BB=A4=E6=90=9C=E7=B4=A2=E5=A4=B1=E8=B4=A5/echarts?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=AD=89=E9=97=AE=E9=A2=98=20cron?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=A7=92/=E5=88=86=E4=B8=A4?= =?UTF-8?q?=E4=BD=8D=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E4=B8=BA0?= =?UTF-8?q?=EF=BC=88=E5=8E=9F=E6=9D=A5=E4=B8=BA*=EF=BC=89=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E3=80=81=E7=BB=93=E6=9E=9C=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E3=80=81=E8=AF=A6=E7=BB=86=E7=9A=84=E8=AF=A6=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hw/common/core/utils/uuid/Seq.java | 27 ++++ .../hw/dms/controller/DmsApiController.java | 12 +- .../DmsBaseDeviceSuplierController.java | 6 + .../com/hw/dms/domain/DmsPlanInspect.java | 78 ++++++++--- .../com/hw/dms/domain/DmsRecordInspect.java | 122 ++++++++++-------- .../mapper/DmsBaseDeviceSuplierMapper.java | 18 +-- .../dms/mapper/DmsBaseInspectRouteMapper.java | 18 +-- .../hw/dms/mapper/DmsPlanInspectMapper.java | 19 +-- .../service/IDmsBaseDeviceSuplierService.java | 21 +-- .../dms/service/IDmsPlanInspectService.java | 20 +-- .../impl/DmsBaseDeviceSuplierServiceImpl.java | 6 + .../impl/DmsPlanInspectServiceImpl.java | 72 ++++++++--- .../impl/DmsPlanRepairServiceImpl.java | 28 ++++ .../mapper/dms/DmsBaseDeviceSuplierMapper.xml | 6 +- .../mapper/dms/DmsBaseInspectRouteMapper.xml | 3 + .../mapper/dms/DmsPlanInspectMapper.xml | 37 +++++- .../mapper/dms/DmsRecordInspectMapper.xml | 23 +++- .../impl/BaseMonitorInfo1ServiceImpl.java | 25 +++- .../RecordDnbInstantController.java | 4 +- .../impl/RecordDnbInstantServiceImpl.java | 65 ++++++++-- .../controller/ReportPointDnbController.java | 4 +- .../service/impl/DataAnalysisServiceImpl.java | 3 +- .../hw/qms/domain/QmsCheckResultDetail.java | 2 + .../impl/QmsCheckResultDetailServiceImpl.java | 13 +- .../mapper/qms/QmsCheckResultMapper.xml | 12 +- hw-ui/src/api/dms/suplier.js | 8 ++ hw-ui/src/api/ems/base/WholePointData.js | 6 +- hw-ui/src/api/ems/base/emsRecord.js | 4 +- hw-ui/src/components/Crontab/result.vue | 13 +- hw-ui/src/router/index.js | 16 +++ hw-ui/src/views/dms/bom/index.vue | 17 ++- hw-ui/src/views/dms/detail/index.vue | 2 +- .../views/dms/dmsBaseInspectRoute/index.vue | 44 +++---- .../dms/dmsBaseInspectStandard/index.vue | 4 +- .../views/dms/dmsInspectRouteDetail/index.vue | 7 +- .../dms/dmsMaintInstanceActivity/index.vue | 4 +- hw-ui/src/views/dms/dmsPlanInspect/index.vue | 23 +++- hw-ui/src/views/dms/ledger/index.vue | 12 +- hw-ui/src/views/dms/lubeDetail/index.vue | 28 ++-- hw-ui/src/views/dms/suplier/index.vue | 1 + .../ems/base/ElectricityPreview/index.vue | 95 +++++++++----- .../views/ems/base/Energystatistics/index.vue | 38 +++--- .../ems/base/HistoryElectricity/index.vue | 6 +- hw-ui/src/views/ems/base/RingCounty/index.vue | 13 +- .../views/ems/base/WholePointData/index.vue | 4 +- .../ems/base/additionalRecording/index.vue | 10 +- .../src/views/ems/base/communicate/index.vue | 6 +- .../views/ems/base/dianMeasurement/index.vue | 20 +-- 48 files changed, 712 insertions(+), 313 deletions(-) diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java index d0c22e33..1c0efa56 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java @@ -150,6 +150,33 @@ public class Seq { + //检修计划序列类型 + public static final String planRepairSeqType = "PLANREPAIR"; + //检修计划接口序列数 + private static AtomicInteger planRepairSeq = new AtomicInteger(1); + //检修记录标识 + public static final String planRepairCode = "PR"; + //检修工单序列类型 + public static final String repairInstanceSeqTupe = "REPAIRINSTANCE"; + //检修工单接口序列数 + private static AtomicInteger repairInstanceSeq = new AtomicInteger(1); + //检修工单标识 + public static final String repairInstanceCode = "RI"; + + //检修计划序列类型 + public static final String planInspectSeqType = "PLANINSPECT"; + //检修计划接口序列数 + private static AtomicInteger planInspectSeq = new AtomicInteger(1); + //检修记录标识 + public static final String planInspectCode = "PIC"; + //检修工单序列类型 + public static final String InspectInstanceSeqTupe = "INSPECTINSTANCE"; + //检修工单接口序列数 + private static AtomicInteger INSPECTInstanceSeq = new AtomicInteger(1); + //检修工单标识 + public static final String InspectInstanceCode = "IIC"; + + // 保养计划序列类型 public static final String planMaintSeqType = "PLANMAINT"; diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java index ded84786..4fc404a4 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java @@ -30,17 +30,7 @@ public class DmsApiController extends BaseController { //APS-MyPuRz3G6HfBYcH8dw7Y2ai1D6iZRmXX apifox令牌 /** * PDA-报修 - * - * 需传入 - * 报修来源类型 faultSourceType - * 根据来源类型传入工单编码 faultSourceId - * 故障类别 faultType - * 故障描述 faultDescription - * 涉及操作 designOperations - * 设备id deviceId - * 维修类型 repairType - * 外协id outsrcId(可不传入) - * 图片路径 imgUrl(可不传入) + * */ @PostMapping("/PDAFault") @ResponseBody diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java index 2ef54de0..e51aa650 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java @@ -48,6 +48,12 @@ public class DmsBaseDeviceSuplierController extends BaseController } //todo 新加一个con 拿掉分页 + @GetMapping("/selectDmsBaseDeviceSuplierByDeviceId") + public AjaxResult selectDmsBaseDeviceSuplierByDeviceId(Long deviceId){ + List dmsBaseDeviceSupliers = dmsBaseDeviceSuplierService.selectDmsBaseDeviceSuplierDeviceId(deviceId); + + return success(dmsBaseDeviceSupliers); + } /** * 导出设备供应商信息列表 */ diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java index 8d8d6116..019c30cf 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java @@ -2,6 +2,7 @@ package com.hw.dms.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.hw.common.core.annotation.Excel; @@ -44,6 +45,12 @@ public class DmsPlanInspect extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "计划巡检时间", width = 30, dateFormat = "yyyy-MM-dd") private Date planTime; + /** 时限*/ + @Excel(name ="时限") + private Long timeLimit; + /** 关联sysjob主键id */ + @Excel(name = "关联sysjob主键id") + private Long jobId; /** 循环周期 */ @Excel(name = "循环周期") @@ -59,10 +66,49 @@ public class DmsPlanInspect extends BaseEntity private String cronExpression; + private Long timeLimitDays; + + private Long timeLimitHours; + + + + public Long getTimeLimitDays() { + return timeLimitDays; + } + + public void setTimeLimitDays(Long timeLimitDays) { + this.timeLimitDays = timeLimitDays; + } + + public Long getTimeLimitHours() { + return timeLimitHours; + } + + public void setTimeLimitHours(Long timeLimitHours) { + this.timeLimitHours = timeLimitHours; + } + public String getCronExpression() { return cronExpression; } + + public Long getTimeLimit() { + return timeLimit; + } + + public void setTimeLimit(Long timeLimit) { + this.timeLimit = timeLimit; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + public void setCronExpression(String cronExpression) { this.cronExpression = cronExpression; } @@ -160,22 +206,20 @@ public class DmsPlanInspect extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("planInspectId", getPlanInspectId()) - .append("planInspectCode", getPlanInspectCode()) - .append("planInspectName", getPlanInspectName()) - .append("inspectType", getInspectType()) - .append("inspectRouteId", getInspectRouteId()) - .append("deviceAmount", getDeviceAmount()) - .append("planTime", getPlanTime()) - .append("cyclePeriod", getCyclePeriod()) - .append("performer", getPerformer()) - .append("isFlag", getIsFlag()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return "DmsPlanInspect{" + + "planInspectId=" + planInspectId + + ", planInspectCode='" + planInspectCode + '\'' + + ", planInspectName='" + planInspectName + '\'' + + ", inspectType='" + inspectType + '\'' + + ", inspectRouteId=" + inspectRouteId + + ", deviceAmount=" + deviceAmount + + ", planTime=" + planTime + + ", timeLimit=" + timeLimit + + ", jobId=" + jobId + + ", cyclePeriod='" + cyclePeriod + '\'' + + ", performer='" + performer + '\'' + + ", isFlag='" + isFlag + '\'' + + ", cronExpression='" + cronExpression + '\'' + + '}'; } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsRecordInspect.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsRecordInspect.java index 349b03d4..d68497f3 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsRecordInspect.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsRecordInspect.java @@ -10,7 +10,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 巡检记录对象 dms_record_inspect - * + * * @author Open Platform * @date 2024-01-16 */ @@ -25,6 +25,8 @@ public class DmsRecordInspect extends BaseEntity @Excel(name = "巡检单号") private String billsInspectCode; + /** 计划ID*/ + private Long planInspectId; /** 检查类型(1巡检,2点检) */ @Excel(name = "检查类型(1巡检,2点检)") private String inspectType; @@ -40,8 +42,11 @@ public class DmsRecordInspect extends BaseEntity /** 计划巡检时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "计划巡检时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date planTime; - + private Date planBeginTime; + /** 计划巡检结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划巡检时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date planEndTime; /** 实际开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "实际开始时间", width = 30, dateFormat = "yyyy-MM-dd") @@ -68,135 +73,148 @@ public class DmsRecordInspect extends BaseEntity @Excel(name = "是否标识：1-是；0-否") private String isFlag; - public void setRecordInspectId(Long recordInspectId) + public void setRecordInspectId(Long recordInspectId) { this.recordInspectId = recordInspectId; } - public Long getRecordInspectId() + public Long getRecordInspectId() { return recordInspectId; } - public void setBillsInspectCode(String billsInspectCode) + public void setBillsInspectCode(String billsInspectCode) { this.billsInspectCode = billsInspectCode; } - public String getBillsInspectCode() + public String getBillsInspectCode() { return billsInspectCode; } - public void setInspectType(String inspectType) + public void setInspectType(String inspectType) { this.inspectType = inspectType; } - public String getInspectType() + public String getInspectType() { return inspectType; } - public void setInspectRouteId(Long inspectRouteId) + public void setInspectRouteId(Long inspectRouteId) { this.inspectRouteId = inspectRouteId; } - public Long getInspectRouteId() + public Long getInspectRouteId() { return inspectRouteId; } - public void setDeviceAmount(Long deviceAmount) + public void setDeviceAmount(Long deviceAmount) { this.deviceAmount = deviceAmount; } - public Long getDeviceAmount() + public Long getDeviceAmount() { return deviceAmount; } - public void setPlanTime(Date planTime) - { - this.planTime = planTime; - } - public Date getPlanTime() - { - return planTime; - } - public void setRealBeginTime(Date realBeginTime) + public void setRealBeginTime(Date realBeginTime) { this.realBeginTime = realBeginTime; } - public Date getRealBeginTime() + public Date getRealBeginTime() { return realBeginTime; } - public void setRealEndTime(Date realEndTime) + public void setRealEndTime(Date realEndTime) { this.realEndTime = realEndTime; } - public Date getRealEndTime() + public Date getRealEndTime() { return realEndTime; } - public void setPerformer(String performer) + public void setPerformer(String performer) { this.performer = performer; } - public String getPerformer() + public String getPerformer() { return performer; } - public void setInspectStatus(Long inspectStatus) + public void setInspectStatus(Long inspectStatus) { this.inspectStatus = inspectStatus; } - public Long getInspectStatus() + public Long getInspectStatus() { return inspectStatus; } - public void setInspectDuration(BigDecimal inspectDuration) + public void setInspectDuration(BigDecimal inspectDuration) { this.inspectDuration = inspectDuration; } - public BigDecimal getInspectDuration() + public BigDecimal getInspectDuration() { return inspectDuration; } - public void setIsFlag(String isFlag) + public void setIsFlag(String isFlag) { this.isFlag = isFlag; } - public String getIsFlag() + public String getIsFlag() { return isFlag; } + public Long getPlanInspectId() { + return planInspectId; + } + + public void setPlanInspectId(Long planInspectId) { + this.planInspectId = planInspectId; + } + + public Date getPlanBeginTime() { + return planBeginTime; + } + + public void setPlanBeginTime(Date planBeginTime) { + this.planBeginTime = planBeginTime; + } + + public Date getPlanEndTime() { + return planEndTime; + } + + public void setPlanEndTime(Date planEndTime) { + this.planEndTime = planEndTime; + } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("recordInspectId", getRecordInspectId()) - .append("billsInspectCode", getBillsInspectCode()) - .append("inspectType", getInspectType()) - .append("inspectRouteId", getInspectRouteId()) - .append("deviceAmount", getDeviceAmount()) - .append("planTime", getPlanTime()) - .append("realBeginTime", getRealBeginTime()) - .append("realEndTime", getRealEndTime()) - .append("performer", getPerformer()) - .append("inspectStatus", getInspectStatus()) - .append("inspectDuration", getInspectDuration()) - .append("isFlag", getIsFlag()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return "DmsRecordInspect{" + + "recordInspectId=" + recordInspectId + + ", billsInspectCode='" + billsInspectCode + '\'' + + ", planInspectId=" + planInspectId + + ", inspectType='" + inspectType + '\'' + + ", inspectRouteId=" + inspectRouteId + + ", deviceAmount=" + deviceAmount + + ", planBeginTime=" + planBeginTime + + ", planEndTime=" + planEndTime + + ", realBeginTime=" + realBeginTime + + ", realEndTime=" + realEndTime + + ", performer='" + performer + '\'' + + ", inspectStatus=" + inspectStatus + + ", inspectDuration=" + inspectDuration + + ", isFlag='" + isFlag + '\'' + + '}'; } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseDeviceSuplierMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseDeviceSuplierMapper.java index 58d3e07e..2546cf7b 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseDeviceSuplierMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseDeviceSuplierMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsBaseDeviceSuplier; /** * 设备供应商信息Mapper接口 - * + * * @author xins * @date 2023-12-28 */ -public interface DmsBaseDeviceSuplierMapper +public interface DmsBaseDeviceSuplierMapper { /** * 查询设备供应商信息 - * + * * @param supplierId 设备供应商信息主键 * @return 设备供应商信息 */ @@ -21,7 +21,7 @@ public interface DmsBaseDeviceSuplierMapper /** * 查询设备供应商信息列表 - * + * * @param dmsBaseDeviceSuplier 设备供应商信息 * @return 设备供应商信息集合 */ @@ -29,7 +29,7 @@ public interface DmsBaseDeviceSuplierMapper /** * 新增设备供应商信息 - * + * * @param dmsBaseDeviceSuplier 设备供应商信息 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsBaseDeviceSuplierMapper /** * 修改设备供应商信息 - * + * * @param dmsBaseDeviceSuplier 设备供应商信息 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsBaseDeviceSuplierMapper /** * 删除设备供应商信息 - * + * * @param supplierId 设备供应商信息主键 * @return 结果 */ @@ -53,9 +53,11 @@ public interface DmsBaseDeviceSuplierMapper /** * 批量删除设备供应商信息 - * + * * @param supplierIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsBaseDeviceSuplierBySupplierIds(Long[] supplierIds); + List selectDmsBaseDeviceSuplierDeviceId(Long deviceId); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseInspectRouteMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseInspectRouteMapper.java index 7cb3fa08..e048fddd 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseInspectRouteMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseInspectRouteMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsBaseInspectRoute; /** * 巡检线路信息Mapper接口 - * + * * @author Open Platform * @date 2024-01-16 */ -public interface DmsBaseInspectRouteMapper +public interface DmsBaseInspectRouteMapper { /** * 查询巡检线路信息 - * + * * @param inspectRouteId 巡检线路信息主键 * @return 巡检线路信息 */ @@ -21,7 +21,7 @@ public interface DmsBaseInspectRouteMapper /** * 查询巡检线路信息列表 - * + * * @param dmsBaseInspectRoute 巡检线路信息 * @return 巡检线路信息集合 */ @@ -29,7 +29,7 @@ public interface DmsBaseInspectRouteMapper /** * 新增巡检线路信息 - * + * * @param dmsBaseInspectRoute 巡检线路信息 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsBaseInspectRouteMapper /** * 修改巡检线路信息 - * + * * @param dmsBaseInspectRoute 巡检线路信息 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsBaseInspectRouteMapper /** * 删除巡检线路信息 - * + * * @param inspectRouteId 巡检线路信息主键 * @return 结果 */ @@ -53,9 +53,11 @@ public interface DmsBaseInspectRouteMapper /** * 批量删除巡检线路信息 - * + * * @param inspectRouteIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsBaseInspectRouteByInspectRouteIds(Long[] inspectRouteIds); + + Long selectAmountByInspectRouteId(Long InspectRouteId); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanInspectMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanInspectMapper.java index 99404475..95e4e1f0 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanInspectMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanInspectMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanInspect; /** * 巡检计划信息Mapper接口 - * + * * @author Open Platform * @date 2024-01-17 */ -public interface DmsPlanInspectMapper +public interface DmsPlanInspectMapper { /** * 查询巡检计划信息 - * + * * @param planInspectId 巡检计划信息主键 * @return 巡检计划信息 */ @@ -21,7 +21,7 @@ public interface DmsPlanInspectMapper /** * 查询巡检计划信息列表 - * + * * @param dmsPlanInspect 巡检计划信息 * @return 巡检计划信息集合 */ @@ -29,7 +29,7 @@ public interface DmsPlanInspectMapper /** * 新增巡检计划信息 - * + * * @param dmsPlanInspect 巡检计划信息 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsPlanInspectMapper /** * 修改巡检计划信息 - * + * * @param dmsPlanInspect 巡检计划信息 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsPlanInspectMapper /** * 删除巡检计划信息 - * + * * @param planInspectId 巡检计划信息主键 * @return 结果 */ @@ -53,9 +53,12 @@ public interface DmsPlanInspectMapper /** * 批量删除巡检计划信息 - * + * * @param planInspectIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsPlanInspectByPlanInspectIds(Long[] planInspectIds); + + DmsPlanInspect selectPlanInspectJoinJobByInspectId(Long planInspectId); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBaseDeviceSuplierService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBaseDeviceSuplierService.java index 7bdb5220..a03d85ea 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBaseDeviceSuplierService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBaseDeviceSuplierService.java @@ -1,19 +1,21 @@ package com.hw.dms.service; import java.util.List; + +import com.hw.dms.domain.DmsBaseDeviceBom; import com.hw.dms.domain.DmsBaseDeviceSuplier; /** * 设备供应商信息Service接口 - * + * * @author xins * @date 2023-12-28 */ -public interface IDmsBaseDeviceSuplierService +public interface IDmsBaseDeviceSuplierService { /** * 查询设备供应商信息 - * + * * @param supplierId 设备供应商信息主键 * @return 设备供应商信息 */ @@ -21,7 +23,7 @@ public interface IDmsBaseDeviceSuplierService /** * 查询设备供应商信息列表 - * + * * @param dmsBaseDeviceSuplier 设备供应商信息 * @return 设备供应商信息集合 */ @@ -29,7 +31,7 @@ public interface IDmsBaseDeviceSuplierService /** * 新增设备供应商信息 - * + * * @param dmsBaseDeviceSuplier 设备供应商信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IDmsBaseDeviceSuplierService /** * 修改设备供应商信息 - * + * * @param dmsBaseDeviceSuplier 设备供应商信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IDmsBaseDeviceSuplierService /** * 批量删除设备供应商信息 - * + * * @param supplierIds 需要删除的设备供应商信息主键集合 * @return 结果 */ @@ -53,9 +55,12 @@ public interface IDmsBaseDeviceSuplierService /** * 删除设备供应商信息信息 - * + * * @param supplierId 设备供应商信息主键 * @return 结果 */ public int deleteDmsBaseDeviceSuplierBySupplierId(Long supplierId); + + List selectDmsBaseDeviceSuplierDeviceId(Long deviceId); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanInspectService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanInspectService.java index c464434c..734580b7 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanInspectService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanInspectService.java @@ -1,19 +1,21 @@ package com.hw.dms.service; import java.util.List; +import java.util.function.LongPredicate; + import com.hw.dms.domain.DmsPlanInspect; /** * 巡检计划信息Service接口 - * + * * @author Open Platform * @date 2024-01-17 */ -public interface IDmsPlanInspectService +public interface IDmsPlanInspectService { /** * 查询巡检计划信息 - * + * * @param planInspectId 巡检计划信息主键 * @return 巡检计划信息 */ @@ -21,7 +23,7 @@ public interface IDmsPlanInspectService /** * 查询巡检计划信息列表 - * + * * @param dmsPlanInspect 巡检计划信息 * @return 巡检计划信息集合 */ @@ -29,7 +31,7 @@ public interface IDmsPlanInspectService /** * 新增巡检计划信息 - * + * * @param dmsPlanInspect 巡检计划信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IDmsPlanInspectService /** * 修改巡检计划信息 - * + * * @param dmsPlanInspect 巡检计划信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IDmsPlanInspectService /** * 批量删除巡检计划信息 - * + * * @param planInspectIds 需要删除的巡检计划信息主键集合 * @return 结果 */ @@ -53,9 +55,11 @@ public interface IDmsPlanInspectService /** * 删除巡检计划信息信息 - * + * * @param planInspectId 巡检计划信息主键 * @return 结果 */ public int deleteDmsPlanInspectByPlanInspectId(Long planInspectId); + + DmsPlanInspect selectPlanInspectJoinJobByInspectId(Long planInspectId); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceSuplierServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceSuplierServiceImpl.java index 22aeb515..7d0a6964 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceSuplierServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceSuplierServiceImpl.java @@ -100,4 +100,10 @@ public class DmsBaseDeviceSuplierServiceImpl implements IDmsBaseDeviceSuplierSer { return dmsBaseDeviceSuplierMapper.deleteDmsBaseDeviceSuplierBySupplierId(supplierId); } + + @Override + public List selectDmsBaseDeviceSuplierDeviceId(Long deviceId) { + + return dmsBaseDeviceSuplierMapper.selectDmsBaseDeviceSuplierDeviceId(deviceId); + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java index 6b50c5de..2b5a8579 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java @@ -4,9 +4,14 @@ import java.util.Date; import java.util.List; import com.hw.common.core.constant.SecurityConstants; +import com.hw.common.core.domain.R; import com.hw.common.core.utils.DateUtils; +import com.hw.common.core.utils.uuid.Seq; import com.hw.common.core.web.domain.AjaxResult; import com.hw.common.security.utils.SecurityUtils; +import com.hw.dms.domain.DmsBaseInspectRoute; +import com.hw.dms.domain.DmsPlanMaint; +import com.hw.dms.mapper.DmsBaseInspectRouteMapper; import com.hw.job.api.RemoteJobService; import com.hw.job.api.domain.SysJob; import com.hw.job.api.util.CronUtils; @@ -30,6 +35,8 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService private DmsPlanInspectMapper dmsPlanInspectMapper; @Autowired private RemoteJobService remoteJobService; + @Autowired + private DmsBaseInspectRouteMapper dmsBaseInspectRouteMapper; /** * 查询巡检计划信息 @@ -40,7 +47,17 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService @Override public DmsPlanInspect selectDmsPlanInspectByPlanInspectId(Long planInspectId) { - return dmsPlanInspectMapper.selectDmsPlanInspectByPlanInspectId(planInspectId); + DmsPlanInspect dmsPlanInspect = dmsPlanInspectMapper.selectPlanInspectJoinJobByInspectId(planInspectId); + Long timeLimit = dmsPlanInspect.getTimeLimit(); + if (timeLimit != null) { + Long days = timeLimit / (24 * 60 * 60l); + Long hours = timeLimit % (24 * 60 * 60l); +// System.out.println(days); +// System.out.println(hours); + dmsPlanInspect.setTimeLimitDays(days); + dmsPlanInspect.setTimeLimitHours(hours / (60 * 60l)); + } + return dmsPlanInspect; } /** @@ -52,7 +69,13 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService @Override public List selectDmsPlanInspectList(DmsPlanInspect dmsPlanInspect) { - return dmsPlanInspectMapper.selectDmsPlanInspectList(dmsPlanInspect); + List dmsPlanInspects = dmsPlanInspectMapper.selectDmsPlanInspectList(dmsPlanInspect); + for (DmsPlanInspect d : dmsPlanInspects) { + Long timeLimit = d.getTimeLimit(); + d.setTimeLimitDays(timeLimit / (24 * 60 * 60L)); + d.setTimeLimitHours((timeLimit % (24 * 60 * 60L)) / (60 * 60l)); + } + return dmsPlanInspects; } /** @@ -64,29 +87,38 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService @Override public int insertDmsPlanInspect(DmsPlanInspect dmsPlanInspect) { + String planInspectCode = Seq.getId(Seq.planInspectSeqType, Seq.planInspectCode); + + SysJob job = new SysJob(); + job.setJobName("点巡检计划编号" + planInspectCode + "工单任务"); + job.setJobGroup("DEFAULT"); + job.setInvokeTarget("ryTask.getDmsBillsInstance(\"" + planInspectCode + "\")"); + job.setCronExpression(dmsPlanInspect.getCronExpression()); + job.setMisfirePolicy("1"); + job.setConcurrent("1"); + job.setStatus("1"); + R jobIdR = remoteJobService.add(SecurityConstants.INNER, job); + String time = dmsPlanInspect.getCronExpression(); //通过cron表达式获取下一次执行时间 Date nextExecution = CronUtils.getNextExecution(time); dmsPlanInspect.setPlanTime(nextExecution); - LoginUser user = SecurityUtils.getLoginUser(); - dmsPlanInspect.setCreateBy(user.getUsername()); + dmsPlanInspect.setPlanInspectCode(planInspectCode); + dmsPlanInspect.setJobId(jobIdR.getData().longValue()); + + Long timeLimitDays = dmsPlanInspect.getTimeLimitDays()==null?0L:dmsPlanInspect.getTimeLimitDays(); + Long timeLimitHours = dmsPlanInspect.getTimeLimitHours() == null?0L:dmsPlanInspect.getTimeLimitHours(); + dmsPlanInspect.setTimeLimit((timeLimitDays * 24 * 60 * 60) + + (timeLimitHours * 60 * 60)); dmsPlanInspect.setIsFlag("1"); + dmsPlanInspect.setCreateBy(SecurityUtils.getUsername()); dmsPlanInspect.setCreateTime(DateUtils.getNowDate()); - int i = dmsPlanInspectMapper.insertDmsPlanInspect(dmsPlanInspect); + //获取设备总数 + Long aLong = dmsBaseInspectRouteMapper.selectAmountByInspectRouteId(dmsPlanInspect.getInspectRouteId()); + dmsPlanInspect.setDeviceAmount(aLong); + return dmsPlanInspectMapper.insertDmsPlanInspect(dmsPlanInspect); - List dmsPlanInspects = dmsPlanInspectMapper.selectDmsPlanInspectList(dmsPlanInspect); - DmsPlanInspect dmsPlanInspect1 = dmsPlanInspects.get(0); - SysJob job = new SysJob(); - job.setJobName("创建计划编号为"+dmsPlanInspect1.getPlanInspectCode()+"工单"); - job.setJobGroup("DEFAULT"); - job.setInvokeTarget("ryTask.getDmsRepairInstance(\""+dmsPlanInspect1.getPlanInspectId()+"\")"); - job.setCronExpression(dmsPlanInspect1.getCronExpression()); - job.setMisfirePolicy("1"); - job.setConcurrent("1"); - job.setStatus("1"); - remoteJobService.add(SecurityConstants.INNER,job); - return i; } /** @@ -127,4 +159,10 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService { return dmsPlanInspectMapper.deleteDmsPlanInspectByPlanInspectId(planInspectId); } + + @Override + public DmsPlanInspect selectPlanInspectJoinJobByInspectId(Long planInspectId) { + + return dmsPlanInspectMapper.selectPlanInspectJoinJobByInspectId(planInspectId); + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanRepairServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanRepairServiceImpl.java index b4a9408e..19e4686c 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanRepairServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanRepairServiceImpl.java @@ -1,7 +1,15 @@ package com.hw.dms.service.impl; +import java.util.Date; import java.util.List; + +import com.hw.common.core.constant.SecurityConstants; +import com.hw.common.core.domain.R; import com.hw.common.core.utils.DateUtils; +import com.hw.common.core.utils.uuid.Seq; +import com.hw.job.api.RemoteJobService; +import com.hw.job.api.domain.SysJob; +import com.hw.job.api.util.CronUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -24,6 +32,9 @@ public class DmsPlanRepairServiceImpl implements IDmsPlanRepairService @Autowired private DmsPlanRepairMapper dmsPlanRepairMapper; + @Autowired + private RemoteJobService remoteJobService; + /** * 查询检修计划信息 * @@ -85,6 +96,23 @@ public class DmsPlanRepairServiceImpl implements IDmsPlanRepairService public int insertDmsPlanRepair(DmsPlanRepair dmsPlanRepair) { +// String planRepairCode = Seq.getId(Seq.planRepairSeqType, Seq.planRepairCode); +// +// SysJob job = new SysJob(); +// job.setJobName("保养计划编号" + planRepairCode + "工单任务"); +// job.setJobGroup("DEFAULT"); +// job.setInvokeTarget("ryTask.getDmsRepairInstance(\"" + planRepairCode + "\")"); +// job.setCronExpression(dmsPlanRepair.getCronExpression()); +// job.setMisfirePolicy("1"); +// job.setConcurrent("1"); +// job.setStatus("1"); +// R jobIdR = remoteJobService.add(SecurityConstants.INNER, job); +// +// String time = dmsPlanRepair.getCronExpression(); +// Date nextExecution = CronUtils.getNextExecution(time); +// dmsPlanRepair.setRepairTime(nextExecution); +// dmsPlanRepair.setJobId(jobIdR.getData().longValue()); +// dmsPlanRepair.setPlanRepairCode(planRepairCode); dmsPlanRepair.setTimeLimit((dmsPlanRepair.getTimeLimitDays()*24*60*60) +(dmsPlanRepair.getTimeLimitHours()*60*60)); diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceSuplierMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceSuplierMapper.xml index 1e7b0300..a6d42d70 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceSuplierMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceSuplierMapper.xml @@ -27,7 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -106,4 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{supplierId} + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml index 9c7344b3..7be44412 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml @@ -99,4 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{inspectRouteId} + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml index 9b776231..b4d2fae4 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -20,32 +22,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select plan_inspect_id, plan_inspect_code, plan_inspect_name, inspect_type, inspect_route_id, device_amount, plan_time, cycle_period, performer, is_flag, remark, create_by, create_time, update_by, update_time from dms_plan_inspect + select plan_inspect_id, plan_inspect_code, plan_inspect_name, inspect_type, inspect_route_id, device_amount, plan_time, cycle_period,time_limit,job_id, performer, is_flag, remark, create_by, create_time, update_by, update_time from dms_plan_inspect - + - + insert into dms_plan_inspect @@ -55,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" inspect_route_id, device_amount, plan_time, + time_limit, + job_id, cycle_period, performer, is_flag, @@ -71,6 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{inspectRouteId}, #{deviceAmount}, #{planTime}, + #{timeLimit}, + #{jobId}, #{cyclePeriod}, #{performer}, #{isFlag}, @@ -91,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" inspect_route_id = #{inspectRouteId}, device_amount = #{deviceAmount}, plan_time = #{planTime}, + time_limit = #{timeLimit}, + job_id = #{jobId}, cycle_period = #{cyclePeriod}, performer = #{performer}, is_flag = #{isFlag}, @@ -108,9 +120,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_plan_inspect where plan_inspect_id in + delete from dms_plan_inspect where plan_inspect_id in #{planInspectId} - \ No newline at end of file + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml index 57178a90..39a93542 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml @@ -6,11 +6,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + + @@ -25,7 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select record_inspect_id, bills_inspect_code, inspect_type, inspect_route_id, device_amount, plan_time, real_begin_time, real_end_time, performer, inspect_status, inspect_duration, is_flag, remark, create_by, create_time, update_by, update_time from dms_record_inspect + select record_inspect_id,plan_inspect_id,bills_inspect_code, inspect_type, inspect_route_id, device_amount, + plan_begin_time,plan_end_time, real_begin_time, real_end_time, performer, inspect_status, inspect_duration, + is_flag, remark, create_by, create_time, update_by, update_time from dms_record_inspect + and check_result_id = #{checkResultId} + and check_rule_name like concat('%',#{checkRuleName},'%') and material_type = #{materialType} and material_id = #{materialId} and material_batch = #{materialBatch} and check_mode = #{checkMode} and check_sample = #{checkSample} - and plan_code = #{planCode} + and plan_code like concat('%',#{planCode},'%') and plan_detail_code = #{planDetailCode} - and saleorder_code = #{saleorderCode} - and po_no = #{poNo} + and saleorder_code like concat ('%',#{saleorderCode},'%') + and po_no like concat('%',#{poNo},'%') and po_line = #{poLine} - and project_no = #{projectNo} + and project_no like concat('%',#{projectNo},'%') and check_status = #{checkStatus} diff --git a/hw-ui/src/api/dms/suplier.js b/hw-ui/src/api/dms/suplier.js index 7bee5c18..7d374d07 100644 --- a/hw-ui/src/api/dms/suplier.js +++ b/hw-ui/src/api/dms/suplier.js @@ -8,6 +8,14 @@ export function listSuplier(query) { params: query }) } +// +export function selectDmsBaseDeviceSuplierByDeviceId(query) { + return request({ + url: '/dms/suplier/selectDmsBaseDeviceSuplierByDeviceId', + method: 'get', + params: query + }) +} // 查询设备供应商信息详细 export function getSuplier(supplierId) { diff --git a/hw-ui/src/api/ems/base/WholePointData.js b/hw-ui/src/api/ems/base/WholePointData.js index 32ba3a66..943f842f 100644 --- a/hw-ui/src/api/ems/base/WholePointData.js +++ b/hw-ui/src/api/ems/base/WholePointData.js @@ -14,7 +14,9 @@ export function listUser(data) { export function listUsers(data) { return request({ url: '/ems/report/pointDnb/lists', - method: 'get', + method: 'post', + // data: qs.stringify(data), + // contentType:'application/x-www-form-urlencoded', data: data, }) } @@ -28,7 +30,7 @@ export function listUser2(data) { // contentType:'application/x-www-form-urlencoded', }) } -// 柱状图1 +// 柱状图1-电整点数据能耗统计 export function dnbCountingData(query) { return request({ url: '/ems/report/board/dnbCountingData', diff --git a/hw-ui/src/api/ems/base/emsRecord.js b/hw-ui/src/api/ems/base/emsRecord.js index a898387f..898b174f 100644 --- a/hw-ui/src/api/ems/base/emsRecord.js +++ b/hw-ui/src/api/ems/base/emsRecord.js @@ -6,8 +6,8 @@ export function listHistory(query) { console.log("listUser1:", query); return request({ url: '/ems/record/dnbInstant/list', - method: 'get', - params: query + method: 'post', + data: query }) } diff --git a/hw-ui/src/components/Crontab/result.vue b/hw-ui/src/components/Crontab/result.vue index b2f1c1ab..7f830806 100644 --- a/hw-ui/src/components/Crontab/result.vue +++ b/hw-ui/src/components/Crontab/result.vue @@ -57,6 +57,7 @@ export default { let DDate = this.dateArr[3]; let MDate = this.dateArr[4]; let YDate = this.dateArr[5]; + // 获取当前时间在数组中的索引 let sIdx = this.getIndex(sDate, nSecond); let mIdx = this.getIndex(mDate, nMin); @@ -448,9 +449,11 @@ export default { this.dateArr[1] = this.getCycleArr(rule, 60, true) } else if (rule.indexOf('/') >= 0) { this.dateArr[1] = this.getAverageArr(rule, 59) - } else if (rule !== '*') { + } else if (rule !== '*' && rule !=='0') { this.dateArr[1] = this.getAssignArr(rule) - } + } else if (rule =='*'){ + this.dateArr[1] = '0'; + } }, // 获取"秒"数组 getSecondArr(rule) { @@ -459,9 +462,13 @@ export default { this.dateArr[0] = this.getCycleArr(rule, 60, true) } else if (rule.indexOf('/') >= 0) { this.dateArr[0] = this.getAverageArr(rule, 59) - } else if (rule !== '*') { + } else if (rule !== '*' &&rule!=='0') { this.dateArr[0] = this.getAssignArr(rule) } + //当分与秒没有被配置时，自动赋值0 + else if (rule=='*'){ + this.dateArr[0] = '0'; + } }, // 根据传进来的min-max返回一个顺序的数组 getOrderArr(min, max) { diff --git a/hw-ui/src/router/index.js b/hw-ui/src/router/index.js index a9abbe6b..5e7509d6 100644 --- a/hw-ui/src/router/index.js +++ b/hw-ui/src/router/index.js @@ -388,6 +388,7 @@ export const dynamicRoutes = [ }, ], }, + //审批保养工单路由 { path: "/dms/dmsMaintInstanceActivity", @@ -513,6 +514,21 @@ export const dynamicRoutes = [ } ] }, + //质检结果详细 + { + path: "/qms/base/checkresultdetail", + component: Layout, + hidden: true, + permissions: ["tool:gen:edit"], + children: [ + { + path: "index/:checkResultId(\\d+)", + component: () => import("@/views/qms/base/checkresultdetail/index"), + name: "checkResultDetail", + meta: { title: "质检结果详细", activeMenu: "/qms/base/checkresultdetail" }, + }, + ], + }, ] diff --git a/hw-ui/src/views/dms/bom/index.vue b/hw-ui/src/views/dms/bom/index.vue index cbdfbf97..04cd7887 100644 --- a/hw-ui/src/views/dms/bom/index.vue +++ b/hw-ui/src/views/dms/bom/index.vue @@ -169,7 +169,8 @@ - + @@ -184,7 +185,7 @@ - + @@ -232,6 +233,7 @@ export default { children: "children", label: "typeName" }, + isShowBom:false, deptName:undefined, ledgerList:[], // 遮罩层 @@ -286,6 +288,16 @@ export default { this.getTreeselectDeviceType(); }, methods: { + change(){ + if (this.form.parentId != 0){ + this.isShowBom = true; + this.form.bomAmount = null; + } + if (this.form.parentId ==0){ + this.isShowBom = false; + this.form.bomAmount = 1; + } + }, /** 查询设备台账信息列表 */ getDeviceLedger() { @@ -437,6 +449,7 @@ export default { this.getList(); }); } else { + addBom(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; diff --git a/hw-ui/src/views/dms/detail/index.vue b/hw-ui/src/views/dms/detail/index.vue index ff12054f..ecde3314 100644 --- a/hw-ui/src/views/dms/detail/index.vue +++ b/hw-ui/src/views/dms/detail/index.vue @@ -197,7 +197,7 @@ - + - - - + + + + + + + + + + + + @@ -199,16 +199,16 @@ - - - - - - + + + + + + + + + + --> - - + + --> - + + :value="item.inspectStandardId.toString()"> @@ -321,6 +321,7 @@ export default { getInspectStandard() { listDmsBaseInspectStandard(this.queryParams).then(response => { this.dmsBaseInspectStandardList = response.rows; + console.log(this.dmsBaseInspectStandardList) }); }, //查询设备信息 diff --git a/hw-ui/src/views/dms/dmsMaintInstanceActivity/index.vue b/hw-ui/src/views/dms/dmsMaintInstanceActivity/index.vue index 54435173..23d018b5 100644 --- a/hw-ui/src/views/dms/dmsMaintInstanceActivity/index.vue +++ b/hw-ui/src/views/dms/dmsMaintInstanceActivity/index.vue @@ -64,12 +64,12 @@ - + - + diff --git a/hw-ui/src/views/dms/dmsPlanInspect/index.vue b/hw-ui/src/views/dms/dmsPlanInspect/index.vue index 68523e42..be329310 100644 --- a/hw-ui/src/views/dms/dmsPlanInspect/index.vue +++ b/hw-ui/src/views/dms/dmsPlanInspect/index.vue @@ -163,6 +163,14 @@ {{ parseTime(scope.row.planTime, '{y}-{m}-{d}') }} + + + @@ -213,7 +221,7 @@ - + {{dict.label}} - - + + + + + + + + + + + diff --git a/hw-ui/src/views/dms/ledger/index.vue b/hw-ui/src/views/dms/ledger/index.vue index eacf84b6..76036d81 100644 --- a/hw-ui/src/views/dms/ledger/index.vue +++ b/hw-ui/src/views/dms/ledger/index.vue @@ -364,7 +364,8 @@ :tree-props="{children: 'children', hasChildren: 'hasChildren'}" > - + + @@ -625,7 +626,7 @@ From 7d6da1d87cc5f0406d47b941b77c4c4ddbd61646 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 22 Apr 2024 16:05:57 +0800 Subject: [PATCH 5/7] =?UTF-8?q?change=20-=20=E6=8F=90=E7=A4=BA=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/common/service/impl/SysPointRouterServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/common/service/impl/SysPointRouterServiceImpl.java b/hw-modules/hw-system/src/main/java/com/hw/system/common/service/impl/SysPointRouterServiceImpl.java index 70e5fedd..9ff6e1df 100644 --- a/hw-modules/hw-system/src/main/java/com/hw/system/common/service/impl/SysPointRouterServiceImpl.java +++ b/hw-modules/hw-system/src/main/java/com/hw/system/common/service/impl/SysPointRouterServiceImpl.java @@ -21,7 +21,7 @@ import com.hw.system.common.service.ISysPointRouterService; @Service public class SysPointRouterServiceImpl implements ISysPointRouterService { @Autowired - private static SysPointRouterMapper sysPointRouterMapper; + private SysPointRouterMapper sysPointRouterMapper; /** * 查询提示路由信息 From 1ea8d90839d361f8c16e0ca46cf9c70dfa587e3b Mon Sep 17 00:00:00 2001 From: xins Date: Mon, 22 Apr 2024 17:58:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?2.1.7=20jindie:=E5=90=8C=E6=AD=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=AE=8C=E5=96=84=20tdengine=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0drop=20table=E6=96=B9=E6=B3=95=20mes=EF=BC=9A=E4=BA=94?= =?UTF-8?q?=E6=A5=BC=E4=B8=8B=E5=8F=91=E6=9F=9C=E4=BD=93=E7=BB=99=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E6=97=B6=EF=BC=8C=E6=A0=A1=E9=AA=8C=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9A=84=E6=B4=BE=E5=B7=A5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tdengine/api/RemoteTdEngineService.java | 2 ++ .../hw/tdengine/api/domain/TdTableDropVo.java | 27 +++++++++++++++ .../RemoteTdEngineFallbackFactory.java | 5 +++ .../impl/KingdeeErpSyncServiceImpl.java | 18 ++++++---- .../hw/mes/mapper/MesProductPlanMapper.java | 10 ++++++ .../impl/MesProductPlanServiceImpl.java | 33 +++++++++++++++--- .../mapper/mes/MesProductPlanMapper.xml | 34 +++++++++++++++++++ .../controller/TdEngineController.java | 29 ++++++++++++++++ .../hw/tdengine/mapper/TdEngineMapper.java | 8 +++++ .../hw/tdengine/service/ITdEngineService.java | 12 +++++++ .../service/impl/TdEngineServiceImpl.java | 13 +++++++ .../mapper/tdengine/TdEngineMapper.xml | 4 +++ 12 files changed, 183 insertions(+), 12 deletions(-) create mode 100644 hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/domain/TdTableDropVo.java diff --git a/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/RemoteTdEngineService.java b/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/RemoteTdEngineService.java index 13a53419..61dc4056 100644 --- a/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/RemoteTdEngineService.java +++ b/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/RemoteTdEngineService.java @@ -71,4 +71,6 @@ public interface RemoteTdEngineService { @PostMapping("/tdengine/alterTableTags") public R alterTableTags(@Validated @RequestBody List alterTagVos, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PostMapping("/tdengine/dropTable") + R dropTable(@Validated @RequestBody TdTableDropVo tdTableDropVo, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/domain/TdTableDropVo.java b/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/domain/TdTableDropVo.java new file mode 100644 index 00000000..b7e7ab69 --- /dev/null +++ b/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/domain/TdTableDropVo.java @@ -0,0 +1,27 @@ +package com.hw.tdengine.api.domain; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * @Description: drop子表实体类 + * @ClassName: TdTableDropVo + * @Author : xins + * @Date :2024-04-20 11:09 + * @Version :1.0 + */ +@Data +public class TdTableDropVo { + + //数据库名称 + @NotEmpty(message="databaseName cannot be empty") + private String databaseName; + + + //子表名称 + @NotEmpty(message="tableName cannot be empty") + private String tableName; + + +} diff --git a/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/factory/RemoteTdEngineFallbackFactory.java b/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/factory/RemoteTdEngineFallbackFactory.java index efdd6d48..234683e6 100644 --- a/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/factory/RemoteTdEngineFallbackFactory.java +++ b/hw-api/hw-api-tdengine/src/main/java/com/hw/tdengine/api/factory/RemoteTdEngineFallbackFactory.java @@ -113,6 +113,11 @@ public class RemoteTdEngineFallbackFactory implements FallbackFactory dropTable(TdTableDropVo tdTableDropVo, String source) { + return R.fail("drop子表失败:" + throwable.getMessage()); + } + }; } } diff --git a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java index 61fb86e1..5d6b909f 100644 --- a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java +++ b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java @@ -44,7 +44,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { String orderString = ""; int topRowCount = 0; int startRow = 0; - int limit = 2000; + int limit = 100; queryJson.put("FormId", formId); queryJson.put("FieldKeys", fieldKeys); queryJson.put("OrderString", orderString); @@ -77,13 +77,13 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { JSONObject queryJson = new JSONObject(); String formId = "BD_Material"; String fieldKeys = "FMaterialId,FNumber,FName,FBaseUnitId,FSpecification,FNETWEIGHT,FGROSSWEIGHT," + - "FCreateDate,FModifyDate,FApproveDate,FCreateOrgId,FUseOrgId"; + "FCreateDate,FModifyDate,FApproveDate,FCreateOrgId,FUseOrgId,FPurchasePriceUnitId"; // String filterString = "FNumber='98010102'"; String filterString = ""; String orderString = ""; int topRowCount = 0; int startRow = 0; - int limit = 23; + int limit = 99; queryJson.put("FormId", formId); queryJson.put("FieldKeys", fieldKeys); queryJson.put("FilterString", filterString); @@ -179,12 +179,15 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { JSONObject queryJson = new JSONObject(); String formId = "SAL_SaleOrder"; - String fieldKeys = "FID,FBillNo,FApproveDate,FSaleOrderEntry_FEntryID,FMaterialId.FNumber,FMaterialName,FQty,FModifyDate,FMinPlanDeliveryDate"; + String fieldKeys = "FID,FBillNo,FApproveDate,FSaleOrderEntry_FEntryID,FMaterialId.FNumber,FMaterialName," + + "FQty,FModifyDate,FMinPlanDeliveryDate,FAuxPropId,FStockId,FOwnerId,FSaleDeptId,FPrice,FStockOrgId"; +// String filterString = "FNumber='98010102'"; + filterString = ""; String orderString = ""; int topRowCount = 0; int startRow = 0; - int limit = 2000; + int limit = 10; queryJson.put("FormId", formId); queryJson.put("FieldKeys", fieldKeys); queryJson.put("FilterString", filterString); @@ -246,7 +249,8 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { JSONObject queryJson = new JSONObject(); String formId = "PUR_PurchaseOrder"; - String fieldKeys = "FID,FBillNo,FApproveDate,FDocumentStatus,FPOOrderEntry_FEntryID,FMaterialId.FNumber,FMaterialId.FName,FQty,FDeliveryDate"; + String fieldKeys = "FID,FBillNo,FApproveDate,FDocumentStatus,FPOOrderEntry_FEntryID,FMaterialId.FNumber,FMaterialId.FName," + + "FQty,FDeliveryDate,FUnitId,FStockUnitID,FPriceUnitID,FAuxPropId,FSrcBillNo,FPurchaseOrgId,F_TOND_Base,FSupplierId"; String filterString = ""; String orderString = ""; int topRowCount = 0; @@ -272,7 +276,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { // syncSupplierInfoFromErp(); // syncMaterialInfoFromErp(); // syncSaleOrderFromErp(); -// syncPurchaseOrderFromErp(); + syncPurchaseOrderFromErp(); // syncProjectInfoFromErp(); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductPlanMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductPlanMapper.java index ee5816ed..d1d13a55 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductPlanMapper.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductPlanMapper.java @@ -94,4 +94,14 @@ public interface MesProductPlanMapper * @return 生产派工集合 */ public List selectMesProductPlanJoinList(MesProductPlan mesProductPlan); + + + + /** + * 查询生产派工 + * + * @param planCode 生产计划编号(唯一索引) + * @return 生产派工 + */ + public MesProductPlan selectOnlyMesProductPlanByPlanCode(String planCode); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java index afc9ce44..7cc8c723 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java @@ -397,8 +397,30 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { throw new ServiceException("此物料条码已经下发，无需重复下发"); } - + //下发工位判断有没有派工和完成情况 + String planCode = mesBaseBarcodeInfo.getPlanCode(); + MesProductPlan mesProductPlan = mesProductPlanMapper.selectOnlyMesProductPlanByPlanCode(planCode); Long stationId = mesAssignTaskVo.getStationId(); + + MesProductPlan queryProductPlan = new MesProductPlan(); + queryProductPlan.setProductOrderId(mesProductPlan.getProductOrderId()); + queryProductPlan.setStationId(stationId); + List mesProductPlanList = mesProductPlanMapper.selectMesProductPlanList(queryProductPlan); + if (mesProductPlanList == null || mesProductPlanList.isEmpty()) { + throw new ServiceException("此工位没有派工"); + } + + BigDecimal totalPlanAmount = mesProductPlanList.stream().map(MesProductPlan::getPlanAmount).reduce(BigDecimal.ZERO, BigDecimal::add); + + MesMaterialAssignInfo queryMaterialAssignInfo = new MesMaterialAssignInfo(); + queryMaterialAssignInfo.setStationId(stationId); + List mesMaterialAssignInfoList = mesMaterialAssignInfoMapper.selectMesMaterialAssignInfoList(queryMesMaterialAssignInfo); + BigDecimal assignedAmount = mesMaterialAssignInfoList == null ? BigDecimal.ZERO : BigDecimal.valueOf(mesMaterialAssignInfoList.size()); + + if (assignedAmount.add(BigDecimal.ONE).compareTo(totalPlanAmount) > 0) { + throw new ServiceException("此工位已经分配数量" + assignedAmount + ",计划数量" + totalPlanAmount + ",不能再分配"); + } + Date currentDate = new Date(); MesMaterialAssignInfo mesMaterialAssignInfo = new MesMaterialAssignInfo(); mesMaterialAssignInfo.setMaterialBarcode(materialBarcode); @@ -408,13 +430,13 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { mesMaterialAssignInfoMapper.insertMesMaterialAssignInfo(mesMaterialAssignInfo); - Long stationNo = stationId % 10; + Long stationNo = stationId % 10;//第几个工位取个位数 JSONObject assignTaskMessageJson = new JSONObject(); assignTaskMessageJson.put("stationNo", stationNo); assignTaskMessageJson.put("time", currentDate.getTime()); assignTaskMessageJson.put("materialBarcode", materialBarcode); - //2、订阅者读取此条信息后会给出反馈，直接写入redis，如果在10s内返回，则成功，如果10s内失败则失败 + //如果在10s内返回，则成功，如果10s内失败则失败 String returnMsg = SocketUtils. sendAndReceive(mesConfig.getSocketServerHost(), mesConfig.getSocketServerPort(), mesConfig.getSocketServerReadTimeOut(), assignTaskMessageJson.toString()); if (StringUtils.isEmpty(returnMsg)) { @@ -434,17 +456,18 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { /** * 查询物料安装情况 + * * @param hashMap (installType=1已安装,installType=2未安装) * @return */ @Override public List> selectMaterialInstallationCircumstance(Map hashMap) { List> result = new ArrayList<>(); - if (hashMap.containsKey("installType") && hashMap.get("installType").equals("1")){ + if (hashMap.containsKey("installType") && hashMap.get("installType").equals("1")) { result = mesMaterialCheckResultMapper.selectMaterialInstallationCircumstance(hashMap); } if (hashMap.containsKey("installType") && hashMap.get("installType").equals("2") - && hashMap.containsKey("planDetailId") && hashMap.containsKey("materialBomId")){ + && hashMap.containsKey("planDetailId") && hashMap.containsKey("materialBomId")) { result = mesMaterialCheckResultMapper.selectMaterialUnInstallationCircumstance(hashMap); } return result; diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductPlanMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductPlanMapper.xml index 8ed62a32..f15372f8 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductPlanMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductPlanMapper.xml @@ -332,4 +332,38 @@ + + + + diff --git a/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/controller/TdEngineController.java b/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/controller/TdEngineController.java index 966962d2..f37ccfe7 100644 --- a/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/controller/TdEngineController.java +++ b/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/controller/TdEngineController.java @@ -538,4 +538,33 @@ public class TdEngineController { } + /** + * @return R + * @param: tableDto + * @description 创建子表 + * @author xins + * @date 2023-08-28 16:17 + */ + @InnerAuth + @PostMapping("/dropTable") + public R dropTable(@Validated @RequestBody TdTableDropVo tdTableDropVo) { + try { + String databaseName = tdTableDropVo.getDatabaseName(); + String tableName = tdTableDropVo.getTableName(); + this.tdEngineService.dropTable(databaseName, tableName); + log.info("successfully droped table " + tableName); + return R.ok("successfully droped table " + tableName); + } catch (Exception e) { + String message = e.getCause().getMessage(); + try { + message = message.substring(message.lastIndexOf("invalid operation")); + } catch (Exception ex) { + log.error(ex.getMessage()); + } + log.error(message); + return R.fail(message); + } + } + + } diff --git a/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/mapper/TdEngineMapper.java b/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/mapper/TdEngineMapper.java index 81b5aab7..e96b565d 100644 --- a/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/mapper/TdEngineMapper.java +++ b/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/mapper/TdEngineMapper.java @@ -166,6 +166,14 @@ public interface TdEngineMapper { int getCountOfSuperTableHistoryData(TdSuperTableEmsSelectVo tdSuperTableEmsSelectVo); + /** + * drop 子表 + * + * @param databaseName + * @param tableName + */ + void dropTable(@Param("databaseName") String databaseName, + @Param("tableName") String tableName); // /** // * 检查表是否存在 diff --git a/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/service/ITdEngineService.java b/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/service/ITdEngineService.java index 160b5ca5..781916c8 100644 --- a/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/service/ITdEngineService.java +++ b/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/service/ITdEngineService.java @@ -158,6 +158,18 @@ public interface ITdEngineService { * @param alterTagVos */ public void alterTableTags(List alterTagVos); + + + /** + * @param: databaseName + * @param: tableName + * @description drop子表 + * @author xins + * @date 2024-04-20 11:08 + */ + public void dropTable(String databaseName, String tableName) throws Exception; + + // void initSTableFrame(String msg) throws Exception; // List> getRealtimeData(SelectVisualDto selectVisualDto); diff --git a/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/service/impl/TdEngineServiceImpl.java b/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/service/impl/TdEngineServiceImpl.java index 012080a1..f81076f5 100644 --- a/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/service/impl/TdEngineServiceImpl.java +++ b/hw-modules/hw-tdengine/src/main/java/com/hw/tdengine/service/impl/TdEngineServiceImpl.java @@ -282,6 +282,19 @@ public class TdEngineServiceImpl implements ITdEngineService { } + /** + * @param: databaseName + * @param: tableName + * @description drop子表 + * @author xins + * @date 2024-04-20 11:08 + */ + @Override + public void dropTable(String databaseName, String tableName) throws Exception { + this.tdEngineMapper.dropTable(databaseName, tableName); + + } + // // /** // * 检查数据库表是否存在 diff --git a/hw-modules/hw-tdengine/src/main/resources/mapper/tdengine/TdEngineMapper.xml b/hw-modules/hw-tdengine/src/main/resources/mapper/tdengine/TdEngineMapper.xml index e935dac0..513c4d7a 100644 --- a/hw-modules/hw-tdengine/src/main/resources/mapper/tdengine/TdEngineMapper.xml +++ b/hw-modules/hw-tdengine/src/main/resources/mapper/tdengine/TdEngineMapper.xml @@ -361,6 +361,10 @@ + + drop table #{databaseName}.#{tableName} + + -X-KDApi-AcctID =657953112be3c4 +X-KDApi-AcctID =65e56ceb72f33b # -X-KDApi-AppID=265686_SY0M09lvzkp/18wG4/RBRa1GRs2V2pls +X-KDApi-AppID=262997_5Y0vSaDv0MpW7a9JT54CRa9G6gT7SOlt # -X-KDApi-AppSec =317a6730c9ec4fafa757ca4a3499d059 +X-KDApi-AppSec =b75a20c9294c48648d49f69903d6dc86 # X-KDApi-UserName =张铭潇 # diff --git a/hw-ui/src/views/mes/processInfo/index.vue b/hw-ui/src/views/mes/processInfo/index.vue index 1b799d3d..861ca838 100644 --- a/hw-ui/src/views/mes/processInfo/index.vue +++ b/hw-ui/src/views/mes/processInfo/index.vue @@ -532,9 +532,7 @@ export default { this.$refs["form"].validate(valid => { if (valid) { this.form.mesBaseProcessProdlineList = this.mesBaseProcessProdlineList; - if (!/^[0-9]\d*$/.test(this.form.productionTimeDays) - || !/^[0-9]\d*$/.test(this.form.productionTimeHours) - || !/^[0-9]\d*$/.test(this.form.productionTimeMinutes)) { + if (this.form.productionTime <= 0) { this.$modal.msgError("标准工时天、小时、分钟需为大于等于0的正整数！"); return; } diff --git a/kdwebapi.properties b/kdwebapi.properties index 4d9f21d1..54a53de7 100644 --- a/kdwebapi.properties +++ b/kdwebapi.properties @@ -6,11 +6,11 @@ #X-KDApi-ServerUrl=https://apiexp.open.kingdee.com/k3cloud/ # -X-KDApi-AcctID =657953112be3c4 +X-KDApi-AcctID =65e56ceb72f33b # -X-KDApi-AppID=265686_SY0M09lvzkp/18wG4/RBRa1GRs2V2pls +X-KDApi-AppID=262997_5Y0vSaDv0MpW7a9JT54CRa9G6gT7SOlt # -X-KDApi-AppSec =317a6730c9ec4fafa757ca4a3499d059 +X-KDApi-AppSec =b75a20c9294c48648d49f69903d6dc86 # X-KDApi-UserName =张铭潇 #