Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
#	op-auth/src/main/resources/bootstrap.yml
#	op-gateway/src/main/resources/bootstrap.yml
#	op-modules/op-mes/push-mes.bat
#	op-modules/op-mes/src/main/resources/bootstrap.yml
#	op-modules/op-sap/src/main/resources/bootstrap.yml
#	op-modules/op-system/src/main/resources/bootstrap.yml
master
Yangwl 2 years ago
parent bb0ac02cc8 c044825dd4
commit 6fb697e5ca
174 changed files with 7994 additions and 617 deletions
Show Stats Download Patch File Download Diff File

24
op-api/op-api-system/src/main/java/com/op/system/api/RemoteDeviceService.java
Unescape Escape View File

@ -0,0 +1,24 @@
package com.op.system.api;
import com.op.common.core.constant.ServiceNameConstants;
import com.op.common.core.domain.R;
import com.op.system.api.factory.RemoteDeviceFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;
/**
* 用户服务
*
* @author OP
*/
@FeignClient(contextId = "remoteDeviceService", value = ServiceNameConstants.DEVICE_SERVICE, fallbackFactory = RemoteDeviceFallbackFactory.class)
public interface RemoteDeviceService {
@PostMapping("/deviceTask/createSpotCheckPlanTask")
public R createSpotCheckPlanTask();
}

64
op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BaseBomDTO.java
Unescape Escape View File

@ -96,6 +96,70 @@ public class BaseBomDTO extends BaseEntity {
@Excel(name = "是否在用")
private String currentVersion;
private String component;
private String componentName;
private String unit;
private String productGroup;
private String productGroupName;
private String productCode;
private String workorderCode;
public String getWorkorderCode() {
return workorderCode;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getComponent() {
return component;
}
public void setComponent(String component) {
this.component = component;
}
public String getComponentName() {
return componentName;
}
public void setComponentName(String componentName) {
this.componentName = componentName;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getProductGroup() {
return productGroup;
}
public void setProductGroup(String productGroup) {
this.productGroup = productGroup;
}
public String getProductGroupName() {
return productGroupName;
}
public void setProductGroupName(String productGroupName) {
this.productGroupName = productGroupName;
}
private List<BaseBomComponentDTO> children;
public List<BaseBomComponentDTO> getChildren() {

687
op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java
Unescape Escape View File

@ -0,0 +1,687 @@
package com.op.system.api.domain.mes;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
/**
* 物料管理 base_product
*
* @author JGY
* @date 2023-07-18
*/
public class BaseProductDTO extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键ID */
private String productId;
/** 物料编码 */
@Excel(name = "物料编码")
private String productCode;
/** 物料名称 */
@Excel(name = "物料名称")
private String productDescZh;
/** 物料名称 */
@Excel(name = "物料型号")
private String productModel;
/** 英文描述 */
@Excel(name = "英文描述")
private String productDescEn;
/** 序列号规则代码 */
@Excel(name = "序列号规则代码")
private String ruleCode;
/** 旧物料号 */
@Excel(name = "旧物料号")
private String oldProductCode;
/** 散件物料号 */
@Excel(name = "散件物料号")
private String partsProductCode;
/** 69码 */
@Excel(name = "69码")
private String skuBarcode;
/** 长 */
@Excel(name = "长")
private BigDecimal length;
/** 宽 */
@Excel(name = "宽")
private BigDecimal width;
/** 高 */
@Excel(name = "高")
private BigDecimal height;
/** 毛重 */
@Excel(name = "毛重")
private BigDecimal grossWeight;
/** 净重 */
@Excel(name = "净重")
private BigDecimal netWeight;
/** 皮重 */
@Excel(name = "皮重")
private BigDecimal tareWeight;
/** 体积 */
@Excel(name = "体积")
private BigDecimal volume;
/** 单价 */
@Excel(name = "单价")
private BigDecimal unitPrice;
/** 物料组 */
@Excel(name = "物料类别组")
private String productGroup;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String productGroupName;
/** 用户自定义1 */
@Excel(name = "用户自定义1")
private String userDefined1;
/** 用户自定义2 */
@Excel(name = "用户自定义2")
private String userDefined2;
/** 用户自定义3 */
@Excel(name = "用户自定义3")
private String userDefined3;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String userDefined4;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String userDefined5;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String userDefined6;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String factoryCode;
/** 激活标记 */
@Excel(name = "激活标记")
private String activeFlag;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String syncFlag;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String primaryUom;
/** $column.columnComment */
private String delFlag;
/** 订单单位 */
@Excel(name = "订单单位")
private String bstme;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private BigDecimal basicOrder;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private BigDecimal convOrder;
/** 发货单位 */
@Excel(name = "发货单位")
private String ausme;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private BigDecimal basicIssue;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private BigDecimal convIssue;
/** 是否补料（0否 */
@Excel(name = "是否补料", readConverterExp = "是否补料（0否")
private String appendFlag;
/** 补料比例 */
@Excel(name = "补料比例")
private String appendPercent;
/** 物料类型 */
@Excel(name = "物料类型")
private String mtart;
/** 品类 */
@Excel(name = "品类")
private String category;
/** 每PC单圈 */
@Excel(name = "每PC单圈")
private String pc;
/** 标准效率 */
@Excel(name = "标准效率")
private BigDecimal iei;
/** 标准用人 */
@Excel(name = "标准用人")
private BigDecimal manStandar;
/** 喷药方式 */
@Excel(name = "喷药方式")
private String sprayWay;
/** 白坯直径 */
@Excel(name = "白坯直径")
private BigDecimal blankDiameter;
/** 白坯物料号 */
@Excel(name = "白坯物料号")
private String blankNo;
/** 标准喷药量（KG/PC） */
@Excel(name = "标准喷药量", readConverterExp = "K=G/PC")
private BigDecimal sprayVolume;
/** 药液料号 */
@Excel(name = "药液料号")
private String liquidNo;
/** 标准内膜用量（KG/PC） */
@Excel(name = "标准内膜用量", readConverterExp = "K=G/PC")
private BigDecimal endometrialDosage;
/** 标准外模用量(KG/PC) */
@Excel(name = "标准外模用量(KG/PC)")
private BigDecimal outerFilmDosage;
/** 支架 */
@Excel(name = "支架")
private Long support;
/** 支架物料号 */
@Excel(name = "支架物料号")
private String supportNo;
/** 吸塑 */
@Excel(name = "吸塑")
private Long pvc;
/** 支架盘 */
@Excel(name = "支架盘")
private Long supportPlate;
/** 其它 */
@Excel(name = "其它")
private String other;
public void setCategory(String category) {
this.category = category;
}
public String getCategory() {
return category;
}
public void setPc(String pc) {
this.pc = pc;
}
public String getPc() {
return pc;
}
public void setIei(BigDecimal iei) {
this.iei = iei;
}
public BigDecimal getIei() {
return iei;
}
public void setManStandar(BigDecimal manStandar) {
this.manStandar = manStandar;
}
public BigDecimal getManStandar() {
return manStandar;
}
public void setSprayWay(String sprayWay) {
this.sprayWay = sprayWay;
}
public String getSprayWay() {
return sprayWay;
}
public void setBlankDiameter(BigDecimal blankDiameter) {
this.blankDiameter = blankDiameter;
}
public BigDecimal getBlankDiameter() {
return blankDiameter;
}
public void setBlankNo(String blankNo) {
this.blankNo = blankNo;
}
public String getBlankNo() {
return blankNo;
}
public void setSprayVolume(BigDecimal sprayVolume) {
this.sprayVolume = sprayVolume;
}
public BigDecimal getSprayVolume() {
return sprayVolume;
}
public void setLiquidNo(String liquidNo) {
this.liquidNo = liquidNo;
}
public String getLiquidNo() {
return liquidNo;
}
public void setEndometrialDosage(BigDecimal endometrialDosage) {
this.endometrialDosage = endometrialDosage;
}
public BigDecimal getEndometrialDosage() {
return endometrialDosage;
}
public void setOuterFilmDosage(BigDecimal outerFilmDosage) {
this.outerFilmDosage = outerFilmDosage;
}
public BigDecimal getOuterFilmDosage() {
return outerFilmDosage;
}
public void setSupport(Long support) {
this.support = support;
}
public Long getSupport() {
return support;
}
public void setSupportNo(String supportNo) {
this.supportNo = supportNo;
}
public String getSupportNo() {
return supportNo;
}
public void setPvc(Long pvc) {
this.pvc = pvc;
}
public Long getPvc() {
return pvc;
}
public void setSupportPlate(Long supportPlate) {
this.supportPlate = supportPlate;
}
public Long getSupportPlate() {
return supportPlate;
}
public void setOther(String other) {
this.other = other;
}
public String getOther() {
return other;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductId() {
return productId;}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductCode() {
return productCode;
}
public void setProductDescZh(String productDescZh) {
this.productDescZh = productDescZh;
}
public String getProductDescZh() {
return productDescZh;
}
public void setProductModel(String productModel) {
this.productModel = productModel;
}
public String getProductModel() {
return productModel;
}
public void setProductDescEn(String productDescEn) {
this.productDescEn = productDescEn;
}
public String getProductDescEn() {
return productDescEn;
}
public void setRuleCode(String ruleCode) {
this.ruleCode = ruleCode;
}
public String getRuleCode() {
return ruleCode;
}
public void setOldProductCode(String oldProductCode) {
this.oldProductCode = oldProductCode;
}
public String getOldProductCode() {
return oldProductCode;
}
public void setPartsProductCode(String partsProductCode) {
this.partsProductCode = partsProductCode;
}
public String getPartsProductCode() {
return partsProductCode;
}
public void setSkuBarcode(String skuBarcode) {
this.skuBarcode = skuBarcode;
}
public String getSkuBarcode() {
return skuBarcode;
}
public void setLength(BigDecimal length) {
this.length = length;
}
public BigDecimal getLength() {
return length;
}
public void setWidth(BigDecimal width) {
this.width = width;
}
public BigDecimal getWidth() {
return width;
}
public void setHeight(BigDecimal height) {
this.height = height;
}
public BigDecimal getHeight() {
return height;
}
public void setGrossWeight(BigDecimal grossWeight) {
this.grossWeight = grossWeight;
}
public BigDecimal getGrossWeight() {
return grossWeight;
}
public void setNetWeight(BigDecimal netWeight) {
this.netWeight = netWeight;
}
public BigDecimal getNetWeight() {
return netWeight;
}
public void setTareWeight(BigDecimal tareWeight) {
this.tareWeight = tareWeight;
}
public BigDecimal getTareWeight() {
return tareWeight;
}
public void setVolume(BigDecimal volume) {
this.volume = volume;
}
public BigDecimal getVolume() {
return volume;
}
public void setUnitPrice(BigDecimal unitPrice) {
this.unitPrice = unitPrice;
}
public BigDecimal getUnitPrice() {
return unitPrice;
}
public void setProductGroup(String productGroup) {
this.productGroup = productGroup;
}
public String getProductGroup() {
return productGroup;
}
public void setProductGroupName(String productGroupName) {
this.productGroupName = productGroupName;
}
public String getProductGroupName() {
return productGroupName;
}
public void setUserDefined1(String userDefined1) {
this.userDefined1 = userDefined1;
}
public String getUserDefined1() {
return userDefined1;
}
public void setUserDefined2(String userDefined2) {
this.userDefined2 = userDefined2;
}
public String getUserDefined2() {
return userDefined2;
}
public void setUserDefined3(String userDefined3) {
this.userDefined3 = userDefined3;
}
public String getUserDefined3() {
return userDefined3;
}
public void setUserDefined4(String userDefined4) {
this.userDefined4 = userDefined4;
}
public String getUserDefined4() {
return userDefined4;
}
public void setUserDefined5(String userDefined5) {
this.userDefined5 = userDefined5;
}
public String getUserDefined5() {
return userDefined5;
}
public void setUserDefined6(String userDefined6) {
this.userDefined6 = userDefined6;
}
public String getUserDefined6() {
return userDefined6;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setActiveFlag(String activeFlag) {
this.activeFlag = activeFlag;
}
public String getActiveFlag() {
return activeFlag;
}
public void setSyncFlag(String syncFlag) {
this.syncFlag = syncFlag;
}
public String getSyncFlag() {
return syncFlag;
}
public void setPrimaryUom(String primaryUom) {
this.primaryUom = primaryUom;
}
public String getPrimaryUom() {
return primaryUom;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public void setBstme(String bstme) {
this.bstme = bstme;
}
public String getBstme() {
return bstme;
}
public void setBasicOrder(BigDecimal basicOrder) {
this.basicOrder = basicOrder;
}
public BigDecimal getBasicOrder() {
return basicOrder;
}
public void setConvOrder(BigDecimal convOrder) {
this.convOrder = convOrder;
}
public BigDecimal getConvOrder() {
return convOrder;
}
public void setAusme(String ausme) {
this.ausme = ausme;
}
public String getAusme() {
return ausme;
}
public void setBasicIssue(BigDecimal basicIssue) {
this.basicIssue = basicIssue;
}
public BigDecimal getBasicIssue() {
return basicIssue;
}
public void setConvIssue(BigDecimal convIssue) {
this.convIssue = convIssue;
}
public BigDecimal getConvIssue() {
return convIssue;
}
public void setAppendFlag(String appendFlag) {
this.appendFlag = appendFlag;
}
public String getAppendFlag() {
return appendFlag;
}
public void setAppendPercent(String appendPercent) {
this.appendPercent = appendPercent;
}
public String getAppendPercent() {
return appendPercent;
}
public void setMtart(String mtart) {
this.mtart = mtart;
}
public String getMtart() {
return mtart;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("productId", getProductId())
.append("productCode", getProductCode())
.append("productDescZh", getProductDescZh())
.append("productDescEn", getProductDescEn())
.append("ruleCode", getRuleCode())
.append("oldProductCode", getOldProductCode())
.append("partsProductCode", getPartsProductCode())
.append("skuBarcode", getSkuBarcode())
.append("length", getLength())
.append("width", getWidth())
.append("height", getHeight())
.append("grossWeight", getGrossWeight())
.append("netWeight", getNetWeight())
.append("tareWeight", getTareWeight())
.append("volume", getVolume())
.append("unitPrice", getUnitPrice())
.append("productGroup", getProductGroup())
.append("productGroupName", getProductGroupName())
.append("userDefined1", getUserDefined1())
.append("userDefined2", getUserDefined2())
.append("userDefined3", getUserDefined3())
.append("userDefined4", getUserDefined4())
.append("userDefined5", getUserDefined5())
.append("userDefined6", getUserDefined6())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.append("activeFlag", getActiveFlag())
.append("syncFlag", getSyncFlag())
.append("primaryUom", getPrimaryUom())
.append("delFlag", getDelFlag())
.append("bstme", getBstme())
.append("basicOrder", getBasicOrder())
.append("convOrder", getConvOrder())
.append("ausme", getAusme())
.append("basicIssue", getBasicIssue())
.append("convIssue", getConvIssue())
.append("appendFlag", getAppendFlag())
.append("appendPercent", getAppendPercent())
.append("mtart", getMtart())
.append("category", getCategory())
.append("pc", getPc())
.append("iei", getIei())
.append("manStandar", getManStandar())
.append("sprayWay", getSprayWay())
.append("blankDiameter", getBlankDiameter())
.append("blankNo", getBlankNo())
.append("sprayVolume", getSprayVolume())
.append("liquidNo", getLiquidNo())
.append("endometrialDosage", getEndometrialDosage())
.append("outerFilmDosage", getOuterFilmDosage())
.append("support", getSupport())
.append("supportNo", getSupportNo())
.append("pvc", getPvc())
.append("supportPlate", getSupportPlate())
.append("other", getOther())
.toString();
}
}

342
op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseTeamTDTO.java
Unescape Escape View File

@ -0,0 +1,342 @@
package com.op.system.api.domain.mes;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
import java.util.List;
/**
* 班组对象 base_team_t
*
* @author Open Platform
* @date 2023-07-05
*/
public class BaseTeamTDTO extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 班组主键 */
private String teamId;
/** 组织机构主键 */
@Excel(name = "组织机构主键")
private String orgId;
/** 班组编码 */
@Excel(name = "班组编码")
private String teamCode;
/** 班组简称 */
@Excel(name = "班组简称")
private String teamDesc;
/** 班组通用名称 */
@Excel(name = "班组通用名称")
private String teamDescGlobal;
/** 班组扩展名称 */
@Excel(name = "班组扩展名称")
private String teamDescExtended;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDate;
/** 最后更新人 */
@Excel(name = "最后更新人")
private String lastUpdateBy;
/** 最后更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date lastUpdateDate;
/** 可用标识 */
@Excel(name = "可用标识")
private String Active;
/** 企业主键 */
@Excel(name = "企业主键")
private String enterpriseId;
/** 企业编码 */
@Excel(name = "企业编码")
private String enterpriseCode;
/** 工厂主键 */
@Excel(name = "工厂主键")
private String siteId;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String siteCode;
/** 线体编码 */
@Excel(name = "线体编码")
private String productionLineCode;
/** 班组长编码 */
@Excel(name = "班组长编码")
private String teamLeaderCode;
/** 班组长编码 */
@Excel(name = "班组长编码")
private String teamLeaderName;
/** 定编岗位数量 */
@Excel(name = "定编岗位数量")
private Integer planPostQuantity;
/** 已分配岗位数量 */
@Excel(name = "已分配岗位数量")
private Integer actualPostQuantity;
/** 薪酬类型(0：总装；1:小时节点筹; */
@Excel(name = "薪酬类型(0：总装；1:小时节点筹;")
private String salaryType;
/** 班组属性 */
@Excel(name = "班组属性")
private String teamProperties;
/** 应出勤人数 */
@Excel(name = "应出勤人数")
private Integer attendanceQuantity;
/** 已分配人数 */
@Excel(name = "已分配人数")
private Integer assignedQuantity;
/** 班组类型 */
@Excel(name = "班组类型")
private String teamType;
private List<String> rightData;
/** 删除标志 */
@Excel(name = "删除标志")
private String delFlag;
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public void setRightData(List<String> rightData) {
this.rightData = rightData;
}
public List<String> getRightData() {
return rightData;
}
public void setTeamType(String teamType) {
this.teamType = teamType;
}
public String getTeamType() {
return teamType;
}
public void setTeamId(String teamId) {
this.teamId = teamId;
}
public String getTeamId() {
return teamId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getOrgId() {
return orgId;
}
public void setTeamCode(String teamCode) {
this.teamCode = teamCode;
}
public String getTeamCode() {
return teamCode;
}
public void setTeamDesc(String teamDesc) {
this.teamDesc = teamDesc;
}
public String getTeamDesc() {
return teamDesc;
}
public void setTeamDescGlobal(String teamDescGlobal) {
this.teamDescGlobal = teamDescGlobal;
}
public String getTeamDescGlobal() {
return teamDescGlobal;
}
public void setTeamDescExtended(String teamDescExtended) {
this.teamDescExtended = teamDescExtended;
}
public String getTeamDescExtended() {
return teamDescExtended;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public Date getCreateDate() {
return createDate;
}
public void setLastUpdateBy(String lastUpdateBy) {
this.lastUpdateBy = lastUpdateBy;
}
public String getLastUpdateBy() {
return lastUpdateBy;
}
public void setLastUpdateDate(Date lastUpdateDate) {
this.lastUpdateDate = lastUpdateDate;
}
public Date getLastUpdateDate() {
return lastUpdateDate;
}
public void setActive(String Active) {
this.Active = Active;
}
public String getActive() {
return Active;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseCode(String enterpriseCode) {
this.enterpriseCode = enterpriseCode;
}
public String getEnterpriseCode() {
return enterpriseCode;
}
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public String getSiteId() {
return siteId;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
public String getSiteCode() {
return siteCode;
}
public void setProductionLineCode(String productionLineCode) {
this.productionLineCode = productionLineCode;
}
public String getProductionLineCode() {
return productionLineCode;
}
public void setTeamLeaderCode(String teamLeaderCode) {
this.teamLeaderCode = teamLeaderCode;
}
public String getTeamLeaderCode() {
return teamLeaderCode;
}
public void setTeamLeaderName(String teamLeaderName) {
this.teamLeaderName = teamLeaderName;
}
public String getTeamLeaderName() {
return teamLeaderName;
}
public void setPlanPostQuantity(Integer planPostQuantity) {
this.planPostQuantity = planPostQuantity;
}
public Integer getPlanPostQuantity() {
return planPostQuantity;
}
public void setActualPostQuantity(Integer actualPostQuantity) {
this.actualPostQuantity = actualPostQuantity;
}
public Integer getActualPostQuantity() {
return actualPostQuantity;
}
public void setSalaryType(String salaryType) {
this.salaryType = salaryType;
}
public String getSalaryType() {
return salaryType;
}
public void setTeamProperties(String teamProperties) {
this.teamProperties = teamProperties;
}
public String getTeamProperties() {
return teamProperties;
}
public void setAttendanceQuantity(Integer attendanceQuantity) {
this.attendanceQuantity = attendanceQuantity;
}
public Integer getAttendanceQuantity() {
return attendanceQuantity;
}
public void setAssignedQuantity(Integer assignedQuantity) {
this.assignedQuantity = assignedQuantity;
}
public Integer getAssignedQuantity() {
return assignedQuantity;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("teamId", getTeamId())
.append("orgId", getOrgId())
.append("teamCode", getTeamCode())
.append("teamDesc", getTeamDesc())
.append("teamDescGlobal", getTeamDescGlobal())
.append("teamDescExtended", getTeamDescExtended())
.append("createBy", getCreateBy())
.append("createDate", getCreateDate())
.append("lastUpdateBy", getLastUpdateBy())
.append("lastUpdateDate", getLastUpdateDate())
.append("Active", getActive())
.append("enterpriseId", getEnterpriseId())
.append("enterpriseCode", getEnterpriseCode())
.append("siteId", getSiteId())
.append("siteCode", getSiteCode())
.append("productionLineCode", getProductionLineCode())
.append("teamLeaderCode", getTeamLeaderCode())
.append("teamLeaderName", getTeamLeaderName())
.append("planPostQuantity", getPlanPostQuantity())
.append("actualPostQuantity", getActualPostQuantity())
.append("salaryType", getSalaryType())
.append("teamProperties", getTeamProperties())
.append("attendanceQuantity", getAttendanceQuantity())
.append("assignedQuantity", getAssignedQuantity())
.append("teamType", getTeamType())
.append("delFlag", getDelFlag())
.toString();
}
}

617
op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkDTO.java
Unescape Escape View File

@ -0,0 +1,617 @@
package com.op.system.api.domain.mes;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.Date;
/**
* 报工报表对象 mes_report_work
*
* @author Open Platform
* @date 2023-08-24
*/
public class MesReportWorkDTO extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 记录id */
private String id;
/** 报工单编号 */
@Excel(name = "报工单编号")
private String reportCode;
/** 报工类型，报工类型：SELF自行报工、UNI统一报工 */
@Excel(name = "报工类型，报工类型：SELF上位机报工、UNI系统报工")
private String reportType;
/** 生产工单编码 */
@Excel(name = "生产工单编码")
private String workorderCode;
/** 产品编码 */
@Excel(name = "产品编码")
private String productCode;
/** 产品名称 */
@Excel(name = "产品名称")
private String productName;
/** 规格型号 */
@Excel(name = "规格型号")
private String spec;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 排产数量 */
@Excel(name = "排产数量")
private BigDecimal quantity;
private BigDecimal quantitySplit;
/** 本次报工数量 */
@Excel(name = "本次报工数量")
private BigDecimal quantityFeedback;
/** 合格数量 */
//@Excel(name = "合格数量")
private BigDecimal quantityQualified;
/** 不合格数量 */
//@Excel(name = "不合格数量")
private BigDecimal quantityUnqualified;
/** 报工人员 */
@Excel(name = "报工人员")
private String userName;
/** 人员名称 */
@Excel(name = "人员名称")
private String nickName;
/** 报工途径：PAD、MOBILE、PC */
//@Excel(name = "报工途径：PAD、MOBILE、PC")
private String feedbackChannel;
/** 报工时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "报工时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date feedbackTime;
/** 录入人员 */
@Excel(name = "录入人员")
private String recordUser;
/** 状态 */
@Excel(name = "状态")
private String status;
/** 工时 */
@Excel(name = "工时")
private Long workTime;
/** 线体编码 */
@Excel(name = "线体编码")
private String machineCode;
/** 线体名称 */
@Excel(name = "线体名称")
private String machineName;
/** 班组编码 */
@Excel(name = "班组编码")
private String teamCode;
/** 班次编码 */
@Excel(name = "班次编码")
private String shiftCode;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "SAP报工时间")
private Date uploadTime;
@Excel(name = "SAP报工状态0待报工1成功2失败")
private String uploadStatus;
@Excel(name = "SAP报工信息")
private String uploadMsg;
/** 预留字段1 */
//@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
//@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
//@Excel(name = "预留字段3")
private String attr3;
/** 预留字段4 */
//@Excel(name = "预留字段4")
private String attr4;
@Excel(name = "计划生产日期")
private String productDate;
private String productDateStart;
private String productDateEnd;
@Excel(name = "订单编号")
private String orderCode;
@Excel(name = "规格型号")
private String productSpc;
@Excel(name = "工序名称")
private String processName;
@Excel(name = "工序编码")
private String processCode;
private String factoryCode;
private String factoryName;
private String carCode;
private String carName;
private String workorderCodeSap;
private String routeCode;
private String sac1;
private String sac2;
private String sac3;
private String sac4;
private String sac5;
private String sac6;
private String prodType;
private String createTimeStart;
private String createTimeEnd;
private String feedbackTimeStart;
private String feedbackTimeEnd;
public BigDecimal getQuantitySplit() {
return quantitySplit;
}
public void setQuantitySplit(BigDecimal quantitySplit) {
this.quantitySplit = quantitySplit;
}
public String getFeedbackTimeStart() {
return feedbackTimeStart;
}
public void setFeedbackTimeStart(String feedbackTimeStart) {
this.feedbackTimeStart = feedbackTimeStart;
}
public String getFeedbackTimeEnd() {
return feedbackTimeEnd;
}
public void setFeedbackTimeEnd(String feedbackTimeEnd) {
this.feedbackTimeEnd = feedbackTimeEnd;
}
public String getCreateTimeStart() {
return createTimeStart;
}
public void setCreateTimeStart(String createTimeStart) {
this.createTimeStart = createTimeStart;
}
public String getCreateTimeEnd() {
return createTimeEnd;
}
public void setCreateTimeEnd(String createTimeEnd) {
this.createTimeEnd = createTimeEnd;
}
public String getProdType() {
return prodType;
}
public void setProdType(String prodType) {
this.prodType = prodType;
}
public String getWorkorderCodeSap() {
return workorderCodeSap;
}
public void setWorkorderCodeSap(String workorderCodeSap) {
this.workorderCodeSap = workorderCodeSap;
}
public String getRouteCode() {
return routeCode;
}
public void setRouteCode(String routeCode) {
this.routeCode = routeCode;
}
public String getSac1() {
return sac1;
}
public void setSac1(String sac1) {
this.sac1 = sac1;
}
public String getSac2() {
return sac2;
}
public void setSac2(String sac2) {
this.sac2 = sac2;
}
public String getSac3() {
return sac3;
}
public void setSac3(String sac3) {
this.sac3 = sac3;
}
public String getSac4() {
return sac4;
}
public void setSac4(String sac4) {
this.sac4 = sac4;
}
public String getSac5() {
return sac5;
}
public void setSac5(String sac5) {
this.sac5 = sac5;
}
public String getSac6() {
return sac6;
}
public void setSac6(String sac6) {
this.sac6 = sac6;
}
public Date getUploadTime() {
return uploadTime;
}
public void setUploadTime(Date uploadTime) {
this.uploadTime = uploadTime;
}
public String getUploadStatus() {
return uploadStatus;
}
public void setUploadStatus(String uploadStatus) {
this.uploadStatus = uploadStatus;
}
public String getUploadMsg() {
return uploadMsg;
}
public void setUploadMsg(String uploadMsg) {
this.uploadMsg = uploadMsg;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryName() {
return factoryName;
}
public void setFactoryName(String factoryName) {
this.factoryName = factoryName;
}
public String getCarCode() {
return carCode;
}
public void setCarCode(String carCode) {
this.carCode = carCode;
}
public String getCarName() {
return carName;
}
public void setCarName(String carName) {
this.carName = carName;
}
public String getProcessCode() {
return processCode;
}
public void setProcessCode(String processCode) {
this.processCode = processCode;
}
public String getProductDateStart() {
return productDateStart;
}
public void setProductDateStart(String productDateStart) {
this.productDateStart = productDateStart;
}
public String getProductDateEnd() {
return productDateEnd;
}
public void setProductDateEnd(String productDateEnd) {
this.productDateEnd = productDateEnd;
}
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
public void setReportType(String reportType) {
this.reportType = reportType;
}
public String getReportType() {
return reportType;
}
public void setReportCode(String reportCode) {
this.reportCode = reportCode;
}
public String getReportCode() {
return reportCode;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
public String getWorkorderCode() {
return workorderCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductCode() {
return productCode;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getProductName() {
return productName;
}
public void setSpec(String spec) {
this.spec = spec;
}
public String getSpec() {
return spec;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setQuantity(BigDecimal quantity) {
this.quantity = quantity;
}
public BigDecimal getQuantity() {
return quantity;
}
public void setQuantityFeedback(BigDecimal quantityFeedback) {
this.quantityFeedback = quantityFeedback;
}
public BigDecimal getQuantityFeedback() {
return quantityFeedback;
}
public void setQuantityQualified(BigDecimal quantityQualified) {
this.quantityQualified = quantityQualified;
}
public BigDecimal getQuantityQualified() {
return quantityQualified;
}
public void setQuantityUnqualified(BigDecimal quantityUnqualified) {
this.quantityUnqualified = quantityUnqualified;
}
public BigDecimal getQuantityUnqualified() {
return quantityUnqualified;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getUserName() {
return userName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getNickName() {
return nickName;
}
public void setFeedbackChannel(String feedbackChannel) {
this.feedbackChannel = feedbackChannel;
}
public String getFeedbackChannel() {
return feedbackChannel;
}
public void setFeedbackTime(Date feedbackTime) {
this.feedbackTime = feedbackTime;
}
public Date getFeedbackTime() {
return feedbackTime;
}
public void setRecordUser(String recordUser) {
this.recordUser = recordUser;
}
public String getRecordUser() {
return recordUser;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setWorkTime(Long workTime) {
this.workTime = workTime;
}
public Long getWorkTime() {
return workTime;
}
public void setMachineCode(String machineCode) {
this.machineCode = machineCode;
}
public String getMachineCode() {
return machineCode;
}
public void setMachineName(String machineName) {
this.machineName = machineName;
}
public String getMachineName() {
return machineName;
}
public void setTeamCode(String teamCode) {
this.teamCode = teamCode;
}
public String getTeamCode() {
return teamCode;
}
public void setShiftCode(String shiftCode) {
this.shiftCode = shiftCode;
}
public String getShiftCode() {
return shiftCode;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public String getProductDate() {
return productDate;
}
public void setProductDate(String productDate) {
this.productDate = productDate;
}
public String getOrderCode() {
return orderCode;
}
public void setOrderCode(String orderCode) {
this.orderCode = orderCode;
}
public String getProductSpc() {
return productSpc;
}
public void setProductSpc(String productSpc) {
this.productSpc = productSpc;
}
public String getProcessName() {
return processName;
}
public void setProcessName(String processName) {
this.processName = processName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("reportType", getReportType())
.append("reportCode", getReportCode())
.append("workorderCode", getWorkorderCode())
.append("productCode", getProductCode())
.append("productName", getProductName())
.append("spec", getSpec())
.append("unit", getUnit())
.append("quantity", getQuantity())
.append("quantityFeedback", getQuantityFeedback())
.append("quantityQualified", getQuantityQualified())
.append("quantityUnqualified", getQuantityUnqualified())
.append("userName", getUserName())
.append("nickName", getNickName())
.append("feedbackChannel", getFeedbackChannel())
.append("feedbackTime", getFeedbackTime())
.append("recordUser", getRecordUser())
.append("status", getStatus())
.append("remark", getRemark())
.append("workTime", getWorkTime())
.append("machineCode", getMachineCode())
.append("machineName", getMachineName())
.append("teamCode", getTeamCode())
.append("shiftCode", getShiftCode())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.toString();
}
}

33
op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteDeviceFallbackFactory.java
Unescape Escape View File

@ -0,0 +1,33 @@
package com.op.system.api.factory;
import com.op.common.core.domain.R;
import com.op.system.api.RemoteDeviceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* 用户服务降级处理
*
* @author OP
*/
@Component
public class RemoteDeviceFallbackFactory implements FallbackFactory<RemoteDeviceService> {
private static final Logger log = LoggerFactory.getLogger(RemoteDeviceFallbackFactory.class);
@Override
public RemoteDeviceService create(Throwable throwable) {
log.error("Device服务调用失败:{}", throwable.getMessage());
return new RemoteDeviceService() {
@Override
public R createSpotCheckPlanTask() {
return R.fail("点检计划创建失败:" + throwable.getMessage());
}
};
}
}

1
op-api/op-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
Unescape Escape View File

@ -5,3 +5,4 @@ com.op.system.api.factory.RemoteMesFallbackFactory
com.op.system.api.factory.RemotePlanFallbackFactory
com.op.system.api.factory.RemoteTechnologyFallbackFactory
com.op.system.api.factory.RemoteSapFallbackFactory
com.op.system.api.factory.RemoteDeviceFallbackFactory

3
op-auth/push-auth.bat
Unescape Escape View File

@ -26,7 +26,8 @@ if exist %df% (
del /f /s /q .\Dockerfile
)
echo --------------------------------´´½¨Dockerfile--------------------------------
echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile
echo COPY %jarName% /application.jar >> Dockerfile
echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile
echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile

5
op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.java
Unescape Escape View File

@ -43,4 +43,9 @@ public class ServiceNameConstants {
* 工艺模块的serviceid
*/
public static final String TECH_SERVICE = "op-technology";
/**
* 设备模块的serviceid
*/
public static final String DEVICE_SERVICE = "op-device";
}

11
op-common/op-common-core/src/main/java/com/op/common/core/domain/BaseFileData.java
Unescape Escape View File

@ -45,6 +45,17 @@ public class BaseFileData extends BaseEntity {
@Excel(name = "预留字段4")
private Long attr4;
/** 图片类型 */
@Excel(name = "图片类型")
private String imageType;
public void setImageType(String imageType) {
this.imageType = imageType;
}
public String getImageType() {
return imageType;
}
public void setFileId(String fileId) {
this.fileId = fileId;
}

48
op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java
Unescape Escape View File

@ -2,9 +2,11 @@ package com.op.common.core.utils.poi;
import com.alibaba.fastjson2.JSONObject;
import com.op.common.core.domain.ExcelCol;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
@ -53,37 +55,49 @@ public class ExcelMapUtil {
//将data中的值填充到excel
int rowNum = sheet.getLastRowNum()+1;
Iterator<T> iterator = data.iterator();
//遍历数据
for (;iterator.hasNext();){
Row dataRow = sheet.createRow(rowNum);//创建行
T obj = iterator.next();//获取当前行对应的数据
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj));
for (int i = 0 ; i < colSize ; i++ ){
Cell dataCell = dataRow.createCell(i);
dataCell.setCellStyle(getDataFont(workbook));
if(i>=2){
dataCell.setCellValue(getValueNum(jsonObject.get(excelCol.get(i).getField())));
}else{
dataCell.setCellValue(getValue(jsonObject.get(excelCol.get(i).getField())));
}
if(!CollectionUtils.isEmpty(data)){
Iterator<T> iterator = data.iterator();
//遍历数据
for (;iterator.hasNext();){
Row dataRow = sheet.createRow(rowNum);//创建行
T obj = iterator.next();//获取当前行对应的数据
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj));
for (int i = 0 ; i < colSize ; i++ ){
Cell dataCell = dataRow.createCell(i);
dataCell.setCellStyle(getDataFont(workbook));
if(i>=2){
dataCell.setCellValue(getValueNum(jsonObject.get(excelCol.get(i).getField())));
}else{
dataCell.setCellValue(getValue(jsonObject.get(excelCol.get(i).getField())));
}
}
iterator.remove();
rowNum++;
}
iterator.remove();
rowNum++;
}
return workbook;
}
//标题样式
public static CellStyle getHeaderFont(Workbook workbook){
Font font = workbook.createFont();
font.setFontHeightInPoints((short) 16);//字体大小
font.setFontHeightInPoints((short) 15);//字体大小
font.setBold(true);//加粗
CellStyle cellStyle = workbook.createCellStyle();
cellStyle.setFont(font);
cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//设置水平居中
cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//设置垂直居中
// 设置上边框
cellStyle.setBorderTop(BorderStyle.THIN);
// 设置下边框
cellStyle.setBorderBottom(BorderStyle.THIN);
// 设置左边框
cellStyle.setBorderLeft(BorderStyle.THIN);
// 设置右边框
cellStyle.setBorderRight(BorderStyle.THIN);
return cellStyle;
}

3
op-gateway/push-gate.bat
Unescape Escape View File

@ -26,7 +26,8 @@ if exist %df% (
del /f /s /q .\Dockerfile
)
echo --------------------------------´´½¨Dockerfile--------------------------------
echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile
echo COPY %jarName% /application.jar >> Dockerfile
echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile
echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile

3
op-modules/op-device/push-device.bat
Unescape Escape View File

@ -26,7 +26,8 @@ if exist %df% (
del /f /s /q .\Dockerfile
)
echo --------------------------------´´½¨Dockerfile--------------------------------
echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile
echo COPY %jarName% /application.jar >> Dockerfile
echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile
echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile

82
op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java
Unescape Escape View File

@ -1,8 +1,11 @@
package com.op.device.controller;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOrder;
import com.op.common.security.annotation.RequiresPermissions;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -19,24 +22,27 @@ public class DevicePDAController {
@Autowired
private IDevicePDAService devicePDAService;
@Autowired
private IEquRepairOrderService equRepairOrderService;
/**
* 获取今日巡检任务工单list
* @param userId
* @param pdadto
* @return
*/
@GetMapping("/getTodayTask")
public AjaxResult getTodayTask(int userId) {
return devicePDAService.getTodayTask(userId);
public AjaxResult getTodayTask(PDADTO pdadto) {
return devicePDAService.getTodayTask(pdadto);
}
/**
* 获取巡检记录
* @param userId
* @param pdadto
* @return
*/
@GetMapping("/getTaskRecord")
public AjaxResult getTaskRecord(int userId) {
return devicePDAService.getTaskRecord(userId);
public AjaxResult getTaskRecord(PDADTO pdadto) {
return devicePDAService.getTaskRecord(pdadto);
}
/**
@ -58,4 +64,66 @@ public class DevicePDAController {
public AjaxResult updateInspectionRecord(@RequestBody EquOrder equOrder) {
return devicePDAService.updateInspectionRecord(equOrder);
}
//报修
/**
* 新增手持报修记录
* @param equRepairOrder
* @return
*/
@PostMapping("/addRepairRecord")
public AjaxResult addRepairRecord(@RequestBody EquRepairOrder equRepairOrder) {
return devicePDAService.addRepairRecord(equRepairOrder);
}
//维修
/**
* 获取维修记录（待处理和已经维修完成）
*
* @param equRepairWorkOrder
* @return
*/
@GetMapping("/getMaintenanceRecords")
public AjaxResult getMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) {
return devicePDAService.getMaintenanceRecords(equRepairWorkOrder);
}
/**
* 是否停机维修
*
* @param equRepairWorkOrder
* @return
*/
@PutMapping("/updateDowntime")
public AjaxResult updateDowntime(@RequestBody EquRepairWorkOrder equRepairWorkOrder) {
return devicePDAService.updateDowntime(equRepairWorkOrder);
}
/**
* 获取设备管理详细信息
*/
@GetMapping(value = "/queryEquipment/{equipmentId}")
public AjaxResult queryEquipment(@PathVariable("equipmentId") Long equipmentId) {
return devicePDAService.selectEquEquipmentByEquEquipmentId(equipmentId);
}
/**
* 获取维修详情
*/
@GetMapping(value = "/selectPdaRepairWorkOrderDetails/{workId}")
public AjaxResult selectPdaRepairWorkOrderDetails(@PathVariable("workId") String workId) {
return devicePDAService.selectPdaRepairWorkOrderDetails(workId);
}
/**
* 填写维修记录
* @param equRepairWorkOrder
* @return
*/
@PutMapping("/updateMaintenanceRecords")
public AjaxResult updateMaintenanceRecords(@RequestBody EquRepairWorkOrder equRepairWorkOrder) {
return devicePDAService.updateMaintenanceRecords(equRepairWorkOrder);
}
}

43
op-modules/op-device/src/main/java/com/op/device/controller/DeviceTaskController.java
Unescape Escape View File

@ -0,0 +1,43 @@
package com.op.device.controller;
import com.op.common.core.domain.R;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquPlan;
import com.op.device.domain.EquRepairOrder;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.service.IDevicePDAService;
import com.op.device.service.IDeviceTaskService;
import com.op.device.service.IEquRepairOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* DeviceTaskController
*
* @author wws
* @date 2023-10-23
*/
@RestController
@RequestMapping("/deviceTask")
public class DeviceTaskController {
@Autowired
private IDeviceTaskService taskService;
/**
* 点检计划生成
* @return
*/
@PostMapping("/createSpotCheckPlanTask")
public R createSpotCheckPlanTask() {
EquPlan equPlan = new EquPlan();
AjaxResult result = taskService.createSpotCheckPlanTask(equPlan);
if(result.isSuccess()){
return R.ok("点检计划生成成功");
}
return R.fail("点检计划生成失败");
}
}

14
op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java
Unescape Escape View File

@ -84,7 +84,7 @@ public class EquPlanController extends BaseController {
* @param equEquipment
* @return
*/
@RequiresPermissions("device:plan:list")
@RequiresPermissions("device:inspectionPlan:list")
@GetMapping("/getEquList")
public TableDataInfo getEquList(EquEquipment equEquipment) {
startPage();
@ -95,7 +95,7 @@ public class EquPlanController extends BaseController {
/**
* 查询计划列表
*/
@RequiresPermissions("device:plan:list")
@RequiresPermissions("device:inspectionPlan:list")
@GetMapping("/list")
public TableDataInfo list(EquPlan equPlan) {
startPage();
@ -106,7 +106,7 @@ public class EquPlanController extends BaseController {
/**
* 导出计划列表
*/
@RequiresPermissions("device:plan:export")
@RequiresPermissions("device:inspectionPlan:export")
@Log(title = "计划", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, EquPlan equPlan) {
@ -118,7 +118,7 @@ public class EquPlanController extends BaseController {
/**
* 获取计划详细信息
*/
@RequiresPermissions("device:plan:query")
@RequiresPermissions("device:inspectionPlan:query")
@GetMapping(value = "/{planId}")
public AjaxResult getInfo(@PathVariable("planId") String planId) {
return success(equPlanService.selectEquPlanByPlanId(planId));
@ -127,7 +127,7 @@ public class EquPlanController extends BaseController {
/**
* 新增计划
*/
@RequiresPermissions("device:plan:add")
@RequiresPermissions("device:inspectionPlan:add")
@Log(title = "计划", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody EquPlan equPlan) {
@ -137,7 +137,7 @@ public class EquPlanController extends BaseController {
/**
* 修改计划
*/
@RequiresPermissions("device:plan:edit")
@RequiresPermissions("device:inspectionPlan:edit")
@Log(title = "计划", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody EquPlan equPlan) {
@ -147,7 +147,7 @@ public class EquPlanController extends BaseController {
/**
* 删除计划
*/
@RequiresPermissions("device:plan:remove")
@RequiresPermissions("device:inspectionPlan:remove")
@Log(title = "计划", businessType = BusinessType.DELETE)
@DeleteMapping("/{planIds}")
public AjaxResult remove(@PathVariable String[] planIds) {

7
op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java
Unescape Escape View File

@ -3,8 +3,7 @@ package com.op.device.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquOutsourceWork;
import com.op.device.domain.EquTeamUser;
import com.op.device.service.IEquOutsourceWorkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -123,9 +122,9 @@ public class EquRepairWorkOrderController extends BaseController {
//获取维修人员列表
@GetMapping("/getMaintenancePersonList")
public TableDataInfo getMaintenancePersonList(EquEquipment equEquipment) {
public TableDataInfo getMaintenancePersonList(EquTeamUser equTeamUser) {
startPage();
List<EquEquipment> list = equRepairWorkOrderService.getMaintenancePersonList(equEquipment);
List<EquTeamUser> list = equRepairWorkOrderService.getMaintenancePersonList(equTeamUser);
return getDataTable(list);
}
}

12
op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.op.device.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.device.domain.EquRepairWorkOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -94,4 +96,14 @@ public class EquSpareApplyController extends BaseController {
public AjaxResult remove(@PathVariable String[] applyIds) {
return toAjax(equSpareApplyService.deleteEquSpareApplyByApplyIds(applyIds));
}
/**
* 查询申领记录列表
*/
@GetMapping("/listRepairSparePartsRecord")
public TableDataInfo listRepairSparePartsRecord(EquRepairWorkOrder equRepairWorkOrder) {
startPage();
List<EquSpareApply> list = equSpareApplyService.selectRepairSparePartsRecord(equRepairWorkOrder);
return getDataTable(list);
}
}

16
op-modules/op-device/src/main/java/com/op/device/controller/EquTeamController.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.op.device.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.device.domain.EquTeamUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -72,7 +74,7 @@ public class EquTeamController extends BaseController {
@Log(title = "设备班组维护", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody EquTeam equTeam) {
return toAjax(equTeamService.insertEquTeam(equTeam));
return equTeamService.insertEquTeam(equTeam);
}
/**
@ -82,7 +84,7 @@ public class EquTeamController extends BaseController {
@Log(title = "设备班组维护", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody EquTeam equTeam) {
return toAjax(equTeamService.updateEquTeam(equTeam));
return equTeamService.updateEquTeam(equTeam);
}
/**
@ -102,4 +104,14 @@ public class EquTeamController extends BaseController {
List<EquTeam> list = equTeamService.getMaintenanceTeamList(equTeam);
return getDataTable(list);
}
/**
* 查询班组人员列表
*/
@GetMapping("/listTeamMembers")
public TableDataInfo listTeamMembers(EquTeamUser equTeamUser) {
startPage();
List<EquTeamUser> list = equTeamService.selectTeamMembers(equTeamUser);
return getDataTable(list);
}
}

15
op-modules/op-device/src/main/java/com/op/device/controller/EquUpkeepOrderController.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquPlan;
import com.op.device.domain.dto.UpKeepOrderDTO;
import com.op.device.service.IEquUpkeepOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -29,6 +30,18 @@ public class EquUpkeepOrderController extends BaseController {
@Autowired
private IEquUpkeepOrderService equUpkeepOrderService;
/**
* 保养工单检验
* @param upKeepOrderDTO
* @return
*/
@RequiresPermissions("device:upkeepOrder:add")
@PostMapping("/subInspect")
public AjaxResult subInspect(@RequestBody UpKeepOrderDTO upKeepOrderDTO) {
return equUpkeepOrderService.subInspect(upKeepOrderDTO);
}
/**
* 查询保养工单列表
*/
@ -78,7 +91,7 @@ public class EquUpkeepOrderController extends BaseController {
@Log(title = "保养工单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody EquOrder equOrder) {
return toAjax(equUpkeepOrderService.updateEquOrder(equOrder));
return equUpkeepOrderService.updateEquOrder(equOrder);
}
/**

99
op-modules/op-device/src/main/java/com/op/device/controller/InspectionWorkController.java
Unescape Escape View File

@ -0,0 +1,99 @@
package com.op.device.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.device.service.IInspectionWorkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.device.domain.EquOrder;
import com.op.device.service.IEquOrderService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* 巡检记录Controller
*
* @author wws
* @date 2023-11-07
*/
@RestController
@RequestMapping("/inspectionWork")
public class InspectionWorkController extends BaseController{
@Autowired
private IInspectionWorkService iInspectionWorkService;
/**
* 查询巡检记录列表
*/
@RequiresPermissions("device:inspectionWork:list")
@GetMapping("/list")
public TableDataInfo list(EquOrder equOrder) {
startPage();
List<EquOrder> list = iInspectionWorkService.selectEquOrderList(equOrder);
return getDataTable(list);
}
/**
* 导出巡检记录列表
*/
@RequiresPermissions("device:inspectionWork:export")
@Log(title = "巡检记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, EquOrder equOrder) {
List<EquOrder> list = iInspectionWorkService.selectEquOrderList(equOrder);
ExcelUtil<EquOrder> util = new ExcelUtil<EquOrder>(EquOrder.class);
util.exportExcel(response, list, "巡检记录数据");
}
/**
* 获取巡检记录详细信息
*/
@RequiresPermissions("device:inspectionWork:query")
@GetMapping(value = "/{orderId}")
public AjaxResult getInfo(@PathVariable("orderId") String orderId) {
return iInspectionWorkService.selectEquOrderByOrderId(orderId);
}
/**
* 新增巡检记录
*/
@RequiresPermissions("device:inspectionWork:add")
@Log(title = "巡检记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody EquOrder equOrder) {
return toAjax(iInspectionWorkService.insertEquOrder(equOrder));
}
/**
* 修改巡检记录
*/
@RequiresPermissions("device:inspectionWork:edit")
@Log(title = "巡检记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody EquOrder equOrder) {
return toAjax(iInspectionWorkService.updateEquOrder(equOrder));
}
/**
* 删除巡检记录
*/
@RequiresPermissions("device:inspectionWork:remove")
@Log(title = "巡检记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{orderIds}")
public AjaxResult remove(@PathVariable String[] orderIds) {
return toAjax(iInspectionWorkService.deleteEquOrderByOrderIds(orderIds));
}
}

123
op-modules/op-device/src/main/java/com/op/device/domain/EquFile.java
Unescape Escape View File

@ -0,0 +1,123 @@
package com.op.device.domain;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 附件对象 base_file
*
* @author Open Platform
* @date 2023-07-10
*/
public class EquFile extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 附件ID */
private String fileId;
/** 附件名称 */
@Excel(name = "附件名称")
private String fileName;
/** 附件地址 */
@Excel(name = "附件地址")
private String fileAddress;
/** 数据来源 */
@Excel(name = "数据来源")
private String sourceId;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private Long attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private Long attr4;
public void setFileId(String fileId) {
this.fileId = fileId;
}
public String getFileId() {
return fileId;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public String getFileName() {
return fileName;
}
public void setFileAddress(String fileAddress) {
this.fileAddress = fileAddress;
}
public String getFileAddress() {
return fileAddress;
}
public void setSourceId(String sourceId) {
this.sourceId = sourceId;
}
public String getSourceId() {
return sourceId;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(Long attr3) {
this.attr3 = attr3;
}
public Long getAttr3() {
return attr3;
}
public void setAttr4(Long attr4) {
this.attr4 = attr4;
}
public Long getAttr4() {
return attr4;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("fileId", getFileId())
.append("fileName", getFileName())
.append("fileAddress", getFileAddress())
.append("sourceId", getSourceId())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

49
op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java
Unescape Escape View File

@ -140,6 +140,55 @@ public class EquOrder extends BaseEntity {
// 是否停机保养
private String shutDown;
private String orderInspect;
//报修单号
private String repairCode;
//维修单号
private String workCode;
private int days;
private String equipmentName;
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public int getDays() {
return days;
}
public void setDays(int days) {
this.days = days;
}
public String getRepairCode() {
return repairCode;
}
public void setRepairCode(String repairCode) {
this.repairCode = repairCode;
}
public String getWorkCode() {
return workCode;
}
public void setWorkCode(String workCode) {
this.workCode = workCode;
}
public String getOrderInspect() {
return orderInspect;
}
public void setOrderInspect(String orderInspect) {
this.orderInspect = orderInspect;
}
public String getShutDown() {
return shutDown;
}

10
op-modules/op-device/src/main/java/com/op/device/domain/EquOrderEqu.java
Unescape Escape View File

@ -60,6 +60,16 @@ public class EquOrderEqu extends BaseEntity {
private List<EquOrderDetail> detailList;
private List<EquOrderEquSpare> spareList;
public List<EquOrderEquSpare> getSpareList() {
return spareList;
}
public void setSpareList(List<EquOrderEquSpare> spareList) {
this.spareList = spareList;
}
public List<EquOrderDetail> getDetailList() {
return detailList;
}

71
op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java
Unescape Escape View File

@ -84,6 +84,69 @@ public class EquOrderStandard extends BaseEntity {
// 图片路径
private String picturePath;
private String standardTypeName;
private String errorFlag;
private String faultType;
private String repairReach;
private BigDecimal repairValue;
private String repairPicture;
//检查项检查方法
private String itemMethod;
public String getRepairPicture() {
return repairPicture;
}
public void setRepairPicture(String repairPicture) {
this.repairPicture = repairPicture;
}
public BigDecimal getRepairValue() {
return repairValue;
}
public void setRepairValue(BigDecimal repairValue) {
this.repairValue = repairValue;
}
public String getRepairReach() {
return repairReach;
}
public void setRepairReach(String repairReach) {
this.repairReach = repairReach;
}
public String getFaultType() {
return faultType;
}
public void setFaultType(String faultType) {
this.faultType = faultType;
}
public String getErrorFlag() {
return errorFlag;
}
public void setErrorFlag(String errorFlag) {
this.errorFlag = errorFlag;
}
public String getStandardTypeName() {
return standardTypeName;
}
public void setStandardTypeName(String standardTypeName) {
this.standardTypeName = standardTypeName;
}
public String getPicturePath() {
return picturePath;
}
@ -212,6 +275,14 @@ public class EquOrderStandard extends BaseEntity {
return delFlag;
}
//检查项检查方法
public void setItemMethod(String itemMethod) {
this.itemMethod = itemMethod;
}
public String getItemMethod() {
return itemMethod;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

11
op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
Unescape Escape View File

@ -12,7 +12,7 @@ import com.op.common.core.web.domain.BaseEntity;
/**
* 计划对象 equ_plan
*
*
* @author Open Platform
* @date 2023-10-16
*/
@ -143,6 +143,15 @@ public class EquPlan extends BaseEntity {
// 是否停机保养
private String shutDown;
private String planEquCode;
public String getPlanEquCode() {
return planEquCode;
}
public void setPlanEquCode(String planEquCode) {
this.planEquCode = planEquCode;
}
public String getUpkeep() {
return upkeep;

10
op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEquSpare.java
Unescape Escape View File

@ -65,6 +65,16 @@ public class EquPlanEquSpare extends BaseEntity {
/** 删除标识 */
private String delFlag;
private BigDecimal amount;
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public void setId(String id) {
this.id = id;
}

19
op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.op.device.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -164,6 +166,23 @@ public class EquRepairOrder extends BaseEntity {
@Excel(name = "原因")
private String outSourceReason;
//图片文件
private String fileList;
private List<EquFile> files;
//图片文件
public String getFileList() {
return fileList;
}
public void setFileList(String fileList) {
this.fileList = fileList;
}
public List<EquFile> getFiles() {
return files;
}
public void setFiles(List<EquFile> files) {
this.files = files;
}
//委外
public void setWorkId(String workId) {

29
op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
Unescape Escape View File

@ -206,6 +206,13 @@ public class EquRepairWorkOrder extends BaseEntity {
/** 联系方式 */
private String workConnection;
//手持
//用户id
private String userId;
//检查项列表
private List<EquOrderStandard> checkList;
//申领单列表
private List<EquSpareApply> applyList;
//报修
public void setOrderDesc(String orderDesc) {
@ -563,6 +570,28 @@ public class EquRepairWorkOrder extends BaseEntity {
return workConnection;
}
//手持 用户userId
public void setUserId(String userId) {
this.userId = userId;
}
public String getUserId() {
return userId;
}
public List<EquOrderStandard> getCheckList() {
return checkList;
}
public void setCheckList(List<EquOrderStandard> checkList) {
this.checkList = checkList;
}
public List<EquSpareApply> getApplyList() {
return applyList;
}
public void setApplyList(List<EquSpareApply> applyList) {
this.applyList = applyList;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

38
op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java
Unescape Escape View File

@ -50,8 +50,8 @@ public class EquSpareApply extends BaseEntity {
private String spareUseEquipment;
/** 领用时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "领用时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "领用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
/** 申领人 */
@ -90,6 +90,14 @@ public class EquSpareApply extends BaseEntity {
// 创建日期结束
private String applyTimeEnd;
//新增字段
/** 工单编码 */
private String workCode ;
/** 关联上级code(保养) */
private String parentCode ;
/** 领用类型 */
private String applyType ;
public List<Date> getApplyTimeArray() {
return applyTimeArray;
}
@ -227,6 +235,32 @@ public class EquSpareApply extends BaseEntity {
return factoryCode;
}
//新增
/** 主工单编码(保养) */
public String getWorkCode(){
return this.workCode;
}
/** 主工单编码(保养) */
public void setWorkCode(String workCode){
this.workCode=workCode;
}
/** 关联上级code(保养) */
public String getParentCode(){
return this.parentCode;
}
/** 关联上级code(保养) */
public void setParentCode(String parentCode){
this.parentCode=parentCode;
}
/** 领用类型 */
public String getApplyType(){
return this.applyType;
}
/** 领用类型 */
public void setApplyType(String applyType){
this.applyType=applyType;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

19
op-modules/op-device/src/main/java/com/op/device/domain/EquTeam.java
Unescape Escape View File

@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import java.util.List;
/**
* 设备班组维护对象 equ_team
*
@ -40,6 +42,23 @@ public class EquTeam extends BaseEntity {
@Excel(name = "工厂号")
private String factoryCode;
//班组右边数据列表
private List<String> rightData;
public void setRightData(List<String> rightData) {
this.rightData = rightData;
}
public List<String> getRightData() {
return rightData;
}
private List<EquTeamUser> selectedData;
public void setSelectedData(List<EquTeamUser> selectedData) {
this.selectedData = selectedData;
}
public List<EquTeamUser> getSelectedData() {
return selectedData;
}
public void setId(String id) {
this.id = id;
}

107
op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java
Unescape Escape View File

@ -0,0 +1,107 @@
package com.op.device.domain;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 班组人员对象 equ_team_user
*
* @author Open Platform
* @date 2023-08-29
*/
public class EquTeamUser extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键 */
private String id;
/** 班组id */
@Excel(name = "班组id")
private String teamId;
/** 班组编码 */
@Excel(name = "班组编码")
private String teamCode;
/** 人员id */
@Excel(name = "人员id")
private String userId;
/** 人员名字编号 */
@Excel(name = "人员名字")
private String userName;
/** 人员名字 */
@Excel(name = "人员名字")
private String nickName;
/** 人员拼接名字 */
@Excel(name = "人员拼接名字")
private String teamUserName;
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
public void setTeamId(String teamId) {
this.teamId = teamId;
}
public String getTeamId() {
return teamId;
}
public void setTeamCode(String teamCode) {
this.teamCode = teamCode;
}
public String getTeamCode() {
return teamCode;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getUserId() {
return userId;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getUserName() {
return userName;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getTeamUserName() {
return teamUserName;
}
public void setTeamUserName(String teamUserName) {
this.teamUserName = teamUserName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("teamId", getTeamId())
.append("teamCode", getTeamCode())
.append("userId", getUserId())
.append("userName", getUserName())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

441
op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java
Unescape Escape View File

@ -0,0 +1,441 @@
package com.op.device.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
public class Equipment extends BaseEntity {
/** 设备ID */
private Long equipmentId;
/** 设备编码 */
@Excel(name = "设备编码")
private String equipmentCode;
/** 设备名称 */
@Excel(name = "设备名称")
private String equipmentName;
/** 品牌 */
@Excel(name = "品牌")
private String equipmentBrand;
/** 规格型号 */
@Excel(name = "规格型号")
private String equipmentSpec;
/** 设备类型ID */
@Excel(name = "设备类型ID")
private Long equipmentTypeId;
/** 设备类型编码 */
@Excel(name = "设备类型编码")
private String equipmentTypeCode;
/** 设备类型名称 */
@Excel(name = "设备类型名称")
private String equipmentTypeName;
/** 所属车间ID */
@Excel(name = "所属车间ID")
private Long workshopId;
/** 所属工作中心编码 */
@Excel(name = "所属工作中心编码")
private String workshopCode;
/** 所属工作中心名称 */
@Excel(name = "所属工作中心名称")
private String workshopName;
/** 设备状态,0异常 */
@Excel(name = "设备状态,0异常")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private Long attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private Long attr4;
/** 工段 */
@Excel(name = "工段")
private String workshopSection;
/** 设备位置 */
@Excel(name = "设备位置")
private String equipmentLocation;
/** 工时单价 */
@Excel(name = "工时单价")
private Long hourlyUnitPrice;
/** 设备条码 */
@Excel(name = "设备条码")
private String equipmentBarcode;
/** 设备条码图片 */
@Excel(name = "设备条码图片")
private String equipmentBarcodeImage;
/** 生产厂商 */
@Excel(name = "生产厂商")
private String manufacturer;
/** 供应商 */
@Excel(name = "供应商")
private String supplier;
/** 使用寿命 */
@Excel(name = "使用寿命")
private String useLife;
/** 购买时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "购买时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date buyTime;
/** 资产原值 */
@Excel(name = "资产原值")
private String assetOriginalValue;
/** 资产净值 */
@Excel(name = "资产净值")
private String netAssetValue;
/** 资产负责人 */
@Excel(name = "资产负责人")
private String assetHead;
/** 固定资产编码 */
@Excel(name = "固定资产编码")
private String fixedAssetCode;
/** 部门 */
@Excel(name = "部门")
private String department;
/** 单台能力工时 */
@Excel(name = "单台能力工时")
private String unitWorkingHours;
/** PLCIP */
@Excel(name = "PLCIP")
private String plcIp;
/** PLC端口 */
@Excel(name = "PLC端口")
private Long plcPort;
/** 删除标志1删除,0正常 */
private String delFlag;
/** SAP资产号 */
@Excel(name = "SAP资产号")
private String sapAsset;
public void setEquipmentId(Long equipmentId) {
this.equipmentId = equipmentId;
}
public Long getEquipmentId() {
return equipmentId;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getEquipmentCode() {
return equipmentCode;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentBrand(String equipmentBrand) {
this.equipmentBrand = equipmentBrand;
}
public String getEquipmentBrand() {
return equipmentBrand;
}
public void setEquipmentSpec(String equipmentSpec) {
this.equipmentSpec = equipmentSpec;
}
public String getEquipmentSpec() {
return equipmentSpec;
}
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
public void setEquipmentTypeCode(String equipmentTypeCode) {
this.equipmentTypeCode = equipmentTypeCode;
}
public String getEquipmentTypeCode() {
return equipmentTypeCode;
}
public void setEquipmentTypeName(String equipmentTypeName) {
this.equipmentTypeName = equipmentTypeName;
}
public String getEquipmentTypeName() {
return equipmentTypeName;
}
public void setWorkshopId(Long workshopId) {
this.workshopId = workshopId;
}
public Long getWorkshopId() {
return workshopId;
}
public void setWorkshopCode(String workshopCode) {
this.workshopCode = workshopCode;
}
public String getWorkshopCode() {
return workshopCode;
}
public void setWorkshopName(String workshopName) {
this.workshopName = workshopName;
}
public String getWorkshopName() {
return workshopName;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(Long attr3) {
this.attr3 = attr3;
}
public Long getAttr3() {
return attr3;
}
public void setAttr4(Long attr4) {
this.attr4 = attr4;
}
public Long getAttr4() {
return attr4;
}
public void setWorkshopSection(String workshopSection) {
this.workshopSection = workshopSection;
}
public String getWorkshopSection() {
return workshopSection;
}
public void setEquipmentLocation(String equipmentLocation) {
this.equipmentLocation = equipmentLocation;
}
public String getEquipmentLocation() {
return equipmentLocation;
}
public void setHourlyUnitPrice(Long hourlyUnitPrice) {
this.hourlyUnitPrice = hourlyUnitPrice;
}
public Long getHourlyUnitPrice() {
return hourlyUnitPrice;
}
public void setEquipmentBarcode(String equipmentBarcode) {
this.equipmentBarcode = equipmentBarcode;
}
public String getEquipmentBarcode() {
return equipmentBarcode;
}
public void setEquipmentBarcodeImage(String equipmentBarcodeImage) {
this.equipmentBarcodeImage = equipmentBarcodeImage;
}
public String getEquipmentBarcodeImage() {
return equipmentBarcodeImage;
}
public void setManufacturer(String manufacturer) {
this.manufacturer = manufacturer;
}
public String getManufacturer() {
return manufacturer;
}
public void setSupplier(String supplier) {
this.supplier = supplier;
}
public String getSupplier() {
return supplier;
}
public void setUseLife(String useLife) {
this.useLife = useLife;
}
public String getUseLife() {
return useLife;
}
public void setBuyTime(Date buyTime) {
this.buyTime = buyTime;
}
public Date getBuyTime() {
return buyTime;
}
public void setAssetOriginalValue(String assetOriginalValue) {
this.assetOriginalValue = assetOriginalValue;
}
public String getAssetOriginalValue() {
return assetOriginalValue;
}
public void setNetAssetValue(String netAssetValue) {
this.netAssetValue = netAssetValue;
}
public String getNetAssetValue() {
return netAssetValue;
}
public void setAssetHead(String assetHead) {
this.assetHead = assetHead;
}
public String getAssetHead() {
return assetHead;
}
public void setFixedAssetCode(String fixedAssetCode) {
this.fixedAssetCode = fixedAssetCode;
}
public String getFixedAssetCode() {
return fixedAssetCode;
}
public void setDepartment(String department) {
this.department = department;
}
public String getDepartment() {
return department;
}
public void setUnitWorkingHours(String unitWorkingHours) {
this.unitWorkingHours = unitWorkingHours;
}
public String getUnitWorkingHours() {
return unitWorkingHours;
}
public void setPlcIp(String plcIp) {
this.plcIp = plcIp;
}
public String getPlcIp() {
return plcIp;
}
public void setPlcPort(Long plcPort) {
this.plcPort = plcPort;
}
public Long getPlcPort() {
return plcPort;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public void setSapAsset(String sapAsset) {
this.sapAsset = sapAsset;
}
public String getSapAsset() {
return sapAsset;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("equipmentId", getEquipmentId())
.append("equipmentCode", getEquipmentCode())
.append("equipmentName", getEquipmentName())
.append("equipmentBrand", getEquipmentBrand())
.append("equipmentSpec", getEquipmentSpec())
.append("equipmentTypeId", getEquipmentTypeId())
.append("equipmentTypeCode", getEquipmentTypeCode())
.append("equipmentTypeName", getEquipmentTypeName())
.append("workshopId", getWorkshopId())
.append("workshopCode", getWorkshopCode())
.append("workshopName", getWorkshopName())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("workshopSection", getWorkshopSection())
.append("equipmentLocation", getEquipmentLocation())
.append("hourlyUnitPrice", getHourlyUnitPrice())
.append("equipmentBarcode", getEquipmentBarcode())
.append("equipmentBarcodeImage", getEquipmentBarcodeImage())
.append("manufacturer", getManufacturer())
.append("supplier", getSupplier())
.append("useLife", getUseLife())
.append("buyTime", getBuyTime())
.append("assetOriginalValue", getAssetOriginalValue())
.append("netAssetValue", getNetAssetValue())
.append("assetHead", getAssetHead())
.append("fixedAssetCode", getFixedAssetCode())
.append("department", getDepartment())
.append("unitWorkingHours", getUnitWorkingHours())
.append("plcIp", getPlcIp())
.append("plcPort", getPlcPort())
.append("delFlag", getDelFlag())
.append("sapAsset", getSapAsset())
.toString();
}
}

16
op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java
Unescape Escape View File

@ -57,6 +57,11 @@ public class SparePartsLedger extends BaseEntity {
@Excel(name = "冻结数量", readConverterExp = "预=留")
private BigDecimal storageAmount;
//虚拟字段
/** 库存可用数量 */
// @Excel(name = "库存可用数量")
// private BigDecimal availableQuantity;
/** 占用数量 */
@Excel(name = "占用数量")
private BigDecimal occupyAmount;
@ -200,11 +205,9 @@ public class SparePartsLedger extends BaseEntity {
// 领用数量-保养备件领用使用
private BigDecimal applyNum;
public BigDecimal getApplyNum() {
return applyNum;
}
public void setApplyNum(BigDecimal applyNum) {
this.applyNum = applyNum;
}
@ -287,6 +290,15 @@ public class SparePartsLedger extends BaseEntity {
public BigDecimal getStorageAmount() {
return storageAmount;
}
//库存可用数量 虚拟字段
// public void setAvailableQuantity(BigDecimal availableQuantity) {
// this.availableQuantity = availableQuantity;
// }
// public BigDecimal getAvailableQuantity() {
// return availableQuantity;
// }
public void setOccupyAmount(BigDecimal occupyAmount) {
this.occupyAmount = occupyAmount;
}

23
op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java
Unescape Escape View File

@ -0,0 +1,23 @@
package com.op.device.domain.dto;
// 手持传参dto
public class PDADTO {
private String userId;
private String planType;
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getPlanType() {
return planType;
}
public void setPlanType(String planType) {
this.planType = planType;
}
}

26
op-modules/op-device/src/main/java/com/op/device/domain/dto/UpKeepOrderDTO.java
Unescape Escape View File

@ -0,0 +1,26 @@
package com.op.device.domain.dto;
import java.util.List;
// 保养工单DTO
public class UpKeepOrderDTO {
private List<String> ids;
private String inspect;
public String getInspect() {
return inspect;
}
public void setInspect(String inspect) {
this.inspect = inspect;
}
public List<String> getIds() {
return ids;
}
public void setIds(List<String> ids) {
this.ids = ids;
}
}

48
op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java
Unescape Escape View File

@ -0,0 +1,48 @@
package com.op.device.domain.vo;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquOrderDetail;
import com.op.device.domain.EquOrderEquSpare;
import com.op.device.domain.Equipment;
import java.util.List;
// 工单-报表VO
public class InspectionWorkVO {
private EquOrder order;
private Equipment equ;
private List<EquOrderDetail> detailList;
private List<EquOrderEquSpare> spareList;
public List<EquOrderEquSpare> getSpareList() {
return spareList;
}
public void setSpareList(List<EquOrderEquSpare> spareList) {
this.spareList = spareList;
}
public EquOrder getOrder() {
return order;
}
public void setOrder(EquOrder order) {
this.order = order;
}
public Equipment getEqu() {
return equ;
}
public void setEqu(Equipment equ) {
this.equ = equ;
}
public List<EquOrderDetail> getDetailList() {
return detailList;
}
public void setDetailList(List<EquOrderDetail> detailList) {
this.detailList = detailList;
}
}

24
op-modules/op-device/src/main/java/com/op/device/mapper/DeviceTaskMapper.java
Unescape Escape View File

@ -0,0 +1,24 @@
package com.op.device.mapper;
import com.op.common.core.domain.BaseFileData;
import com.op.device.domain.EquFile;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquPlan;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 附件Mapper接口
*
* @author Open Platform
* @date 2023-07-10
*/
@Mapper
public interface DeviceTaskMapper {
List<EquPlan> getPlans(EquPlan equPlan);
EquOrder getNewTaskOrder(EquOrder equOrder);
}

2
op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java
Unescape Escape View File

@ -18,7 +18,7 @@ public interface EquEquipmentMapper {
* @param equipmentId 设备管理主键
* @return 设备管理
*/
public EquEquipment selectEquEquipmentByEquipmentId(Long equipmentId);
public EquEquipment selectEquEquipmentByEquEquipmentId(Long equipmentId);
/**
* 查询设备管理列表

77
op-modules/op-device/src/main/java/com/op/device/mapper/EquFileMapper.java
Unescape Escape View File

@ -0,0 +1,77 @@
package com.op.device.mapper;
import com.op.common.core.domain.BaseFileData;
import com.op.device.domain.EquFile;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 附件Mapper接口
*
* @author Open Platform
* @date 2023-07-10
*/
@Mapper
public interface EquFileMapper {
/**
* 查询附件
*
* @param fileId 附件主键
* @return 附件
*/
public EquFile selectEquFileByFileId(String fileId);
/**
* 查询附件列表
*
* @param equFile 附件
* @return 附件集合
*/
public List<EquFile> selectEquFileList(EquFile equFile);
/**
* 新增附件
*
* @param equFile 附件
* @return 结果
*/
public int insertEquFile(EquFile equFile);
/**
* 修改附件
*
* @param equFile 附件
* @return 结果
*/
public int updateEquFile(EquFile equFile);
/**
* 删除附件
*
* @param fileId 附件主键
* @return 结果
*/
public int deleteEquFileByFileId(String fileId);
/**
* 批量删除附件
*
* @param fileIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteEquFileByFileIds(String[] fileIds);
/**
* 上传图片
* @param equFiles
*/
public Boolean insertEquFileBatch(@Param("baseFiles") List<BaseFileData> equFiles);
//查询图片
public List<EquFile> getEquFileBatch(String orderId);
//删除照图片
public void deleteEquFileBySourceId(String orderId);
}

7
op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java
Unescape Escape View File

@ -65,4 +65,11 @@ public interface EquOrderDetailMapper {
* @return
*/
List<EquOrderDetail> selectEquOrderDetailByParentCode(String code);
/**
* 查询检查项list-工单code
* @param orderCode
* @return
*/
List<EquOrderDetail> selectEquOrderDetailByOrderCode(String orderCode);
}

14
op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquSpareMapper.java
Unescape Escape View File

@ -58,4 +58,18 @@ public interface EquOrderEquSpareMapper {
* @return 结果
*/
public int deleteEquOrderEquSpareByIds(String[] ids);
/**
* 通过上级表单查询备件list
* @param code
* @return
*/
List<EquOrderEquSpare> selectEquOrderEquSpareByParentCode(String code);
/**
* 通过工单code查询备件信息
* @param orderCode
* @return
*/
List<EquOrderEquSpare> selectEquOrderEquSpareByOrderCode(String orderCode);
}

38
op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java
Unescape Escape View File

@ -2,18 +2,23 @@ package com.op.device.mapper;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.device.domain.EquOrder;
import com.op.device.domain.dto.PDADTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 计划工单Mapper接口
*
*
* @author wws
* @date 2023-10-23
*/
@Mapper
public interface EquOrderMapper {
/**
* 查询计划工单
*
*
* @param orderCode 计划工单主键
* @return 计划工单
*/
@ -21,7 +26,7 @@ public interface EquOrderMapper {
/**
* 查询计划工单列表
*
*
* @param equOrder 计划工单
* @return 计划工单集合
*/
@ -29,7 +34,7 @@ public interface EquOrderMapper {
/**
* 新增计划工单
*
*
* @param equOrder 计划工单
* @return 结果
*/
@ -37,7 +42,7 @@ public interface EquOrderMapper {
/**
* 修改计划工单
*
*
* @param equOrder 计划工单
* @return 结果
*/
@ -45,7 +50,7 @@ public interface EquOrderMapper {
/**
* 删除计划工单
*
*
* @param orderId 计划工单主键
* @return 结果
*/
@ -53,7 +58,7 @@ public interface EquOrderMapper {
/**
* 批量删除计划工单
*
*
* @param orderIds 需要删除的数据主键集合
* @return 结果
*/
@ -81,10 +86,10 @@ public interface EquOrderMapper {
/**
* 获取巡检记录
* @param userId
* @param pdadto
* @return
*/
List<EquOrder> selectTaskRecord(int userId);
List<EquOrder> selectTaskRecord(PDADTO pdadto);
/**
* 通过id查询工单信息
@ -98,4 +103,19 @@ public interface EquOrderMapper {
* @return
*/
int selectSerialNumber();
/**
* 替换循环类型
* @param planLoopType
* @return
*/
@DS("#master")
String changeLoopType(String planLoopType);
/**
* 获取今日任务list
* @param pdadto
* @return
*/
List<EquOrder> selectTodayTask(PDADTO pdadto);
}

8
op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.op.device.mapper;
import java.util.List;
import com.op.common.core.domain.BaseFileData;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquOrderStandard;
/**
@ -72,4 +73,11 @@ public interface EquOrderStandardMapper {
* @param files
*/
void insertBaseFileBatch(List<BaseFileData> files);
/**
* 手持维修工单关联检查项信息
* @param equOrder
* @return
*/
public List<EquOrderStandard> selectPdaEquOrderList(EquOrder equOrder);
}

7
op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java
Unescape Escape View File

@ -77,4 +77,11 @@ public interface EquPlanDetailMapper {
* @param planCode
*/
void delEquPlanDetailByPlanCode(String planCode);
/**
* 通过parentCode查询检查项信息
* @param code
* @return
*/
List<EquPlanDetail> selectEquPlanDetailListByParentCode(String code);
}

6
op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquSpareMapper.java
Unescape Escape View File

@ -64,4 +64,10 @@ public interface EquPlanEquSpareMapper {
* @param planCode
*/
void deleteEquPlanEquSpareByPlanCode(String planCode);
/**
* 逻辑删除
* @param planCode
*/
void delEquPlanEquSpareByPlanCode(String planCode);
}

7
op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java
Unescape Escape View File

@ -77,4 +77,11 @@ public interface EquPlanStandardMapper {
* @param planCode
*/
void delEquPlanStandardByPlanCode(String planCode);
/**
* 通过parentCode获取标准信息
* @param code
* @return
*/
List<EquPlanStandard> selectEquPlanStandardListByParentCode(String code);
}

15
op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java
Unescape Escape View File

@ -3,8 +3,10 @@ package com.op.device.mapper;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.domain.BaseFileData;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquRepairOrder;
import org.apache.ibatis.annotations.Param;
/**
* 故障报修Mapper接口
@ -70,4 +72,17 @@ public interface EquRepairOrderMapper {
//查询报修人员列表
@DS("master")
List<EquEquipment> getRepairPersonList(EquEquipment equEquipment);
/**
* 通过报修code查询报修单信息
* @param repairCode
* @return
*/
EquRepairOrder selectEquRepairOrderByRepairCode(String repairCode);
/**
* 通过报修code删除报修单信息-彻底删除！
* @param repairCode
*/
void deleteEquRepairOrderByRepairCode(String repairCode);
}

6
op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java
Unescape Escape View File

@ -2,8 +2,9 @@ package com.op.device.mapper;
import java.util.List;
import com.op.device.domain.EquEquipment;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.domain.EquTeamUser;
/**
* 维修工单Mapper接口
@ -67,5 +68,6 @@ public interface EquRepairWorkOrderMapper {
void updateWorkOutsource(EquRepairWorkOrder equRepairWorkOrder);
//获取维修人员列表
public List<EquEquipment> getMaintenancePersonList(EquEquipment equEquipment);
@DS("master")
public List<EquTeamUser> getMaintenancePersonList(EquTeamUser equTeamUser);
}

4
op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.op.device.mapper;
import java.util.List;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.domain.EquSpareApply;
/**
@ -58,4 +59,7 @@ public interface EquSpareApplyMapper {
* @return 结果
*/
public int deleteEquSpareApplyByApplyIds(String[] applyIds);
//查询维修工单对应的备件申领记录
public List<EquSpareApply> selectRepairSparePartsRecord(EquRepairWorkOrder equRepairWorkOrder);
}

14
op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java
Unescape Escape View File

@ -2,7 +2,9 @@ package com.op.device.mapper;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.device.domain.EquTeam;
import com.op.device.domain.EquTeamUser;
/**
* 设备班组维护Mapper接口
@ -61,4 +63,16 @@ public interface EquTeamMapper {
//查询设备维修组列表
public List<EquTeam> getMaintenanceTeamList(EquTeam equTeam);
//查询设备维修组人员
@DS("master")
public List<EquTeamUser> getMaintenancePerson(EquTeamUser equTeamUser);
//查询所有人员
@DS("master")
public List<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser);
//查询特定人员
@DS("master")
public EquTeamUser selectTeamMember(EquTeamUser equTeamUser);
}

79
op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamUserMapper.java
Unescape Escape View File

@ -0,0 +1,79 @@
package com.op.device.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.device.domain.EquTeamUser;
import java.util.List;
/**
* 班组人员Mapper接口
*
* @author Open Platform
* @date 2023-08-29
*/
public interface EquTeamUserMapper {
/**
* 查询班组人员
*
* @param id 班组人员主键
* @return 班组人员
*/
public EquTeamUser selectEquTeamUserById(String id);
/**
* 查询班组人员列表
*
* @param equTeamUser 班组人员
* @return 班组人员集合
*/
public List<EquTeamUser> selectEquTeamUserList(EquTeamUser equTeamUser);
/**
* 新增班组人员
*
* @param equTeamUser 班组人员
* @return 结果
*/
public int insertEquTeamUser(EquTeamUser equTeamUser);
/**
* 修改班组人员
*
* @param equTeamUser 班组人员
* @return 结果
*/
public int updateEquTeamUser(EquTeamUser equTeamUser);
/**
* 删除班组人员
*
* @param id 班组人员主键
* @return 结果
*/
public int deleteEquTeamUserById(String id);
/**
* 批量删除班组人员
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteEquTeamUserByIds(String[] ids);
//查询人员
@DS("master")
public List<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser);
//查询人员对应名字
public List<String> selectTeamMembersIds(EquTeamUser equTeamUser);
//查询人员ID
public String selectId(EquTeamUser equTeamUser);
@DS("master")
public String selectUserName(EquTeamUser equTeamUser);
//批量删除
public void deleteEquTeamUserByTeamId(String teamId);
void deleteEquTeamUserByTeamIds(String[] teamIds);
}

13
op-modules/op-device/src/main/java/com/op/device/mapper/EquipmentMapper.java
Unescape Escape View File

@ -0,0 +1,13 @@
package com.op.device.mapper;
import com.op.device.domain.Equipment;
public interface EquipmentMapper {
/**
* 查询设备管理
*
* @param equipmentId 设备管理主键
* @return 设备管理
*/
public Equipment selectEquipmentByEquipmentCode(String equipmentCode);
}

9
op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.op.device.mapper;
import java.math.BigDecimal;
import java.util.List;
import com.op.device.domain.SparePartsLedger;
@ -58,4 +59,12 @@ public interface SparePartsLedgerMapper {
* @return 结果
*/
public int deleteSparePartsLedgerByStorageIds(String[] storageIds);
/**
* 通过备件编码获取备件真实库存（总数量-冻结数量）
* @param materialCode
* @return
*/
BigDecimal selectRealAmountByMaterialCode(String materialCode);
}

61
op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java
Unescape Escape View File

@ -1,7 +1,8 @@
package com.op.device.service;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOrder;
import com.op.device.domain.*;
import com.op.device.domain.dto.PDADTO;
/**
* PDAService
@ -15,14 +16,14 @@ public interface IDevicePDAService {
* 获取今日巡检任务工单list
* @return
*/
AjaxResult getTodayTask(int userId);
AjaxResult getTodayTask(PDADTO pdadto);
/**
* 获取巡检记录
* @param userId
* @param pdadto
* @return
*/
AjaxResult getTaskRecord(int userId);
AjaxResult getTaskRecord(PDADTO pdadto);
/**
* 获取任务详情
@ -37,4 +38,56 @@ public interface IDevicePDAService {
* @return
*/
AjaxResult updateInspectionRecord(EquOrder equOrder);
//报修
/**
* 手持新增报修记录
* @param equRepairOrder
* @return
*/
public AjaxResult addRepairRecord(EquRepairOrder equRepairOrder);
//维修
/**
* 手持查询维修记录 （待处理和已经维修完成）
* @param equRepairWorkOrder
* @return
*/
public AjaxResult getMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder);
//班组
/**
* 维修班组
* @param equTeamUser
* @return
*/
public AjaxResult getMaintenancePerson(EquTeamUser equTeamUser);
/**
* 手持是否停机
* @param equRepairWorkOrder
* @return
*/
public AjaxResult updateDowntime(EquRepairWorkOrder equRepairWorkOrder);
/**
* 查询设备详细信息
* @param equipmentId
* @return
*/
public AjaxResult selectEquEquipmentByEquEquipmentId(Long equipmentId);
/**
* 查询维修工单
* @param workId
* @return
*/
public AjaxResult selectPdaRepairWorkOrderDetails(String workId);
/**
* 填写维修工单
* @param equRepairWorkOrder
* @return
*/
public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder);
}

16
op-modules/op-device/src/main/java/com/op/device/service/IDeviceTaskService.java
Unescape Escape View File

@ -0,0 +1,16 @@
package com.op.device.service;
import com.op.common.core.domain.R;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquPlan;
/**
* TaskService
*
* @author wws
* @date 2023-10-23
*/
public interface IDeviceTaskService {
AjaxResult createSpotCheckPlanTask(EquPlan equPlan);
}

4
op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java
Unescape Escape View File

@ -2,8 +2,8 @@ package com.op.device.service;
import java.util.List;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.domain.EquTeamUser;
/**
* 维修工单Service接口
@ -61,7 +61,7 @@ public interface IEquRepairWorkOrderService {
public int deleteEquRepairWorkOrderByWorkId(String workId);
//获取维修人员列表
public List<EquEquipment> getMaintenancePersonList(EquEquipment equEquipment);
public List<EquTeamUser> getMaintenancePersonList(EquTeamUser equTeamUser);
//委外申请
public int applyEquOutsourceWork(EquRepairWorkOrder equRepairWorkOrder);

5
op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.op.device.service;
import java.util.List;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.domain.EquSpareApply;
/**
@ -57,4 +59,7 @@ public interface IEquSpareApplyService {
* @return 结果
*/
public int deleteEquSpareApplyByApplyId(String applyId);
//查询维修工单对应备件申领记录
public List<EquSpareApply> selectRepairSparePartsRecord(EquRepairWorkOrder equRepairWorkOrder);
}

10
op-modules/op-device/src/main/java/com/op/device/service/IEquTeamService.java
Unescape Escape View File

@ -1,7 +1,10 @@
package com.op.device.service;
import java.util.List;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquTeam;
import com.op.device.domain.EquTeamUser;
/**
* 设备班组维护Service接口
@ -32,7 +35,7 @@ public interface IEquTeamService {
* @param equTeam 设备班组维护
* @return 结果
*/
public int insertEquTeam(EquTeam equTeam);
public AjaxResult insertEquTeam(EquTeam equTeam);
/**
* 修改设备班组维护
@ -40,7 +43,7 @@ public interface IEquTeamService {
* @param equTeam 设备班组维护
* @return 结果
*/
public int updateEquTeam(EquTeam equTeam);
public AjaxResult updateEquTeam(EquTeam equTeam);
/**
* 批量删除设备班组维护
@ -60,4 +63,7 @@ public interface IEquTeamService {
//维修组列表
List<EquTeam> getMaintenanceTeamList(EquTeam equTeam);
//查询所有人员信息
List<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser);
}

10
op-modules/op-device/src/main/java/com/op/device/service/IEquUpkeepOrderService.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.op.device.service;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquPlan;
import com.op.device.domain.dto.UpKeepOrderDTO;
import java.util.List;
@ -43,7 +44,7 @@ public interface IEquUpkeepOrderService {
* @param equOrder 保养工单
* @return 结果
*/
public int updateEquOrder(EquOrder equOrder);
public AjaxResult updateEquOrder(EquOrder equOrder);
/**
* 批量删除保养工单
@ -60,4 +61,11 @@ public interface IEquUpkeepOrderService {
* @return 结果
*/
public int deleteEquOrderByOrderId(String orderId);
/**
* 保养工单检验
* @param upKeepOrderDTO
* @return
*/
AjaxResult subInspect(UpKeepOrderDTO upKeepOrderDTO);
}

62
op-modules/op-device/src/main/java/com/op/device/service/IInspectionWorkService.java
Unescape Escape View File

@ -0,0 +1,62 @@
package com.op.device.service;
import java.util.List;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOrder;
/**
* 巡检记录Service接口
*
* @author wws
* @date 2023-11-07
*/
public interface IInspectionWorkService {
/**
* 查询巡检记录
*
* @param orderId 巡检记录主键
* @return 巡检记录
*/
public AjaxResult selectEquOrderByOrderId(String orderId);
/**
* 查询巡检记录列表
*
* @param equOrder 巡检记录
* @return 巡检记录集合
*/
public List<EquOrder> selectEquOrderList(EquOrder equOrder);
/**
* 新增巡检记录
*
* @param equOrder 巡检记录
* @return 结果
*/
public int insertEquOrder(EquOrder equOrder);
/**
* 修改巡检记录
*
* @param equOrder 巡检记录
* @return 结果
*/
public int updateEquOrder(EquOrder equOrder);
/**
* 批量删除巡检记录
*
* @param orderIds 需要删除的巡检记录主键集合
* @return 结果
*/
public int deleteEquOrderByOrderIds(String[] orderIds);
/**
* 删除巡检记录信息
*
* @param orderId 巡检记录主键
* @return 结果
*/
public int deleteEquOrderByOrderId(String orderId);
}

325
op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
Unescape Escape View File

@ -8,17 +8,23 @@ import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquOrderDetail;
import com.op.device.domain.EquOrderEqu;
import com.op.device.domain.EquOrderStandard;
import com.op.device.domain.*;
import com.op.device.domain.dto.PDADTO;
import com.op.device.mapper.*;
import com.op.device.service.IDevicePDAService;
import com.op.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@ -46,30 +52,40 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
private EquOrderPersonMapper equOrderPersonMapper;
@Autowired
private PersonMapper personMapper;
@Autowired
private EquRepairOrderMapper equRepairOrderMapper;
@Autowired
private EquRepairWorkOrderMapper equRepairWorkOrderMapper;
@Autowired
private EquTeamMapper equTeamMapper;
@Autowired
private EquEquipmentMapper equEquipmentMapper;
@Autowired
private EquSpareApplyMapper equSpareApplyMapper;
/**
* 获取今日巡检任务工单list
* 获取今日巡检任务工单list-状态不为已完成
*
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult getTodayTask(int userId) {
List<EquOrder> orderList = equOrderMapper.selectTodayTask(userId);
public AjaxResult getTodayTask(PDADTO pdadto) {
List<EquOrder> orderList = equOrderMapper.selectTodayTask(pdadto);
return success(orderList);
}
/**
* 获取巡检记录
*
* @param userId
* @param pdadto
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult getTaskRecord(int userId) {
List<EquOrder> orderList = equOrderMapper.selectTaskRecord(userId);
public AjaxResult getTaskRecord(PDADTO pdadto) {
List<EquOrder> orderList = equOrderMapper.selectTaskRecord(pdadto);
return success(orderList);
}
@ -100,11 +116,11 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop()));
EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode());
EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId());
List<EquOrderDetail> detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode());
List<EquOrderDetail> detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getId());
for (EquOrderDetail detail : detailList) {
List<EquOrderStandard> standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode());
List<EquOrderStandard> standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId());
detail.setStandardList(standardList);
}
equ.setDetailList(detailList);
@ -135,6 +151,22 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
@DS("#header.poolName")
public AjaxResult updateInspectionRecord(EquOrder equOrder) {
// 检验如果审核通过则不允许修改记录
if (equOrder.getRepairCode() != null) {
if (!equOrder.getRepairCode().isEmpty()) {
EquRepairOrder repairOrder = equRepairOrderMapper.selectEquRepairOrderByRepairCode(equOrder.getRepairCode());
if (repairOrder==null) {
return error(500,"未查询到报修单信息！");
}else {
if (!repairOrder.getOrderStatus().equals("待审核")){
return error(500,"报修单已审核,不可修改记录！");
}
}
}
}
boolean hasError = false;
EquOrderEqu equ = equOrder.getEqu();
List<EquOrderDetail> detailList = equ.getDetailList();
for (EquOrderDetail detail : detailList) {
@ -159,20 +191,279 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
equOrderStandardMapper.insertBaseFileBatch(files);
}
// 校验标准信息-是否申请报修
if (standard.getStandardType().equals("quantify")) {
int up = standard.getActualValue().compareTo(standard.getDetailUpLimit());
int down = standard.getActualValue().compareTo(standard.getDetailDownLimit());
standard.setDetailReach("1");
standard.setErrorFlag("0");
if (!(up != 1 && down != -1)) {
hasError = true;
standard.setErrorFlag("1");
standard.setDetailReach("0");
}
}else {
// TODO 未达标
standard.setErrorFlag("0");
if (standard.getDetailReach().equals("0")) {
hasError = true;
standard.setErrorFlag("1");
}
}
// 更新标准
standard.setUpdateTime(DateUtils.getNowDate());
equOrderStandardMapper.updateEquOrderStandard(standard);
}
}
// 更新工单信息
equOrder.setOrderStatus("1");
equOrder.setOrderStatus("1"); // 状态为已完成
equOrder.setUpdateTime(DateUtils.getNowDate());
equOrder.setUpdateBy(SecurityContextHolder.getUserName());
equOrder.setPlanPerson(SecurityContextHolder.getUserName());
equOrderMapper.updateEquOrder(equOrder);
equOrder.setPlanPerson(SecurityContextHolder.getUserName());
if (equOrder.getTimeArray().size() > 0) {
equOrder.setOrderStart(equOrder.getTimeArray().get(0));
equOrder.setOrderEnd(equOrder.getTimeArray().get(1));
}
return success(equOrder);
boolean checkRepair = false;
if (equOrder.getRepairCode() == null){
checkRepair = true;
}else {
if (equOrder.getRepairCode().isEmpty()){
checkRepair = true;
}
}
// 报修信息
if (checkRepair && hasError ) {
// 获取故障报修流水号
EquRepairOrder equRepairOrder = new EquRepairOrder();
String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber());
String equipmentCode = equOrder.getEqu().getEquipmentCode();
//报修单号
equRepairOrder.setOrderCode("BX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
//在主表中存入报修单号信息
equOrder.setRepairCode(equRepairOrder.getOrderCode());
//新增报修记录
equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());
equRepairOrder.setCreateTime(DateUtils.getNowDate());
equRepairOrder.setCreateBy(SecurityUtils.getUsername());
// 报修来源
if (equOrder.getPlanType().equals("inspection")){
equRepairOrder.setOrderSource("巡检");
}
if (equOrder.getPlanType().equals("spotInspection")){
equRepairOrder.setOrderSource("点检");
}
if (equOrder.getPlanType().equals("maintenance")){
equRepairOrder.setOrderSource("保养");
}
equRepairOrder.setOrderStatus("待审核");
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
equRepairOrderMapper.insertEquRepairOrder(equRepairOrder);
}
if (!hasError) {
// TODO 删除报修单
if (equOrder.getRepairCode() != null) {
if (!equOrder.getRepairCode().isEmpty()) {
equRepairOrderMapper.deleteEquRepairOrderByRepairCode(equOrder.getRepairCode());
equOrder.setRepairCode("");
}
}
}
// 更新工单信息
equOrderMapper.updateEquOrder(equOrder);
return success();
}
//////////////////////报修
/**
* 新增报修记录
*
* @param equRepairOrder
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult addRepairRecord(EquRepairOrder equRepairOrder) {
try {
equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());
// 获取故障报修流水号
String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber());
String equipmentCode = equRepairOrder.getEquipmentCode();
//报修单号
equRepairOrder.setOrderCode("BX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
equRepairOrder.setCreateTime(DateUtils.getNowDate());
equRepairOrder.setCreateBy(SecurityUtils.getUsername());
equRepairOrder.setOrderStatus("待审核");
// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
// String key = "#header.poolName";
// equRepairOrder.setFactory(request.getHeader(key.substring(8)).replace("ds_",""));
return success("新增报修记录成功！");
} catch (Exception e) {
return error();
}
}
/**
* 获取维修记录
*
* @param equRepairWorkOrder
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult getMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) {
try {
if (equRepairWorkOrder.getWorkPlanTimeArray() != null) {
// 设置创建日期开始和结束值
if (equRepairWorkOrder.getWorkPlanTimeArray().size() == 2) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
equRepairWorkOrder.setWorkPlanTimeStart(formatter.format(equRepairWorkOrder.getWorkPlanTimeArray().get(0)));
equRepairWorkOrder.setWorkPlanTimeEnd(formatter.format(equRepairWorkOrder.getWorkPlanTimeArray().get(1)));
}
}
if (equRepairWorkOrder.getWorkPlanDownTimeArray() != null) {
// 设置更新日期开始和结束
if (equRepairWorkOrder.getWorkPlanDownTimeArray().size() == 2) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
equRepairWorkOrder.setWorkPlanDownTimeStart(formatter.format(equRepairWorkOrder.getWorkPlanDownTimeArray().get(0)));
equRepairWorkOrder.setWorkPlanDownTimeEnd(formatter.format(equRepairWorkOrder.getWorkPlanDownTimeArray().get(1)));
}
}
List<EquRepairWorkOrder> list = equRepairWorkOrderMapper.selectEquRepairWorkOrderList(equRepairWorkOrder);
return success(list);
} catch (Exception e) {
return error();
}
}
/**
* 获取维修记录
*
* @param equTeamUser
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult getMaintenancePerson(EquTeamUser equTeamUser) {
try {
List<EquTeamUser> list = equRepairWorkOrderMapper.getMaintenancePersonList(equTeamUser);
return success(list);
} catch (Exception e) {
return error();
}
}
/**
* 手持提交是否停机维修 停机维修的开始时间
*
* @param equRepairWorkOrder
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult updateDowntime(EquRepairWorkOrder equRepairWorkOrder) {
try {
if(equRepairWorkOrder.getWorkDownMachine().equals("0")){
equRepairWorkOrder.setWorkPlanDownTime(null);
}
equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
return success("提交成功，开始维修！");
} catch (Exception e) {
return error();
}
}
/**
* 手持提交是否停机维修 停机维修的开始时间
*
* @param equipmentId
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult selectEquEquipmentByEquEquipmentId(Long equipmentId) {
try {
EquEquipment list = equEquipmentMapper.selectEquEquipmentByEquEquipmentId(equipmentId);
return success(list);
} catch (Exception e) {
return error();
}
}
/**
* 查询维修工单详情
*
* @param workId 维修工单主键
* @return 维修工单
*/
@Override
@DS("#header.poolName")
public AjaxResult selectPdaRepairWorkOrderDetails(String workId) {
try {
EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(workId);
//查询对应检查项信息
EquOrder equOrder = new EquOrder();
equOrder.setWorkCode(list.getWorkCode());
List<EquOrderStandard> checkLists = equOrderStandardMapper.selectPdaEquOrderList(equOrder);
list.setCheckList(checkLists);
//备件申领单
EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
equRepairWorkOrder.setWorkCode(list.getWorkCode());
List<EquSpareApply> applyLists = equSpareApplyMapper.selectRepairSparePartsRecord(equRepairWorkOrder);
list.setApplyList(applyLists);
return success(list);
} catch (Exception e) {
return error();
}
}
/**
* 填写维修工单
*
* @param equRepairWorkOrder
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) {
try {
//更新每一项点检/巡检检查项信息
List<EquOrderStandard> equOrderStandards = equRepairWorkOrder.getCheckList();
for(EquOrderStandard equOrderStandard:equOrderStandards){
equOrderStandard.setUpdateBy(SecurityUtils.getUsername());
equOrderStandard.setUpdateTime(DateUtils.getNowDate());
equOrderStandardMapper.updateEquOrderStandard(equOrderStandard);
}
//新建申领单 缺少code
List<EquSpareApply> equSpareApplies = equRepairWorkOrder.getApplyList();
for(EquSpareApply equSpareApply:equSpareApplies){
equSpareApply.setApplyId(IdUtils.fastSimpleUUID());
equSpareApply.setCreateBy(SecurityUtils.getUsername());
equSpareApply.setCreateTime(DateUtils.getNowDate());
equSpareApply.setApplyTime(DateUtils.getNowDate());
equSpareApplyMapper.insertEquSpareApply(equSpareApply);
}
//维修人员名字？？？？前端能够提供吗？？？
equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
return success("提交成功，维修完成！");
} catch (Exception e) {
return error();
}
}
}

69
op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
Unescape Escape View File

@ -0,0 +1,69 @@
package com.op.device.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.*;
import com.op.device.mapper.*;
import com.op.device.service.IDeviceTaskService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import static com.op.common.core.web.domain.AjaxResult.error;
import static com.op.common.core.web.domain.AjaxResult.success;
/**
* TaskService实现类
*
* @author wws
* @date 2023-10-23
*/
@Service
public class DeviceTaskServiceImpl implements IDeviceTaskService {
@Autowired
private DeviceTaskMapper deviceTaskMapper;
@Autowired
private EquOrderMapper equOrderMapper;
/**
* 根据点检计划生成点检任务
* **/
@Override
@DS("#header.poolName")
public AjaxResult createSpotCheckPlanTask(EquPlan equPlan) {
/**equ_plan equ_plan_equ**/
equPlan.setPlanType("spotInspection");
List<EquPlan> plans = deviceTaskMapper.getPlans(equPlan);
for(EquPlan plan:plans){
if("day".equals(plan.getPlanLoopType())){
EquOrder order = new EquOrder();
order.setPlanType("spotInspection");
EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(order);
if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){
//生成点检计划
this.createSpotCheckPlan(plan);
}
}
}
return success();
}
private int createSpotCheckPlan(EquPlan plan){
/**equ_order**/
EquOrder order = new EquOrder();
BeanUtils.copyProperties(plan,order);
equOrderMapper.insertEquOrder(order);
/**equ_order_detail**/
List<EquOrderDetail> details = new ArrayList<>();
return 0;
}
}

169
op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
Unescape Escape View File

@ -6,18 +6,24 @@ import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.domain.BaseFileData;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOrderDetail;
import com.op.device.domain.EquOrderEqu;
import com.op.device.domain.EquOrderStandard;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.*;
import com.op.device.mapper.*;
import com.op.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.device.domain.EquOrder;
import com.op.device.service.IEquOrderService;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import static com.op.common.core.web.domain.AjaxResult.error;
import static com.op.common.core.web.domain.AjaxResult.success;
/**
@ -40,6 +46,10 @@ public class EquOrderServiceImpl implements IEquOrderService {
private EquOrderStandardMapper equOrderStandardMapper;
@Autowired
private PersonMapper personMapper;
@Autowired
private EquOrderEquSpareMapper equOrderEquSpareMapper;
@Autowired
private EquRepairOrderMapper equRepairOrderMapper;
/**
* 查询计划工单
@ -58,19 +68,24 @@ public class EquOrderServiceImpl implements IEquOrderService {
timeArray.add(order.getOrderEnd());
order.setTimeArray(timeArray);
order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(orderCode));
order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(order.getPlanCode()));
order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop()));
EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode());
EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId());
List<EquOrderDetail> detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode());
List<EquOrderDetail> detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getId());
for (EquOrderDetail detail : detailList) {
List<EquOrderStandard> standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode());
List<EquOrderStandard> standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId());
detail.setStandardList(standardList);
}
equ.setDetailList(detailList);
List<EquOrderEquSpare> spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByParentCode(equ.getId());
if (spareList.size() > 0) {
equ.setSpareList(spareList);
}
// 人员信息
List<String> users = equOrderPersonMapper.selectEquOrderPersonByOrderCode(orderCode);
@ -96,7 +111,13 @@ public class EquOrderServiceImpl implements IEquOrderService {
@Override
@DS("#header.poolName")
public List<EquOrder> selectEquOrderList(EquOrder equOrder) {
return equOrderMapper.selectEquOrderList(equOrder);
List<EquOrder> orderList = equOrderMapper.selectEquOrderList(equOrder);
for (EquOrder order : orderList) {
EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId());
order.setEquipmentCode(equ.getEquipmentCode());
order.setEquipmentName(equ.getEquipmentName());
}
return orderList;
}
/**
@ -121,24 +142,138 @@ public class EquOrderServiceImpl implements IEquOrderService {
@Override
@DS("#header.poolName")
public AjaxResult updateEquOrder(EquOrder equOrder) {
// 更新工单信息
equOrder.setOrderStart(equOrder.getTimeArray().get(0));
equOrder.setOrderEnd(equOrder.getTimeArray().get(1));
equOrder.setUpdateTime(DateUtils.getNowDate());
equOrder.setUpdateBy(SecurityContextHolder.getUserName());
equOrderMapper.updateEquOrder(equOrder);
// 更新标准信息
// 检验如果审核通过则不允许修改记录
if (equOrder.getRepairCode() != null) {
if (!equOrder.getRepairCode().isEmpty()) {
EquRepairOrder repairOrder = equRepairOrderMapper.selectEquRepairOrderByRepairCode(equOrder.getRepairCode());
if (repairOrder == null) {
return error(500, "未查询到报修单信息！");
} else {
if (!repairOrder.getOrderStatus().equals("待审核")) {
return error(500, "报修单已审核,不可修改记录！");
}
}
}
}
boolean hasError = false;
EquOrderEqu equ = equOrder.getEqu();
List<EquOrderDetail> detailList = equ.getDetailList();
for (EquOrderDetail detail : detailList) {
List<EquOrderStandard> standardList = detail.getStandardList();
for (EquOrderStandard standard : standardList) {
standard.setUpdateBy(SecurityContextHolder.getUserName());
//上传附件
if (StringUtils.isNotEmpty(standard.getPicturePath())) {
String[] ids = standard.getPicturePath().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(standard.getId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
files.add(file);
}
equOrderStandardMapper.insertBaseFileBatch(files);
}
// 校验标准信息-是否申请报修
if (standard.getStandardType().equals("quantify")) {
int up = standard.getActualValue().compareTo(standard.getDetailUpLimit());
int down = standard.getActualValue().compareTo(standard.getDetailDownLimit());
standard.setDetailReach("1");
standard.setErrorFlag("0");
if (!(up != 1 && down != -1)) {
hasError = true;
standard.setErrorFlag("1");
standard.setDetailReach("0");
}
} else {
// TODO 未达标
standard.setErrorFlag("0");
if (standard.getDetailReach().equals("0")) {
hasError = true;
standard.setErrorFlag("1");
}
}
// 更新标准
standard.setUpdateTime(DateUtils.getNowDate());
equOrderStandardMapper.updateEquOrderStandard(standard);
}
}
// 更新工单信息
equOrder.setOrderStatus("1"); // 状态为已完成
equOrder.setUpdateTime(DateUtils.getNowDate());
equOrder.setUpdateBy(SecurityContextHolder.getUserName());
equOrder.setPlanPerson(SecurityContextHolder.getUserName());
equOrder.setPlanPerson(SecurityContextHolder.getUserName());
if (equOrder.getTimeArray().size() > 0) {
equOrder.setOrderStart(equOrder.getTimeArray().get(0));
equOrder.setOrderEnd(equOrder.getTimeArray().get(1));
}
boolean checkRepair = false;
if (equOrder.getRepairCode() == null) {
checkRepair = true;
} else {
if (equOrder.getRepairCode().isEmpty()) {
checkRepair = true;
}
}
// 报修信息
if (checkRepair && hasError) {
// 获取故障报修流水号
EquRepairOrder equRepairOrder = new EquRepairOrder();
String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber());
String equipmentCode = equOrder.getEqu().getEquipmentCode();
//报修单号
equRepairOrder.setOrderCode("BX" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
//在主表中存入报修单号信息
equOrder.setRepairCode(equRepairOrder.getOrderCode());
//新增报修记录
equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());
equRepairOrder.setCreateTime(DateUtils.getNowDate());
equRepairOrder.setCreateBy(SecurityUtils.getUsername());
// 报修来源
if (equOrder.getPlanType().equals("inspection")) {
equRepairOrder.setOrderSource("巡检");
}
if (equOrder.getPlanType().equals("spotInspection")) {
equRepairOrder.setOrderSource("点检");
}
if (equOrder.getPlanType().equals("maintenance")) {
equRepairOrder.setOrderSource("保养");
}
equRepairOrder.setOrderStatus("待审核");
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
equRepairOrderMapper.insertEquRepairOrder(equRepairOrder);
}
if (!hasError) {
// TODO 删除报修单
if (equOrder.getRepairCode() != null) {
if (!equOrder.getRepairCode().isEmpty()) {
equRepairOrderMapper.deleteEquRepairOrderByRepairCode(equOrder.getRepairCode());
equOrder.setRepairCode("");
}
}
}
// 更新工单信息
equOrderMapper.updateEquOrder(equOrder);
return success();
}

40
op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.op.device.service.impl;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@ -53,6 +54,9 @@ public class EquPlanServiceImpl implements IEquPlanService {
private EquPlanEquMapper equPlanEquMapper;
@Autowired
private EquPlanEquSpareMapper equPlanEquSpareMapper;
// 备件mapper
@Autowired
private SparePartsLedgerMapper sparePartsLedgerMapper;
/**
* 查询计划
@ -202,6 +206,8 @@ public class EquPlanServiceImpl implements IEquPlanService {
equPlanDetailMapper.delEquPlanDetailByPlanCode(equPlan.getPlanCode());
equPlanEquMapper.delEquPlanEquByPlanCode(equPlan.getPlanCode());
equPlanStandardMapper.delEquPlanStandardByPlanCode(equPlan.getPlanCode());
// TODO 有问题没有删除成功
equPlanEquSpareMapper.delEquPlanEquSpareByPlanCode(equPlan.getPlanCode());
}
return success();
}
@ -343,16 +349,10 @@ public class EquPlanServiceImpl implements IEquPlanService {
for (EquPlanEqu equipment : equipmentList) {
// 获取检查项list
EquPlanDetail selectDetail = new EquPlanDetail();
selectDetail.setParentCode(equipment.getCode());
selectDetail.setPlanCode(equPlan.getPlanCode());
List<EquPlanDetail> detailList = equPlanDetailMapper.selectEquPlanDetailList(selectDetail);
List<EquPlanDetail> detailList = equPlanDetailMapper.selectEquPlanDetailListByParentCode(equipment.getId());
for (EquPlanDetail detail : detailList) {
// 获取标准list
EquPlanStandard selectStandard = new EquPlanStandard();
selectStandard.setParentCode(detail.getCode());
selectStandard.setPlanCode(equPlan.getPlanCode());
List<EquPlanStandard> standardList = equPlanStandardMapper.selectEquPlanStandardList(selectStandard);
List<EquPlanStandard> standardList = equPlanStandardMapper.selectEquPlanStandardListByParentCode(detail.getId());
for (EquPlanStandard standard : standardList) {
standard.setShowFlag(true);
}
@ -365,9 +365,14 @@ public class EquPlanServiceImpl implements IEquPlanService {
equipment.setEquPlanDetailList(detailList);
EquPlanEquSpare spare = new EquPlanEquSpare();
spare.setParentCode(equipment.getCode());
spare.setParentCode(equipment.getId());
// 备件信息
List<EquPlanEquSpare> spareList = equPlanEquSpareMapper.selectEquPlanEquSpareList(spare);
if (spareList.size() > 0) {
for (EquPlanEquSpare equSpare : spareList) {
// 通过备件编码查询备件库存信息(总量-冻结)
equSpare.setAmount(sparePartsLedgerMapper.selectRealAmountByMaterialCode(equSpare.getMaterialCode()));
}
equipment.setSpareList(spareList);
}
@ -408,14 +413,10 @@ public class EquPlanServiceImpl implements IEquPlanService {
// 处理计划1-n设备信息
List<EquPlanEqu> equipmentItemList = equPlan.getEquipmentItem();
// 计划-设备流水号
int equipmentCodeTemp = 0;
for (EquPlanEqu equipment : equipmentItemList) {
equipment.setId(IdUtils.fastSimpleUUID());
equipment.setPlanCode(equPlan.getPlanCode());
equipment.setCode("E" + equPlan.getPlanCode() + String.format("%02d", ++equipmentCodeTemp));
equipment.setParentCode(equPlan.getPlanCode());
equipment.setParentCode(equPlan.getPlanId());
equipment.setFactoryCode(factory);
equipment.setCreateBy(SecurityContextHolder.getUserName());
equipment.setCreateTime(DateUtils.getNowDate());
@ -425,16 +426,13 @@ public class EquPlanServiceImpl implements IEquPlanService {
// 处理检查项信息
List<EquPlanDetail> detailList = equipment.getEquPlanDetailList();
if (detailList != null) {
// 计划检查项流水号
int itemCodeTemp = 0;
for (EquPlanDetail item : detailList) {
if (item != null) {
item.setId(IdUtils.fastSimpleUUID());
item.setPlanCode(equPlan.getPlanCode());
item.setCode("C" + equPlan.getPlanCode() + String.format("%02d", ++itemCodeTemp));
item.setParentCode(equipment.getCode());
item.setParentCode(equipment.getId());
item.setCreateBy(SecurityContextHolder.getUserName());
item.setCreateTime(DateUtils.getNowDate());
item.setUpdateBy(SecurityContextHolder.getUserName());
@ -443,9 +441,6 @@ public class EquPlanServiceImpl implements IEquPlanService {
// 处理标准
List<EquPlanStandard> standardList = item.getEquPlanStandardList();
// 检查项详情流水号
int detailCodeTemp = 0;
// 判断是否插入检查项
boolean checkInsert = false;
@ -456,9 +451,8 @@ public class EquPlanServiceImpl implements IEquPlanService {
checkInsert = true;
standard.setId(IdUtils.fastSimpleUUID());
standard.setParentCode(item.getCode());
standard.setParentCode(item.getId());
standard.setPlanCode(equPlan.getPlanCode());
standard.setCode("D" + equPlan.getPlanCode() + String.format("%02d", ++detailCodeTemp));
standard.setCreateBy(SecurityContextHolder.getUserName());
standard.setCreateTime(DateUtils.getNowDate());
standard.setUpdateBy(SecurityContextHolder.getUserName());

73
op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java
Unescape Escape View File

@ -1,22 +1,21 @@
package com.op.device.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.domain.BaseFileData;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquOutsourceWork;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.mapper.EquEquipmentMapper;
import com.op.device.mapper.EquOutsourceWorkMapper;
import com.op.device.mapper.EquRepairWorkOrderMapper;
import com.op.device.domain.*;
import com.op.device.mapper.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.device.mapper.EquRepairOrderMapper;
import com.op.device.domain.EquRepairOrder;
import com.op.device.service.IEquRepairOrderService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@ -41,6 +40,9 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
@Autowired
private EquOutsourceWorkMapper equOutsourceWorkMapper;
@Autowired
private EquFileMapper equFileMapper;
/**
* 查询故障报修
*
@ -50,7 +52,12 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
@Override
@DS("#header.poolName")
public EquRepairOrder selectEquRepairOrderByOrderId(String orderId) {
return equRepairOrderMapper.selectEquRepairOrderByOrderId(orderId);
EquRepairOrder list = equRepairOrderMapper.selectEquRepairOrderByOrderId(orderId);
List<EquFile> files = equFileMapper.getEquFileBatch(orderId);
if (!CollectionUtils.isEmpty(files)) {
list.setFiles(files);
}
return list;
}
/**
@ -83,9 +90,28 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
equRepairOrder.setCreateTime(DateUtils.getNowDate());
equRepairOrder.setCreateBy(SecurityUtils.getUsername());
equRepairOrder.setOrderStatus("待审核");
// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
// String key = "#header.poolName";
// equRepairOrder.setFactory(request.getHeader(key.substring(8)).replace("ds_",""));
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
//设备报修上传图片
if (StringUtils.isNotEmpty(equRepairOrder.getFileList())) {
String[] ids = equRepairOrder.getFileList().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(equRepairOrder.getOrderId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
files.add(file);
}
equFileMapper.insertEquFileBatch(files);
}
return equRepairOrderMapper.insertEquRepairOrder(equRepairOrder);
}
@ -112,6 +138,8 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
//不委外
equRepairWorkOrder.setWorkOutsource("0");
equRepairWorkOrder.setOutWorkCode("无");
//是否立即维修 1是 0 否
equRepairWorkOrder.setWorkHandle("0");
//计划维修时间
equRepairWorkOrder.setWorkPlanTime(equRepairOrder.getWorkPlanTime());
//是否停机维修 停机维修时间
@ -157,6 +185,9 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
equRepairOrder.setOrderStatus("审核通过");
}else if(equRepairOrder.getRepairDestination().equals("立即维修")){
//立即维修
//是否立即维修 1是 0 否
EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
equRepairWorkOrder.setWorkHandle("0");
equRepairOrder.setOrderStatus("审核通过");
}
equRepairOrder.setUpdateTime(DateUtils.getNowDate());
@ -173,6 +204,24 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
@Override
@DS("#header.poolName")
public int updateEquRepairOrder(EquRepairOrder equRepairOrder) {
equFileMapper.deleteEquFileBySourceId(equRepairOrder.getOrderId());
//上传附件
if (StringUtils.isNotEmpty(equRepairOrder.getFileList())) {
String[] ids = equRepairOrder.getFileList().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileAddress(id);
file.setFileName(id.split("&fileName=")[1]);
file.setSourceId(equRepairOrder.getOrderId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
files.add(file);
}
equFileMapper.insertEquFileBatch(files);
}
equRepairOrder.setUpdateTime(DateUtils.getNowDate());
equRepairOrder.setUpdateBy(SecurityUtils.getUsername());
return equRepairOrderMapper.updateEquRepairOrder(equRepairOrder);

7
op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java
Unescape Escape View File

@ -7,8 +7,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquOutsourceWork;
import com.op.device.domain.EquTeamUser;
import com.op.device.mapper.EquOutsourceWorkMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -90,7 +90,6 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
//维修单号
equRepairWorkOrder.setOrderCode("无");
equRepairWorkOrder.setOutWorkCode("无");
equRepairWorkOrder.setWorkStatus("待维修");
equRepairWorkOrder.setWorkCode("WX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
equRepairWorkOrder.setCreateBy(SecurityUtils.getUsername());
equRepairWorkOrder.setCreateTime(DateUtils.getNowDate());
@ -144,8 +143,8 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
//获取维人员列表
@Override
public List<EquEquipment> getMaintenancePersonList(EquEquipment equEquipment) {
return equRepairWorkOrderMapper.getMaintenancePersonList(equEquipment);
public List<EquTeamUser> getMaintenancePersonList(EquTeamUser equTeamUser) {
return equRepairWorkOrderMapper.getMaintenancePersonList(equTeamUser);
}
//委外申请

18
op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java
Unescape Escape View File

@ -7,11 +7,16 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.EquRepairWorkOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.device.mapper.EquSpareApplyMapper;
import com.op.device.domain.EquSpareApply;
import com.op.device.service.IEquSpareApplyService;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* 申领记录Service业务层处理
@ -66,6 +71,10 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
@DS("#header.poolName")
public int insertEquSpareApply(EquSpareApply equSpareApply) {
equSpareApply.setApplyId(IdUtils.fastSimpleUUID());
//工厂号
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
equSpareApply.setCreateTime(DateUtils.getNowDate());
equSpareApply.setCreateBy(SecurityUtils.getUsername());
return equSpareApplyMapper.insertEquSpareApply(equSpareApply);
@ -108,4 +117,13 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
public int deleteEquSpareApplyByApplyId(String applyId) {
return equSpareApplyMapper.deleteEquSpareApplyByApplyId(applyId);
}
/**
* 查询维修单对应的申领记录列表
*/
@Override
@DS("#header.poolName")
public List<EquSpareApply> selectRepairSparePartsRecord(EquRepairWorkOrder equRepairWorkOrder) {
return equSpareApplyMapper.selectRepairSparePartsRecord(equRepairWorkOrder);
}
}

100
op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java
Unescape Escape View File

@ -1,16 +1,29 @@
package com.op.device.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.EquTeamUser;
import com.op.device.mapper.EquTeamUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.device.mapper.EquTeamMapper;
import com.op.device.domain.EquTeam;
import com.op.device.service.IEquTeamService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import com.op.common.core.web.domain.AjaxResult;
import javax.servlet.http.HttpServletRequest;
import static com.op.common.core.web.domain.AjaxResult.error;
import static com.op.common.core.web.domain.AjaxResult.success;
/**
* 设备班组维护Service业务层处理
@ -22,6 +35,8 @@ import com.op.device.service.IEquTeamService;
public class EquTeamServiceImpl implements IEquTeamService {
@Autowired
private EquTeamMapper equTeamMapper;
@Autowired
private EquTeamUserMapper equTeamUserMapper;
/**
* 查询设备班组维护
@ -32,6 +47,11 @@ public class EquTeamServiceImpl implements IEquTeamService {
@Override
@DS("#header.poolName")
public EquTeam selectEquTeamById(String id) {
EquTeamUser equTeamUser = new EquTeamUser();
equTeamUser.setTeamId(id);
List<EquTeamUser> equTeamUser1 = equTeamUserMapper.selectEquTeamUserList(equTeamUser);
EquTeam equTeam = equTeamMapper.selectEquTeamById(id);
equTeam.setSelectedData(equTeamUser1);
return equTeamMapper.selectEquTeamById(id);
}
@ -54,12 +74,40 @@ public class EquTeamServiceImpl implements IEquTeamService {
* @return 结果
*/
@Override
@Transactional
@DS("#header.poolName")
public int insertEquTeam(EquTeam equTeam) {
equTeam.setId(IdUtils.fastSimpleUUID());
equTeam.setCreateTime(DateUtils.getNowDate());
equTeam.setCreateBy(SecurityUtils.getUsername());
return equTeamMapper.insertEquTeam(equTeam);
public AjaxResult insertEquTeam(EquTeam equTeam) {
try{
equTeam.setId(IdUtils.fastSimpleUUID());
equTeam.setCreateTime(DateUtils.getNowDate());
equTeam.setCreateBy(SecurityUtils.getUsername());
//工厂号
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equTeam.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
equTeamMapper.insertEquTeam(equTeam);
//新增设备班组人员信息
String teamId = equTeam.getId();
for(int i = 0 ; i < equTeam.getRightData().size() ; i++){
EquTeamUser equTeamUser = new EquTeamUser();
equTeamUser.setCreateBy(SecurityUtils.getUsername());
equTeamUser.setCreateTime(DateUtils.getNowDate());
equTeamUser.setTeamId(teamId);
equTeamUser.setTeamCode(equTeam.getTeamCode());
equTeamUser.setId(IdUtils.fastSimpleUUID());
List<String> list = new ArrayList<>();
list = equTeam.getRightData();
String userId = list.get(i);
equTeamUser.setUserId(userId);
EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser);
equTeamUser.setUserName(memberList.getUserName());
equTeamUser.setNickName(memberList.getNickName());
equTeamUserMapper.insertEquTeamUser(equTeamUser);
}
return success("新增设备班组成功！");
}catch (Exception e) {
return error();
}
}
/**
@ -70,10 +118,32 @@ public class EquTeamServiceImpl implements IEquTeamService {
*/
@Override
@DS("#header.poolName")
public int updateEquTeam(EquTeam equTeam) {
equTeam.setUpdateTime(DateUtils.getNowDate());
equTeam.setUpdateBy(SecurityUtils.getUsername());
return equTeamMapper.updateEquTeam(equTeam);
@Transactional
public AjaxResult updateEquTeam(EquTeam equTeam) {
try{
equTeam.setUpdateTime(DateUtils.getNowDate());
equTeam.setUpdateBy(SecurityUtils.getUsername());
equTeamMapper.updateEquTeam(equTeam);
for(int i = 0;i<equTeam.getRightData().size();i++){
EquTeamUser equTeamUser = new EquTeamUser();
equTeamUser.setCreateBy(SecurityUtils.getUsername());
equTeamUser.setCreateTime(DateUtils.getNowDate());
equTeamUser.setTeamId(equTeam.getId());
equTeamUser.setTeamCode(equTeam.getTeamCode());
equTeamUser.setId(IdUtils.fastSimpleUUID());
List<String> list = new ArrayList<>();
list = equTeam.getRightData();
String userId = list.get(i);
equTeamUser.setUserId(userId);
String userName = equTeamUserMapper.selectUserName(equTeamUser);
//判断班组人员有没有变动 挨个遍历
equTeamUser.setUserName(userName);
equTeamUserMapper.insertEquTeamUser(equTeamUser);
}
return success("修改设备班组成功！");
}catch (Exception e) {
return error();
}
}
/**
@ -108,4 +178,16 @@ public class EquTeamServiceImpl implements IEquTeamService {
public List<EquTeam> getMaintenanceTeamList(EquTeam equTeam) {
return equTeamMapper.getMaintenanceTeamList(equTeam);
}
/**
* 查询所有人员列表
*
* @param equTeamUser 班组人员
* @return 班组人员
*/
@Override
@DS("#master")
public List<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser){
return equTeamMapper.selectTeamMembers(equTeamUser);
}
}

40
op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java
Unescape Escape View File

@ -6,6 +6,7 @@ import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.*;
import com.op.device.domain.dto.UpKeepOrderDTO;
import com.op.device.mapper.*;
import com.op.device.service.IEquUpkeepOrderService;
import com.op.system.api.domain.SysUser;
@ -110,8 +111,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
EquPlanEqu equPlanEqu = equPlanEquList.get(0);
BeanUtils.copyProperties(equPlanEqu,equ);
equ.setId(IdUtils.fastSimpleUUID());
equ.setCode("E"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+"001");
equ.setParentCode(equOrder.getOrderCode());
equ.setParentCode(equOrder.getOrderId());
equ.setOrderCode(equOrder.getOrderCode());
equ.setFactoryCode(factory);
equ.setAttr1("");
@ -121,14 +121,12 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
// 生成工单-备件
List<EquOrderEquSpare> spareList = new ArrayList<>();
List<EquPlanEquSpare> equSpareList = equPlanEqu.getSpareList();
int spareSerialNum = 0;
for (EquPlanEquSpare spare : equSpareList) {
EquOrderEquSpare spareTemp = new EquOrderEquSpare();
BeanUtils.copyProperties(spare,spareTemp);
spareTemp.setId(IdUtils.fastSimpleUUID());
spareTemp.setCode("S"+equOrder.getOrderCode()+String.format("%03d",++spareSerialNum));
spareTemp.setOrderCode(equOrder.getOrderCode());
spareTemp.setParentCode(equ.getCode());
spareTemp.setParentCode(equ.getId());
spareTemp.setFactoryCode(factory);
spareTemp.setCreateBy(SecurityContextHolder.getUserName());
spareTemp.setCreateTime(DateUtils.getNowDate());
@ -143,16 +141,14 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
// 生成工单-设备-保养项
List<EquPlanDetail> detailList = equPlanEqu.getEquPlanDetailList();
int detailSerialNum = 0;
for (EquPlanDetail detail : detailList) {
EquOrderDetail equOrderDetail = new EquOrderDetail();
List<EquOrderStandard> orderStandardList = new ArrayList<>();
List<EquPlanStandard> standardList = detail.getEquPlanStandardList();
BeanUtils.copyProperties(detail,equOrderDetail);
equOrderDetail.setId(IdUtils.fastSimpleUUID());
equOrderDetail.setCode("C"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+String.format("%03d",++detailSerialNum));
equOrderDetail.setOrderCode(equOrder.getOrderCode());
equOrderDetail.setParentCode(equ.getCode());
equOrderDetail.setParentCode(equ.getId());
equOrderDetail.setFactroyCode(factory);
equOrderDetail.setStandardList(orderStandardList);
equOrderDetail.setCreateBy(SecurityContextHolder.getUserName());
@ -162,13 +158,11 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
// 插入检查项信息
equOrderDetailMapper.insertEquOrderDetail(equOrderDetail);
int standardSerialNum = 0;
for (EquPlanStandard standard : standardList) {
EquOrderStandard orderStandard = new EquOrderStandard();
BeanUtils.copyProperties(standard,orderStandard);
orderStandard.setId(IdUtils.fastSimpleUUID());
orderStandard.setCode("S"+equOrder.getOrderCode()+String.format("%03d",++standardSerialNum));
orderStandard.setParentCode(equOrderDetail.getCode());
orderStandard.setParentCode(equOrderDetail.getId());
orderStandard.setOrderCode(equOrder.getOrderCode());
orderStandard.setCreateBy(SecurityContextHolder.getUserName());
orderStandard.setCreateTime(DateUtils.getNowDate());
@ -184,7 +178,6 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
for (SysUser user : personList) {
EquOrderPerson equOrderPerson = new EquOrderPerson();
equOrderPerson.setId(IdUtils.fastSimpleUUID());
// TODO 要改变编码格式
equOrderPerson.setOrderCode(equOrder.getOrderCode());
equOrderPerson.setFactoryCode(factory);
equOrderPerson.setUserId(user.getUserId());
@ -207,9 +200,8 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
*/
@Override
@DS("#header.poolName")
public int updateEquOrder(EquOrder equOrder) {
equOrder.setUpdateTime(DateUtils.getNowDate());
return equOrderMapper.updateEquOrder(equOrder);
public AjaxResult updateEquOrder(EquOrder equOrder) {
return success();
}
/**
@ -235,4 +227,22 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
public int deleteEquOrderByOrderId(String orderId) {
return equOrderMapper.deleteEquOrderByOrderId(orderId);
}
/**
* 保养工单检验
* @param upKeepOrderDTO
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult subInspect(UpKeepOrderDTO upKeepOrderDTO) {
List<String> ids = upKeepOrderDTO.getIds();
for (String id : ids){
EquOrder order = new EquOrder();
order.setOrderId(id);
order.setOrderInspect(upKeepOrderDTO.getInspect());
equOrderMapper.updateEquOrder(order);
}
return success();
}
}

15
op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java
Unescape Escape View File

@ -247,7 +247,7 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
equipment.setId(IdUtils.fastSimpleUUID());
equipment.setPlanCode(equPlan.getPlanCode());
equipment.setCode("E" + equPlan.getPlanCode() + String.format("%02d", ++equipmentCodeTemp));
equipment.setParentCode(equPlan.getPlanCode());
equipment.setParentCode(equPlan.getPlanId());
equipment.setFactoryCode(factory);
equipment.setCreateBy(SecurityContextHolder.getUserName());
equipment.setCreateTime(DateUtils.getNowDate());
@ -265,8 +265,8 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
if (item != null) {
item.setId(IdUtils.fastSimpleUUID());
item.setPlanCode(equPlan.getPlanCode());
item.setCode("C" + equPlan.getPlanCode() + String.format("%02d", ++itemCodeTemp));
item.setParentCode(equipment.getCode());
item.setCode("C" + equipment.getCode() + String.format("%02d", ++itemCodeTemp));
item.setParentCode(equipment.getId());
item.setCreateBy(SecurityContextHolder.getUserName());
item.setCreateTime(DateUtils.getNowDate());
item.setUpdateBy(SecurityContextHolder.getUserName());
@ -275,9 +275,6 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
// 处理标准
List<EquPlanStandard> standardList = item.getEquPlanStandardList();
// 检查项详情流水号
int detailCodeTemp = 0;
// 判断是否插入检查项
boolean checkInsert = false;
@ -288,9 +285,8 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
checkInsert = true;
standard.setId(IdUtils.fastSimpleUUID());
standard.setParentCode(item.getCode());
standard.setParentCode(item.getId());
standard.setPlanCode(equPlan.getPlanCode());
standard.setCode("D" + equPlan.getPlanCode() + String.format("%02d", ++detailCodeTemp));
standard.setCreateBy(SecurityContextHolder.getUserName());
standard.setCreateTime(DateUtils.getNowDate());
standard.setUpdateBy(SecurityContextHolder.getUserName());
@ -321,9 +317,8 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
if (spareList != null) {
for (EquPlanEquSpare spare : spareList) {
spare.setId(IdUtils.fastSimpleUUID());
spare.setCode("S" + equPlan.getPlanCode() + String.format("%02d", ++spareCodeTemp));
spare.setPlanCode(equPlan.getPlanCode());
spare.setParentCode(equipment.getCode());
spare.setParentCode(equipment.getId());
spare.setFactoryCode(factory);
spare.setCreateBy(SecurityContextHolder.getUserName());
spare.setCreateTime(DateUtils.getNowDate());

159
op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java
Unescape Escape View File

@ -0,0 +1,159 @@
package com.op.device.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.*;
import com.op.device.domain.vo.InspectionWorkVO;
import com.op.device.mapper.*;
import com.op.device.service.IInspectionWorkService;
import java.util.List;
import com.op.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.device.service.IEquOrderService;
import static com.op.common.core.web.domain.AjaxResult.success;
/**
* 巡检记录Service业务层处理
*
* @author wws
* @date 2023-11-07
*/
@Service
public class InspectionWorkServiceImpl implements IInspectionWorkService {
@Autowired
private EquOrderMapper equOrderMapper;
@Autowired
private EquipmentMapper equipmentMapper;
@Autowired
private EquOrderDetailMapper equOrderDetailMapper;
@Autowired
private EquOrderStandardMapper equOrderStandardMapper;
@Autowired
private EquPlanMapper equPlanMapper;
@Autowired
private EquOrderEquSpareMapper equOrderEquSpareMapper;
@Autowired
private EquOrderEquMapper equOrderEquMapper;
/**
* 查询巡检记录
*
* @param orderId 巡检记录主键
* @return 巡检记录
*/
@Override
@DS("#header.poolName")
public AjaxResult selectEquOrderByOrderId(String orderId) {
InspectionWorkVO workVO = new InspectionWorkVO();
// 查询工单信息
EquOrder order = equOrderMapper.selectEquOrderByOrderId(orderId);
// 设置计划名称
EquPlan equPlan = equPlanMapper.selectEquPlanByPlanCode(order.getPlanCode());
if (equPlan != null) {
order.setPlanName(equPlan.getPlanName());
}
// 查询备件信息
List<EquOrderEquSpare> spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode());
// 替换循环周期
order.setPlanLoopType(equOrderMapper.changeLoopType(order.getPlanLoopType()));
Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId()).getEquipmentCode());
// 查询检查项、标准
List<EquOrderDetail> detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode());
for (EquOrderDetail detail : detailList) {
List<EquOrderStandard> standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId());
for (EquOrderStandard standard : standardList) {
if (standard.getStandardType().equals("quantify")){
standard.setStandardTypeName("定量");
}else {
standard.setStandardTypeName("定性");
}
if (standard.getDetailReach() != null) {
if (standard.getDetailReach().equals("0")){
standard.setDetailReach("未达标");
}else {
standard.setDetailReach("达标");
}
}
}
detail.setStandardList(standardList);
}
workVO.setSpareList(spareList);
workVO.setOrder(order);
workVO.setEqu(equipment);
workVO.setDetailList(detailList);
return success(workVO);
}
/**
* 查询巡检记录列表
*
* @param equOrder 巡检记录
* @return 巡检记录
*/
@Override
@DS("#header.poolName")
public List<EquOrder> selectEquOrderList(EquOrder equOrder) {
return equOrderMapper.selectEquOrderList(equOrder);
}
/**
* 新增巡检记录
*
* @param equOrder 巡检记录
* @return 结果
*/
@Override
@DS("#header.poolName")
public int insertEquOrder(EquOrder equOrder) {
equOrder.setCreateTime(DateUtils.getNowDate());
return equOrderMapper.insertEquOrder(equOrder);
}
/**
* 修改巡检记录
*
* @param equOrder 巡检记录
* @return 结果
*/
@Override
@DS("#header.poolName")
public int updateEquOrder(EquOrder equOrder) {
equOrder.setUpdateTime(DateUtils.getNowDate());
return equOrderMapper.updateEquOrder(equOrder);
}
/**
* 批量删除巡检记录
*
* @param orderIds 需要删除的巡检记录主键
* @return 结果
*/
@Override
@DS("#header.poolName")
public int deleteEquOrderByOrderIds(String[] orderIds) {
return equOrderMapper.deleteEquOrderByOrderIds(orderIds);
}
/**
* 删除巡检记录信息
*
* @param orderId 巡检记录主键
* @return 结果
*/
@Override
@DS("#header.poolName")
public int deleteEquOrderByOrderId(String orderId) {
return equOrderMapper.deleteEquOrderByOrderId(orderId);
}
}

4
op-modules/op-device/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

33
op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml
Unescape Escape View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.device.mapper.DeviceTaskMapper">
<select id="getPlans" resultType="com.op.device.domain.EquPlan">
select ep.plan_code planCode,
ep.plan_name planName,
ep.plan_loop planLoop,
ep.plan_loop_type planLoopType,
ep.plan_loop_start planLoopStart,
ep.plan_loop_end planLoopEnd,
ep.plan_restrict planRestrict,
ep.plan_type planType,
ep.plan_outsource planOutsource,
epe.equipment_code equipmentCode,
epe.equipment_name equipmentName
from equ_plan ep
left join equ_plan_equ epe on ep.plan_code = epe.plan_code
where ep.del_flag = '0' and epe.del_flag = '0' and ep.plan_status = '0'
and ep.plan_type = #{planType}
and CONVERT(varchar(10),GETDATE(), 120) >= CONVERT(varchar(10),ep.plan_loop_start, 120)
</select>
<select id="getNewTaskOrder" resultType="com.op.device.domain.EquOrder">
select top 1 order_code orderCode,
create_time createTime,
DATEDIFF (day, create_time, GETDATE()) days
from equ_order
where plan_type = #{planType}
order by create_time desc
</select>
</mapper>

157
op-modules/op-device/src/main/resources/mapper/device/EquFileMapper.xml
Unescape Escape View File

@ -0,0 +1,157 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.device.mapper.EquFileMapper">
<resultMap type="EquFile" id="EquFileResult">
<result property="fileId" column="file_id" />
<result property="fileName" column="file_name" />
<result property="fileAddress" column="file_address" />
<result property="sourceId" column="source_id" />
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="imageType" column="image_type" />
</resultMap>
<sql id="selectEquFileVo">
select file_id, file_name, file_address, source_id, remark, attr1,
attr2, attr3, attr4, create_by, create_time, update_by,
update_time,image_type from base_file
</sql>
<select id="selectEquFileList" parameterType="EquFile" resultMap="EquFileResult">
<include refid="selectEquFileVo"/>
<where>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileAddress != null and fileAddress != ''"> and file_address = #{fileAddress}</if>
<if test="sourceId != null and sourceId != ''"> and source_id = #{sourceId}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null "> and attr3 = #{attr3}</if>
<if test="attr4 != null "> and attr4 = #{attr4}</if>
<if test="imageType != null "> and image_type = #{imageType}</if>
</where>
</select>
<select id="selectEquFileByFileId" parameterType="String" resultMap="EquFileResult">
<include refid="selectEquFileVo"/>
where file_id = #{fileId}
</select>
<select id="getEquFileBatch" resultMap="EquFileResult">
<include refid="selectEquFileVo"/>
where source_id = #{sourceId}
</select>
<select id="getImageFileBatch" resultMap="EquFileResult">
<include refid="selectEquFileVo"/>
where source_id = #{sourceId}
and image_type = #{imageType}
</select>
<select id="getQrFileBatch" resultMap="EquFileResult">
<include refid="selectEquFileVo"/>
where source_id = #{sourceId}
and image_type = #{imageType}
</select>
<select id="getBarcodeFileBatch" resultMap="EquFileResult">
<include refid="selectEquFileVo"/>
where source_id = #{sourceId}
and image_type = #{imageType}
</select>
<insert id="insertEquFile" parameterType="EquFile">
insert into base_file
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fileId != null">file_id,</if>
<if test="fileName != null">file_name,</if>
<if test="fileAddress != null">file_address,</if>
<if test="sourceId != null">source_id,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="imageType != null">image_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fileId != null">#{fileId},</if>
<if test="fileName != null">#{fileName},</if>
<if test="fileAddress != null">#{fileAddress},</if>
<if test="sourceId != null">#{sourceId},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="imageType != null">{imageType},</if>
</trim>
</insert>
<insert id="insertEquFileBatch">
INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time)
VALUES
<foreach collection="baseFiles" index="" item="baseFile" separator=",">
(
#{baseFile.fileId},
#{baseFile.fileName},
#{baseFile.fileAddress},
#{baseFile.sourceId},
#{baseFile.remark},
#{baseFile.createBy},
#{baseFile.createTime}
)
</foreach>
</insert>
<update id="updateEquFile" parameterType="EquFile">
update base_file
<trim prefix="SET" suffixOverrides=",">
<if test="fileName != null">file_name = #{fileName},</if>
<if test="fileAddress != null">file_address = #{fileAddress},</if>
<if test="sourceId != null">source_id = #{sourceId},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where file_id = #{fileId}
</update>
<delete id="deleteEquFileByFileId" parameterType="String">
delete from base_file where file_id = #{fileId}
</delete>
<delete id="deleteEquFileByFileIds" parameterType="String">
delete from base_file where file_id in
<foreach item="fileId" collection="array" open="(" separator="," close=")">
#{fileId}
</foreach>
</delete>
<delete id="deleteEquFileBySourceId">
delete from base_file where source_id = #{sourceId}
</delete>
</mapper>

10
op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml
Unescape Escape View File

@ -44,17 +44,23 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
and del_flag = '0'
</where>
</select>
<select id="selectEquOrderDetailById" parameterType="String" resultMap="EquOrderDetailResult">
<include refid="selectEquOrderDetailVo"/>
where id = #{id}
where id = #{id} and del_flag = '0'
</select>
<select id="selectEquOrderDetailByParentCode" parameterType="String" resultMap="EquOrderDetailResult">
<include refid="selectEquOrderDetailVo"/>
where parent_code = #{parentCode}
where parent_code = #{parentCode} and del_flag = '0'
</select>
<select id="selectEquOrderDetailByOrderCode" parameterType="String" resultMap="EquOrderDetailResult">
<include refid="selectEquOrderDetailVo"/>
where order_code = #{orderCode} and del_flag = '0'
</select>
<insert id="insertEquOrderDetail" parameterType="EquOrderDetail">

7
op-modules/op-device/src/main/resources/mapper/device/EquOrderEquMapper.xml
Unescape Escape View File

@ -38,17 +38,18 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
and del_flag = '0'
</where>
</select>
<select id="selectEquOrderEquById" parameterType="String" resultMap="EquOrderEquResult">
<include refid="selectEquOrderEquVo"/>
where id = #{id}
where id = #{id} and del_flag = '0'
</select>
<select id="selectEquOrderEquListByParentCode" parameterType="String" resultMap="EquOrderEquResult">
<include refid="selectEquOrderEquVo"/>
where parent_code = #{parentCode}
where parent_code = #{parentCode} and del_flag = '0'
</select>
<insert id="insertEquOrderEqu" parameterType="EquOrderEqu">
@ -107,7 +108,7 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
where id = #{id} and del_flag = '0'
</update>
<delete id="deleteEquOrderEquById" parameterType="String">

15
op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml
Unescape Escape View File

@ -42,12 +42,23 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
and del_flag = '0'
</where>
</select>
<select id="selectEquOrderEquSpareById" parameterType="String" resultMap="EquOrderEquSpareResult">
<include refid="selectEquOrderEquSpareVo"/>
where id = #{id}
where id = #{id} and del_flag = '0'
</select>
<select id="selectEquOrderEquSpareByParentCode" parameterType="String" resultMap="EquOrderEquSpareResult">
<include refid="selectEquOrderEquSpareVo"/>
where parent_code = #{parentCode} and del_flag = '0'
</select>
<select id="selectEquOrderEquSpareByOrderCode" parameterType="String" resultMap="EquOrderEquSpareResult">
<include refid="selectEquOrderEquSpareVo"/>
where order_code = #{orderCode} and del_flag = '0'
</select>
<insert id="insertEquOrderEquSpare" parameterType="EquOrderEquSpare">
@ -112,7 +123,7 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
where id = #{id} and del_flag = '0'
</update>
<delete id="deleteEquOrderEquSpareById" parameterType="String">

69
op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
Unescape Escape View File

@ -36,10 +36,13 @@
<result property="upkeep" column="upkeep" />
<result property="calculationRule" column="calculation_rule" />
<result property="shutDown" column="shut_down" />
<result property="orderInspect" column="order_inspect" />
<result property="repairCode" column="repair_code" />
<result property="workCode" column="work_code" />
</resultMap>
<sql id="selectEquOrderVo">
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, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,upkeep,calculation_rule,shut_down from equ_order
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, 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 from equ_order
</sql>
<select id="selectEquOrderList" parameterType="EquOrder" resultMap="EquOrderResult">
@ -57,7 +60,6 @@
<if test="planLoopEnd != null "> and plan_loop_end = #{planLoopEnd}</if>
<if test="orderStart != null "> and order_start = #{orderStart}</if>
<if test="orderEnd != null "> and order_end = #{orderEnd}</if>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
<if test="orderCost != null "> and order_cost = #{orderCost}</if>
<if test="planPerson != null and planPerson != ''"> and plan_person like concat('%', #{planPerson}, '%')</if>
@ -69,19 +71,30 @@
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="createTime != null "> and CONVERT(date,create_time) = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="updateTime != null "> and CONVERT(date,update_time) = #{updateTime}</if>
<if test="upkeep != null "> and upkeep = #{upkeep}</if>
<if test="calculationRule != null "> and calculation_rule = #{calculationRule}</if>
<if test="shutDown != null "> and shut_down = #{shutDown}</if>
<if test="orderInspect != null "> and order_inspect = #{orderInspect}</if>
<if test="repairCode != null "> and repair_code = #{repairCode}</if>
<if test="workCode != null "> and work_code = #{workCode}</if>
and del_flag = '0'
<if test="(equipmentCode != null and equipmentCode != '') or (equipmentName != null and equipmentName != '')">
and order_code in (
select order_code from equ_order_equ
where equ_order.order_code = equ_order_equ.order_code
<if test="equipmentCode != null and equipmentCode != ''">and equ_order_equ.equipment_code like concat('%', #{equipmentCode}, '%')</if>
<if test="equipmentName != null and equipmentName != ''">and equ_order_equ.equipment_name like concat('%', #{equipmentName}, '%')</if>
)
</if>
</where>
</select>
<select id="selectEquOrderByOrderCode" parameterType="String" resultMap="EquOrderResult">
<include refid="selectEquOrderVo"/>
where order_code = #{orderCode}
where order_code = #{orderCode} and del_flag = '0'
</select>
<select id="selectPlanNameByPlanCode" resultType="java.lang.String">
@ -92,23 +105,9 @@
select top 1 workshop_name from base_equipment where del_flag = '0' and workshop_code = #{planWorkshop}
</select>
<select id="selectTodayTask" resultType="java.lang.Integer" resultMap="EquOrderResult">
<include refid="selectEquOrderVo"/>
where CONVERT(date,GETDATE()) > plan_loop_start and plan_type = 'inspection' and del_flag = '0' and order_status != '1' and order_code in (
select order_code from equ_order_person where del_flag = '0' and user_id = #{userId} GROUP BY order_code
)
</select>
<select id="selectTaskRecord" resultType="java.lang.Integer" resultMap="EquOrderResult">
<include refid="selectEquOrderVo"/>
where del_flag = '0' and order_status = '1' and order_code in (
select order_code from equ_order_person where del_flag = '0' and user_id = '12' GROUP BY order_code
)
</select>
<select id="selectEquOrderByOrderId" parameterType="String" resultMap="EquOrderResult">
<include refid="selectEquOrderVo"/>
where order_id = #{orderId}
where order_id = #{orderId} and del_flag = '0'
</select>
<select id="selectSerialNumber" resultType="java.lang.Integer">
@ -117,7 +116,25 @@
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0'
</select>
<insert id="insertEquOrder" parameterType="EquOrder">
<select id="changeLoopType" resultType="java.lang.String">
select dict_label from sys_dict_data where dict_value = #{planLoopType}
</select>
<select id="selectTodayTask" parameterType="String" resultMap="EquOrderResult">
<include refid="selectEquOrderVo"/>
where CONVERT(date,GETDATE()) > plan_loop_start and plan_type = #{planType} and del_flag = '0' and order_status != '1' and order_code in (
select order_code from equ_order_person where del_flag = '0' and user_id = #{userId} GROUP BY order_code
)
</select>
<select id="selectTaskRecord" parameterType="String" resultMap="EquOrderResult">
<include refid="selectEquOrderVo"/>
where del_flag = '0' and order_status = '1' and plan_type = #{planType} and order_code in (
select order_code from equ_order_person where del_flag = '0' and user_id = #{userId} GROUP BY order_code
)
</select>
<insert id="insertEquOrder" parameterType="EquOrder">
insert into equ_order
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderId != null">order_id,</if>
@ -151,6 +168,10 @@
<if test="upkeep != null">upkeep,</if>
<if test="calculationRule != null">calculation_rule,</if>
<if test="shutDown != null">shut_down,</if>
<if test="orderInspect != null">order_inspect,</if>
<if test="repairCode != null">repair_code,</if>
<if test="repairCode != null">repair_code,</if>
<if test="workCode != null">work_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
@ -184,6 +205,9 @@
<if test="upkeep != null">#{upkeep},</if>
<if test="calculationRule != null">#{calculationRule},</if>
<if test="shutDown != null">#{shutDown},</if>
<if test="orderInspect != null">#{orderInspect},</if>
<if test="repairCode != null">#{repairCode},</if>
<if test="workCode != null">#{workCode},</if>
</trim>
</insert>
@ -220,6 +244,9 @@
<if test="upkeep != null">upkeep = #{upkeep},</if>
<if test="calculationRule != null">calculation_rule = #{calculationRule},</if>
<if test="shutDown != null">shut_down = #{shutDown},</if>
<if test="orderInspect != null">order_inspect = #{orderInspect},</if>
<if test="repairCode != null">repair_code = #{repairCode},</if>
<if test="workCode != null">work_code = #{workCode},</if>
</trim>
where order_id = #{orderId}
</update>

7
op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml
Unescape Escape View File

@ -34,16 +34,17 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
and del_flag = '0'
</where>
</select>
<select id="selectEquOrderPersonById" parameterType="String" resultMap="EquOrderPersonResult">
<include refid="selectEquOrderPersonVo"/>
where id = #{id}
where id = #{id} and del_flag = '0'
</select>
<select id="selectEquOrderPersonByOrderCode" resultType="java.lang.String">
SELECT user_id FROM equ_order_person where order_code = #{orderCode}
SELECT user_id FROM equ_order_person where order_code = #{orderCode} and del_flag = '0'
</select>
<insert id="insertEquOrderPerson" parameterType="EquOrderPerson">
@ -96,7 +97,7 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
where id = #{id} and del_flag = '0'
</update>
<delete id="deleteEquOrderPersonById" parameterType="String">

64
op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml
Unescape Escape View File

@ -26,11 +26,18 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="picturePath" column="picture_path" />
<result property="errorFlag" column="error_flag" />
<result property="faultType" column="fault_type" />
<result property="repairReach" column="repair_reach" />
<result property="repairValue" column="repair_value" />
<result property="repairPicture" column="repair_picture" />
<!-- 检查项检查方法-->
<result property="itemMethod" column="item_method" />
</resultMap>
<sql id="selectEquOrderStandardVo">
select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,picture_path from equ_order_standard
select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,error_flag,fault_type,repair_reach,repair_value,repair_picture from equ_order_standard
</sql>
<select id="selectEquOrderStandardList" parameterType="EquOrderStandard" resultMap="EquOrderStandardResult">
@ -51,18 +58,23 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="picturePath != null and picturePath != ''"> and picture_path = #{picturePath}</if>
<if test="errorFlag != null and errorFlag != ''"> and error_flag = #{errorFlag}</if>
<if test="faultType != null and faultType != ''"> and fault_type = #{faultType}</if>
<if test="repairReach != null and repairReach != ''"> and repair_reach = #{repairReach}</if>
<if test="repairValue != null and repairValue != ''"> and repair_value = #{repairValue}</if>
<if test="repairPicture != null and repairPicture != ''"> and repair_picture = #{repairPicture}</if>
and del_flag = '0'
</where>
</select>
<select id="selectEquOrderStandardById" parameterType="String" resultMap="EquOrderStandardResult">
<include refid="selectEquOrderStandardVo"/>
where id = #{id}
where id = #{id} and del_flag = '0'
</select>
<select id="selectEquOrderStandardByParentCode" parameterType="String" resultMap="EquOrderStandardResult">
<include refid="selectEquOrderStandardVo"/>
where parent_code = #{parentCode}
where parent_code = #{parentCode} and del_flag = '0'
</select>
<insert id="insertEquOrderStandard" parameterType="EquOrderStandard">
@ -89,7 +101,11 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="picturePath != null">picture_path,</if>
<if test="errorFlag != null">error_flag,</if>
<if test="faultType != null">fault_type,</if>
<if test="repairReach != null">repair_reach,</if>
<if test="repairValue != null">repair_value,</if>
<if test="repairPicture != null">repair_picture,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -113,7 +129,11 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="picturePath != null">#{picturePath},</if>
<if test="errorFlag != null">#{errorFlag},</if>
<if test="faultType != null">#{faultType},</if>
<if test="repairReach != null">#{repairReach},</if>
<if test="repairValue != null">#{repairValue},</if>
<if test="repairPicture != null">#{repairPicture},</if>
</trim>
</insert>
@ -156,9 +176,13 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="picturePath != null">picture_path = #{picturePath},</if>
<if test="errorFlag != null">error_flag = #{errorFlag},</if>
<if test="faultType != null">fault_type = #{faultType},</if>
<if test="repairReach != null">repair_reach = #{repairReach},</if>
<if test="repairValue != null">repair_value = #{repairValue},</if>
<if test="repairPicture != null">repair_picture = #{repairPicture},</if>
</trim>
where id = #{id}
where id = #{id} and del_flag = '0'
</update>
<delete id="deleteEquOrderStandardById" parameterType="String">
@ -171,4 +195,26 @@
#{id}
</foreach>
</delete>
<!--手持查询维修工单接口-->
<select id="selectPdaEquOrderList" parameterType="EquOrderStandard" resultMap="EquOrderStandardResult">
select
eos.id,
eos.order_code,
eos.standard_name,
eod.item_method,
eos.detail_up_limit,
eos.detail_down_limit,
eos.detail_unit,
eos.detail_reach,
eos.actual_value
from equ_order_standard eos
left join equ_order eo on eos.order_code = eo.order_code
left join equ_order_detail eod on eos.order_code = eod.order_code
<where>
<if test="workCode != null "> and eo.work_code = #{workCode}</if>
and eo.del_flag = '0'
and eos.error_flag = '1'
</where>
</select>
</mapper>

8
op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml
Unescape Escape View File

@ -175,11 +175,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteEquOutsourceWorkByWorkId" parameterType="String">
delete from equ_outsource_work where work_id = #{workId}
update equ_outsource_work
set del_flag = '1'
where work_id = #{workId}
</delete>
<delete id="deleteEquOutsourceWorkByWorkIds" parameterType="String">
delete from equ_outsource_work where work_id in
update equ_outsource_work
set del_flag = '1'
where work_id in
<foreach item="workId" collection="array" open="(" separator="," close=")">
#{workId}
</foreach>

13
op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml
Unescape Escape View File

@ -48,17 +48,24 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
and del_flag = '0'
</where>
ORDER BY item_name
</select>
<select id="selectEquPlanDetailById" parameterType="String" resultMap="EquPlanDetailResult">
<include refid="selectEquPlanDetailVo"/>
where id = #{id}
where id = #{id} and del_flag = '0'
</select>
<select id="selectEquPlanDetailByPlanCode" parameterType="String" resultMap="EquPlanDetailResult">
<include refid="selectEquPlanDetailVo"/>
where plan_code = #{planCode} and del_flag = '0'
where plan_code = #{planCode} and del_flag = '0' ORDER BY item_name
</select>
<select id="selectEquPlanDetailListByParentCode" parameterType="String" resultMap="EquPlanDetailResult">
<include refid="selectEquPlanDetailVo"/>
where parent_code = #{code} and del_flag = '0' ORDER BY item_name
</select>
<insert id="insertEquPlanDetail" parameterType="EquPlanDetail">
@ -132,7 +139,7 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
where id = #{id} and del_flag = '0'
</update>
<delete id="deleteEquPlanDetailById" parameterType="String">

2
op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml
Unescape Escape View File

@ -108,7 +108,7 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
where id = #{id} and del_flag = '0'
</update>
<delete id="deleteEquPlanEquById" parameterType="String">

5
op-modules/op-device/src/main/resources/mapper/device/EquPlanEquSpareMapper.xml
Unescape Escape View File

@ -129,4 +129,9 @@
<delete id="deleteEquPlanEquSpareByPlanCode">
delete from equ_plan_equ_spare where plan_code = #{planCode}
</delete>
<delete id="delEquPlanEquSpareByPlanCode">
update equ_plan_equ_spare set del_flag = '1' where plan_code = #{planCode} and del_flag = '0'
</delete>
</mapper>

8
op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml
Unescape Escape View File

@ -48,6 +48,7 @@
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
and del_flag = '0'
</where>
ORDER BY standard_name
</select>
<select id="selectEquPlanStandardById" parameterType="String" resultMap="EquPlanStandardResult">
@ -57,7 +58,12 @@
<select id="selectEquPlanStandardByPlanCode" parameterType="String" resultMap="EquPlanStandardResult">
<include refid="selectEquPlanStandardVo"/>
where plan_code = #{planCode} and del_flag ='0'
where plan_code = #{planCode} and del_flag ='0' ORDER BY standard_name
</select>
<select id="selectEquPlanStandardListByParentCode" parameterType="String" resultMap="EquPlanStandardResult">
<include refid="selectEquPlanStandardVo"/>
where parent_code = #{code} and del_flag ='0' ORDER BY standard_name
</select>
<insert id="insertEquPlanStandard" parameterType="EquPlanStandard">

21
op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml
Unescape Escape View File

@ -203,17 +203,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where order_id = #{orderId}
</update>
<!--物理删除改为逻辑删除-->
<delete id="deleteEquRepairOrderByOrderId" parameterType="String">
delete from equ_repair_order where order_id = #{orderId}
update equ_repair_order
set del_flag = '1'
where order_id = #{orderId}
</delete>
<!--物理删除改为逻辑删除-->
<delete id="deleteEquRepairOrderByOrderIds" parameterType="String">
delete from equ_repair_order where order_id in
update equ_repair_order
set del_flag = '1'
where order_id in
<foreach item="orderId" collection="array" open="(" separator="," close=")">
#{orderId}
</foreach>
</delete>
<delete id="deleteEquRepairOrderByRepairCode">
delete from equ_repair_order where order_code = #{repairCode} and del_flag = '0'
</delete>
<select id="selectOrderCodeSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(order_id)+1 AS serialNum
FROM equ_repair_order
@ -221,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and del_flag = '0'
</select>
<select id="getRepairPersonList" parameterType="EquPerson" resultType="com.op.device.domain.EquPerson">
<select id="getRepairPersonList" parameterType="EquTeamUser" resultType="com.op.device.domain.EquTeamUser">
select
user_id AS userId,
user_name AS userName,
@ -231,4 +241,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where del_flag = '0'
</select>
<select id="selectEquRepairOrderByRepairCode" parameterType="String" resultMap="EquRepairOrderResult">
<include refid="selectEquRepairOrderVo"/>
where order_code = #{repairCode} and del_flag = '0'
</select>
</mapper>

12
op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml
Unescape Escape View File

@ -306,12 +306,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and del_flag = '0'
</update>
<!--物理删除改为逻辑删除-->
<delete id="deleteEquRepairWorkOrderByWorkId" parameterType="String">
delete from equ_repair_work_order where work_id = #{workId}
update equ_repair_work_order
set del_flag = '1'
where work_id = #{workId}
</delete>
<!--物理删除改为逻辑删除-->
<delete id="deleteEquRepairWorkOrderByWorkIds" parameterType="String">
delete from equ_repair_work_order where work_id in
update equ_repair_work_order
set del_flag = '1'
where work_id in
<foreach item="workId" collection="array" open="(" separator="," close=")">
#{workId}
</foreach>
@ -323,7 +329,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where del_flag = '0'
</select>
<select id="getMaintenancePersonList" parameterType="EquPerson" resultType="com.op.device.domain.EquPerson">
<select id="getMaintenancePersonList" parameterType="EquTeamUser" resultType="com.op.device.domain.EquTeamUser">
select
su.user_id AS userId,
su.user_name AS userName,

38
op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml
Unescape Escape View File

@ -7,7 +7,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="EquSpareApply" id="EquSpareApplyResult">
<result property="applyId" column="apply_id" />
<result property="applyCode" column="apply_code" />
<result property="workCode" column="work_code" />
<result property="parentCode" column="parent_code" />
<result property="spareCode" column="spare_code" />
<result property="applyType" column="apply_type" />
<result property="spareName" column="spare_name" />
<result property="spareModel" column="spare_model" />
<result property="spareQuantity" column="spare_quantity" />
@ -25,16 +28,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="factoryCode" column="factory_code" />
</resultMap>
<sql id="selectEquSpareApplyVo">
select apply_id, apply_code, spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_spare_apply
select apply_id, apply_code, work_code,parent_code,apply_type,spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_spare_apply
</sql>
<select id="selectEquSpareApplyList" parameterType="EquSpareApply" resultMap="EquSpareApplyResult">
<include refid="selectEquSpareApplyVo"/>
<where>
<if test="applyCode != null and applyCode != ''"> and apply_code like concat('%', #{applyCode}, '%')</if>
<if test="workCode != null and workCode != ''"> and work_code like concat('%', #{workCode}, '%')</if>
<if test="parentCode != null and parentCode != ''"> and parent_code like concat('%', #{parentCode}, '%')</if>
<if test="applyType != null and applyType != ''"> and apply_type like concat('%', #{applytype}, '%')</if>
<if test="spareCode != null and spareCode != ''"> and spare_code like concat('%', #{spareCode}, '%')</if>
<if test="spareName != null and spareName != ''"> and spare_name like concat('%', #{spareName}, '%')</if>
<if test="spareModel != null and spareModel != ''"> and spare_model like concat('%', #{spareModel}, '%')</if>
@ -65,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="applyId != null">apply_id,</if>
<if test="applyCode != null">apply_code,</if>
<if test="workCode != null">work_code,</if>
<if test="parentCode != null">parent_code,</if>
<if test="applyType != null">apply_type,</if>
<if test="spareCode != null">spare_code,</if>
<if test="spareName != null">spare_name,</if>
<if test="spareModel != null">spare_model,</if>
@ -87,6 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="applyId != null">#{applyId},</if>
<if test="applyCode != null">#{applyCode},</if>
<if test="workCode != null">#{workCode},</if>
<if test="parentCode != null">#{parentCode},</if>
<if test="applyType != null">#{applyType},</if>
<if test="spareCode != null">#{spareCode},</if>
<if test="spareName != null">#{spareName},</if>
<if test="spareModel != null">#{spareModel},</if>
@ -112,6 +125,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update equ_spare_apply
<trim prefix="SET" suffixOverrides=",">
<if test="applyCode != null">apply_code = #{applyCode},</if>
<if test="workCode != null">work_code = #{workCode},</if>
<if test="parentCode != null">parent_code = #{parentCode},</if>
<if test="applyType != null">apply_type = #{applyType},</if>
<if test="spareCode != null">spare_code = #{spareCode},</if>
<if test="spareName != null">spare_name = #{spareName},</if>
<if test="spareModel != null">spare_model = #{spareModel},</if>
@ -134,14 +150,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where apply_id = #{applyId}
</update>
<!--物理删除改为逻辑删除-->
<delete id="deleteEquSpareApplyByApplyId" parameterType="String">
delete from equ_spare_apply where apply_id = #{applyId}
update equ_spare_apply
set del_flag = '1'
where apply_id = #{applyId}
</delete>
<!--物理删除改为逻辑删除-->
<delete id="deleteEquSpareApplyByApplyIds" parameterType="String">
delete from equ_spare_apply where apply_id in
update equ_spare_apply
set del_flag = '1'
where apply_id in
<foreach item="applyId" collection="array" open="(" separator="," close=")">
#{applyId}
</foreach>
</delete>
<select id="selectRepairSparePartsRecord" parameterType="EquRepairWorkOrder" resultMap="EquSpareApplyResult">
<include refid="selectEquSpareApplyVo"/>
<where>
<if test="workCode != null and workCode != ''"> and work_code = #{workCode}</if>
and del_flag = '0'
</where>
ORDER BY apply_time DESC
</select>
</mapper>

28
op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml
Unescape Escape View File

@ -89,11 +89,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteEquTeamById" parameterType="String">
delete from equ_team where id = #{id}
update equ_team
set del_flag = '1'
where id = #{id}
</delete>
<delete id="deleteEquTeamByIds" parameterType="String">
delete from equ_team where id in
update equ_team
set del_flag = '1'
where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
@ -105,4 +109,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and team_type = '维修班组'
</select>
<select id="getMaintenancePerson" parameterType="EquTeam" resultType="com.op.device.domain.EquTeamUser">
select
user_id AS userId,
user_name AS userName,
nick_name AS nickName,
CONCAT(nick_name,user_name) AS teamUserName
from sys_user
where del_flag = '0'
</select>
<select id="selectTeamMembers" parameterType="EquTeamUser" resultType="com.op.device.domain.EquTeamUser">
select
user_id AS userId,
user_name AS userName,
nick_name AS nickName,
CONCAT(nick_name,user_name) AS teamUserName
from sys_user
where del_flag = '0'
</select>
</mapper>

144
op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml
Unescape Escape View File

@ -0,0 +1,144 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.device.mapper.EquTeamUserMapper">
<resultMap type="EquTeamUser" id="EquTeamUserResult">
<result property="id" column="id" />
<result property="teamId" column="team_id" />
<result property="teamCode" column="team_code" />
<result property="userId" column="user_id" />
<result property="userName" column="user_name" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectEquTeamUserVo">
select id, team_id, team_code, user_id, user_name, create_by, create_time, update_by, update_time from equ_team_user
</sql>
<select id="selectEquTeamUserList" parameterType="EquTeamUser" resultMap="EquTeamUserResult">
<include refid="selectEquTeamUserVo"/>
<where>
<if test="teamId != null and teamId != ''"> and team_id = #{teamId}</if>
<if test="teamCode != null and teamCode != ''"> and team_code = #{teamCode}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
</where>
</select>
<select id="selectEquTeamUserById" parameterType="String" resultMap="EquTeamUserResult">
<include refid="selectEquTeamUserVo"/>
where id = #{id}
</select>
<insert id="insertEquTeamUser" parameterType="EquTeamUser">
insert into equ_team_user
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="teamId != null and teamId != ''">team_id,</if>
<if test="teamCode != null">team_code,</if>
<if test="userId != null">user_id,</if>
<if test="userName != null">user_name,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="teamId != null and teamId != ''">#{teamId},</if>
<if test="teamCode != null">#{teamCode},</if>
<if test="userId != null">#{userId},</if>
<if test="userName != null">#{userName},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateEquTeamUser" parameterType="EquTeamUser">
update equ_team_user
<trim prefix="SET" suffixOverrides=",">
<if test="teamId != null and teamId != ''">team_id = #{teamId},</if>
<if test="teamCode != null">team_code = #{teamCode},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="userName != null">user_name = #{userName},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteEquTeamUserById" parameterType="String">
delete from equ_team_user where id = #{id}
</delete>
<delete id="deleteEquTeamUserByTeamId" parameterType="String">
delete from equ_team_user where team_id = #{teamId}
</delete>
<delete id="deleteEquTeamUserByIds" parameterType="String">
delete from equ_team_user where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="selectTeamMembers" parameterType="EquTeamUser" resultMap="EquTeamUserResult">
select
user_id,
user_name,
nick_name,
CONCAT(nick_name,user_name) AS teamUserName
from sys_user
</select>
<select id="selectTeamMember" parameterType="EquTeamUser" resultMap="EquTeamUserResult">
select
user_id,
user_name,
nick_name,
CONCAT(nick_name,user_name) AS teamUserName
from sys_user
where user_id = #{userId}
</select>
<select id="selectTeamMembersNameById" parameterType="EquTeamUser" resultType="java.lang.String">
select user_name
from sys_user su
where su.id = #{id}
</select>
<select id="selectTeamMembersIds" parameterType="EquTeamUser" resultType="java.lang.String">
select user_id
from equ_team_user
</select>
<select id="selectId" parameterType="EquTeamUser" resultType="java.lang.String">
select id
from equ_team_user
where user_id = #{userId}
and team_id = #{teamId}
</select>
<select id="selectUserName" parameterType="EquTeamUser" resultType="java.lang.String">
select user_name
from sys_user
where user_id = #{userId}
</select>
<delete id="deleteEquTeamUserByTeamIds" parameterType="String">
delete from equ_team_user where team_id in
<foreach item="teamId" collection="array" open="(" separator="," close=")">
#{teamId}
</foreach>
</delete>
</mapper>

59
op-modules/op-device/src/main/resources/mapper/device/EquipmentMapper.xml
Unescape Escape View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.device.mapper.EquipmentMapper">
<resultMap type="Equipment" id="EquipmentResult">
<result property="equipmentId" column="equipment_id" />
<result property="equipmentCode" column="equipment_code" />
<result property="equipmentName" column="equipment_name" />
<result property="equipmentBrand" column="equipment_brand" />
<result property="equipmentSpec" column="equipment_spec" />
<result property="equipmentTypeId" column="equipment_type_id" />
<result property="equipmentTypeCode" column="equipment_type_code" />
<result property="equipmentTypeName" column="equipment_type_name" />
<result property="workshopId" column="workshop_id" />
<result property="workshopCode" column="workshop_code" />
<result property="workshopName" column="workshop_name" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="workshopSection" column="workshop_section" />
<result property="equipmentLocation" column="equipment_location" />
<result property="hourlyUnitPrice" column="hourly_unit_price" />
<result property="equipmentBarcode" column="equipment_barcode" />
<result property="equipmentBarcodeImage" column="equipment_barcode_image" />
<result property="manufacturer" column="manufacturer" />
<result property="supplier" column="supplier" />
<result property="useLife" column="use_life" />
<result property="buyTime" column="buy_time" />
<result property="assetOriginalValue" column="asset_original_value" />
<result property="netAssetValue" column="net_asset_value" />
<result property="assetHead" column="asset_head" />
<result property="fixedAssetCode" column="fixed_asset_code" />
<result property="department" column="department" />
<result property="unitWorkingHours" column="unit_working_hours" />
<result property="plcIp" column="plc_ip" />
<result property="plcPort" column="plc_port" />
<result property="delFlag" column="del_flag" />
<result property="sapAsset" column="sap_asset" />
</resultMap>
<sql id="selectEquipmentVo">
select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price, equipment_barcode, equipment_barcode_image, manufacturer, supplier, use_life, buy_time, asset_original_value, net_asset_value, asset_head, fixed_asset_code, department, unit_working_hours, plc_ip, plc_port, del_flag, sap_asset from base_equipment
</sql>
<select id="selectEquipmentByEquipmentCode" parameterType="String" resultMap="EquipmentResult">
<include refid="selectEquipmentVo"/>
where equipment_code = #{equipmentCode}
</select>
</mapper>

39
op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml
Unescape Escape View File

@ -5,9 +5,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.op.device.mapper.SparePartsLedgerMapper">
<resultMap type="SparePartsLedger" id="SparePartsLedgerResult">
<result property="storageId" column="storage_id" />
<result property="storageType" column="storage_type" />
<result property="materialCode" column="material_code" />
<result property="materialDesc" column="material_desc" />
<result property="amount" column="amount" />
<result property="storageAmount" column="storage_amount" />
<result property="storageType" column="storage_type" />
<result property="spareUseLife" column="spare_use_life" />
<result property="spareName" column="spare_name" />
@ -32,7 +35,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSparePartsLedgerVo">
select storage_type, material_code, material_desc, amount,sap_factory_code, wl_name, del_flag, spare_use_life, spare_name, spare_mode, spare_manufacturer, spare_supplier, spare_replacement_cycle, spare_measurement_unit, spare_conversion_unit, spare_conversion_ratio, spare_inventory_floor, spare_inventory_upper,spare_type,create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code from wms_ods_mate_storage_news
select
storage_id,
storage_type,
material_code,
material_desc,
amount,
storage_amount,
sap_factory_code,
wl_name,
del_flag,
spare_use_life,
spare_name,
spare_mode,
spare_manufacturer,
spare_supplier,
spare_replacement_cycle,
spare_measurement_unit,
spare_conversion_unit,
spare_conversion_ratio,
spare_inventory_floor,
spare_inventory_upper,
spare_type,
create_by,
gmt_create,
last_modified_by,
gmt_modified,
active_flag,
factory_code
from wms_ods_mate_storage_news
</sql>
<select id="selectSparePartsLedgerList" parameterType="SparePartsLedger" resultMap="SparePartsLedgerResult">
@ -92,7 +123,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and del_flag = '0'
and storage_tpye = 'SP'
</select>
<select id="selectRealAmountByMaterialCode" resultType="java.math.BigDecimal">
select (amount-storage_amount) AS 'amount' from wms_ods_mate_storage_news where material_code = #{materialCode}
</select>
<insert id="insertSparePartsLedger" parameterType="SparePartsLedger">
insert into wms_ods_mate_storage_news
<trim prefix="(" suffix=")" suffixOverrides=",">

4
op-modules/op-energy/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

4
op-modules/op-file/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -16,13 +16,13 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
# 配置中心地址
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

4
op-modules/op-gen/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -16,13 +16,13 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
#命名空间
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

41
op-modules/op-job/push-job.bat
Unescape Escape View File

@ -0,0 +1,41 @@
@echo off
echo --------------------------------自定义参数，启动前先修改--------------------------------------
set jarName=op-modules-job.jar
set profile=dev
set imageURI=192.168.202.36:30002/op-lanju/op-job
rem echo 获取当前日期字符串
for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
rem echo 获取当前时间字符串
for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b
rem echo 如当前小时小于10，将空格替换为0
set T=%T: =0%
rem echo 显示输出日期时间字符串
set imageVersion=%D%%T%
::输出发版信息
echo jar包名称:%jarName%
echo 启动环境:%profile%
echo 镜像库地址:%imageURI%
echo 镜像版本:%imageVersion%
echo --------------------------------mvn package...--------------------------------
::call mvn clean package -Dmaven.test.skip=true
cd .\target
SET df=Dockerfile
if exist %df% (
del /f /s /q .\Dockerfile
)
echo --------------------------------创建Dockerfile--------------------------------
::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile
echo COPY %jarName% /application.jar >> Dockerfile
echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile
echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile
dir
echo --------------------------------docker login...-------------------------------
docker login 192.168.202.36:30002 -u deploy -p Deploy@2023
echo --------------------------------docker build...-------------------------------
docker build -t %imageURI%:%imageVersion% .
echo --------------------------------docker push...--------------------------------
docker push %imageURI%:%imageVersion%
@pause

10
op-modules/op-job/src/main/java/com/op/job/task/RyTask.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.op.job.task;
import com.op.system.api.RemoteDeviceService;
import com.op.system.api.RemoteMesService;
import com.op.system.api.RemotePlanService;
import com.op.system.api.RemoteSapService;
@ -31,6 +32,9 @@ public class RyTask {
@Autowired
private RemotePlanService remotePlanService;
@Autowired
private RemoteDeviceService remoteDeviceService;
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
}
@ -117,4 +121,10 @@ public class RyTask {
logger.info("++数据库备份的数据+开始++dataBKTask+++++");
remoteMesService.dataBKTask();
}
/**每日点检计划生成**/
public void createSpotCheckPlanTask(){
logger.info("++点检计划+开始++createSpotCheckPlanTask+++++");
remoteDeviceService.createSpotCheckPlanTask();
}
}

4
op-modules/op-job/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

4
op-modules/op-mes/push-mes.bat
Unescape Escape View File

@ -26,7 +26,9 @@ if exist %df% (
del /f /s /q .\Dockerfile
)
echo --------------------------------´´½¨Dockerfile--------------------------------
echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile
echo RUN apk add --update font-adobe-100dpi ttf-dejavu fontconfig
echo COPY %jarName% /application.jar >> Dockerfile
echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile
echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save