diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination new file mode 100644 index 00000000..836417d9 --- /dev/null +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -0,0 +1,11 @@ +#for test only! +#Tue Oct 17 09:57:19 CST 2023 +jco.destination.pool_capacity=true +jco.client.lang=zh +jco.client.ashost=192.168.0.53 +jco.client.saprouter= +jco.client.user=MES +jco.client.sysnr=0 +jco.destination.peak_limit=20 +jco.client.passwd=123456 +jco.client.client=800 diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java index a03f50cc..a2c3482a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java @@ -2,6 +2,11 @@ package com.op.device.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.op.device.domain.BaseEquipment; +import com.op.device.domain.EquPlanEqu; +import com.op.device.domain.dto.InspectionPlanDTO; +import com.op.device.domain.vo.InspectionPlanVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,6 +38,29 @@ public class EquPlanController extends BaseController { @Autowired private IEquPlanService equPlanService; + /** + * 处理计划-设备信息 + * @param equPlanEquList + * @return + */ + @PostMapping("/formatEquItem") + public AjaxResult formatEquItem(@RequestBody List equPlanEquList) { + return equPlanService.formatEquItem(equPlanEquList); + } + + /** + * 获取设备信息list + * @param baseEquipment + * @return + */ + @RequiresPermissions("device:plan:list") + @GetMapping("/getEquList") + public TableDataInfo getEquList(BaseEquipment baseEquipment) { + startPage(); + List list = equPlanService.getEquList(baseEquipment); + return getDataTable(list); + } + /** * 查询计划列表 */ diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java new file mode 100644 index 00000000..c1e67dd2 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java @@ -0,0 +1,448 @@ +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; + +/** + * 设备管理对象 base_equipment + * + * @author Open Platform + * @date 2023-10-17 + */ +public class BaseEquipment extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 设备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(); + } +} \ No newline at end of file diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java index 727018fa..efa224ca 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java @@ -125,6 +125,17 @@ public class EquPlan extends BaseEntity { // 创建日期结束 private String createTimeEnd; + // 关联-计划->设备list + private List equPlanEquList; + + public List getEquPlanEquList() { + return equPlanEquList; + } + + public void setEquPlanEquList(List equPlanEquList) { + this.equPlanEquList = equPlanEquList; + } + public List getCreateTimeArray() { return createTimeArray; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java new file mode 100644 index 00000000..ddb7f970 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java @@ -0,0 +1,218 @@ +package com.op.device.domain; + +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; + +import java.util.List; + +/** + * 计划详情-检查项信息对象 equ_plan_detail + * + * @author Open Platform + * @date 2023-10-17 + */ +public class EquPlanDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 详情编码 */ + @Excel(name = "详情编码") + private String code; + + /** 计划id */ + @Excel(name = "计划id") + private String planId; + + /** 关联上级表单 */ + @Excel(name = "关联上级表单") + private String parentCode; + + /** 检查项编码 */ + @Excel(name = "检查项编码") + private String itemCode; + + /** 检查项名称 */ + @Excel(name = "检查项名称") + private String itemName; + + /** 检查项方法/工具 */ + @Excel(name = "检查项方法/工具") + private String itemMethod; + + /** 维护类型编码 */ + @Excel(name = "维护类型编码") + private String itemType; + + /** 维护类型名称 */ + @Excel(name = "维护类型名称") + private String itemTypeName; + + /** 检查项备注 */ + @Excel(name = "检查项备注") + private String itemRemark; + + /** 工厂 */ + @Excel(name = "工厂") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + // 关联-检查项->检查详情list + private List equPlanStandardList; + + public List getEquPlanStandardList() { + return equPlanStandardList; + } + + public void setEquPlanStandardList(List equPlanStandardList) { + this.equPlanStandardList = equPlanStandardList; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setCode(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getPlanId() { + return planId; + } + public void setParentCode(String parentCode) { + this.parentCode = parentCode; + } + + public String getParentCode() { + return parentCode; + } + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemCode() { + return itemCode; + } + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getItemName() { + return itemName; + } + public void setItemMethod(String itemMethod) { + this.itemMethod = itemMethod; + } + + public String getItemMethod() { + return itemMethod; + } + public void setItemType(String itemType) { + this.itemType = itemType; + } + + public String getItemType() { + return itemType; + } + public void setItemTypeName(String itemTypeName) { + this.itemTypeName = itemTypeName; + } + + public String getItemTypeName() { + return itemTypeName; + } + public void setItemRemark(String itemRemark) { + this.itemRemark = itemRemark; + } + + public String getItemRemark() { + return itemRemark; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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 setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("code", getCode()) + .append("planId", getPlanId()) + .append("parentCode", getParentCode()) + .append("itemCode", getItemCode()) + .append("itemName", getItemName()) + .append("itemMethod", getItemMethod()) + .append("itemType", getItemType()) + .append("itemTypeName", getItemTypeName()) + .append("itemRemark", getItemRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java new file mode 100644 index 00000000..f26dd20f --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java @@ -0,0 +1,158 @@ +package com.op.device.domain; + +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; + +import java.util.List; + +/** + * 计划详情-设备对象 equ_plan_equ + * + * @author Open Platform + * @date 2023-10-17 + */ +public class EquPlanEqu extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 计划详情-设备编码 */ + @Excel(name = "计划详情-设备编码") + private String code; + + /** 关联上级表单 */ + @Excel(name = "关联上级表单") + private String parentCode; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String equipmentCode; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String equipmentName; + + /** 工厂 */ + @Excel(name = "工厂") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标识 */ + private String delFlag; + + // 关联-设备->检查项list + private List equPlanDetailList; + + public List getEquPlanDetailList() { + return equPlanDetailList; + } + + public void setEquPlanDetailList(List equPlanDetailList) { + this.equPlanDetailList = equPlanDetailList; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setCode(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + public void setParentCode(String parentCode) { + this.parentCode = parentCode; + } + + public String getParentCode() { + return parentCode; + } + 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 setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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 setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("code", getCode()) + .append("parentCode", getParentCode()) + .append("equipmentCode", getEquipmentCode()) + .append("equipmentName", getEquipmentName()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java new file mode 100644 index 00000000..f5b1ae8a --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java @@ -0,0 +1,194 @@ +package com.op.device.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 计划详情-标准信息对象 equ_plan_standard + * + * @author Open Platform + * @date 2023-10-17 + */ +public class EquPlanStandard extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 编码 */ + @Excel(name = "编码") + private String code; + + /** 关联上级表单 */ + @Excel(name = "关联上级表单") + private String parentCode; + + /** 检查项编码 */ + @Excel(name = "检查项编码") + private String detailCode; + + /** 标准类型 */ + @Excel(name = "标准类型") + private String standardType; + + /** 标准名称 */ + @Excel(name = "标准名称") + private String standardName; + + /** 上限 */ + @Excel(name = "上限") + private BigDecimal detailUpLimit; + + /** 下限 */ + @Excel(name = "下限") + private BigDecimal detailDownLimit; + + /** 单位 */ + @Excel(name = "单位") + private String detailUnit; + + /** 工厂 */ + @Excel(name = "工厂") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标识 */ + private String delFlag; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setCode(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + public void setParentCode(String parentCode) { + this.parentCode = parentCode; + } + + public String getParentCode() { + return parentCode; + } + public void setDetailCode(String detailCode) { + this.detailCode = detailCode; + } + + public String getDetailCode() { + return detailCode; + } + public void setStandardType(String standardType) { + this.standardType = standardType; + } + + public String getStandardType() { + return standardType; + } + public void setStandardName(String standardName) { + this.standardName = standardName; + } + + public String getStandardName() { + return standardName; + } + public void setDetailUpLimit(BigDecimal detailUpLimit) { + this.detailUpLimit = detailUpLimit; + } + + public BigDecimal getDetailUpLimit() { + return detailUpLimit; + } + public void setDetailDownLimit(BigDecimal detailDownLimit) { + this.detailDownLimit = detailDownLimit; + } + + public BigDecimal getDetailDownLimit() { + return detailDownLimit; + } + public void setDetailUnit(String detailUnit) { + this.detailUnit = detailUnit; + } + + public String getDetailUnit() { + return detailUnit; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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 setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("code", getCode()) + .append("parentCode", getParentCode()) + .append("detailCode", getDetailCode()) + .append("standardType", getStandardType()) + .append("standardName", getStandardName()) + .append("detailUpLimit", getDetailUpLimit()) + .append("detailDownLimit", getDetailDownLimit()) + .append("detailUnit", getDetailUnit()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java new file mode 100644 index 00000000..93b3d829 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java @@ -0,0 +1,319 @@ +package com.op.device.domain.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; +import java.util.List; + +// 巡检计划DTO +public class InspectionPlanDTO { + /** 主键 */ + private String planId; + + /** 计划编码 */ + private String planCode; + + /** 计划名称 */ + private String planName; + + /** 车间 */ + private String planWorkshop; + + /** 产线 */ + private String planProdLine; + + /** 设备名称 */ + private String equipmentName; + + /** 设备编码 */ + private String equipmentCode; + + /** 循环周期 */ + private String planLoop; + + /** 循环周期类型 */ + private String planLoopType; + + /** 循环执行时间开始 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planLoopStart; + + /** 循环执行时间结束 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planLoopEnd; + + /** 巡检人员 */ + private String planPerson; + + /** 计划状态 */ + private String planStatus; + + /** 是否可生产-限制 */ + private String planRestrict; + + /** 维护类型 */ + private String planType; + + /** 是否委外 */ + private String planOutsource; + + /** 委外工单编码 */ + private String workCode; + + /** 工厂 */ + private String factoryCode; + + /** 备用字段1 */ + private String attr1; + + /** 备用字段2 */ + private String attr2; + + /** 备用字段3 */ + private String attr3; + + /** 删除标志 */ + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getPlanCode() { + return planCode; + } + + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public String getPlanWorkshop() { + return planWorkshop; + } + + public void setPlanWorkshop(String planWorkshop) { + this.planWorkshop = planWorkshop; + } + + public String getPlanProdLine() { + return planProdLine; + } + + public void setPlanProdLine(String planProdLine) { + this.planProdLine = planProdLine; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentCode() { + return equipmentCode; + } + + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + + public String getPlanLoop() { + return planLoop; + } + + public void setPlanLoop(String planLoop) { + this.planLoop = planLoop; + } + + public String getPlanLoopType() { + return planLoopType; + } + + public void setPlanLoopType(String planLoopType) { + this.planLoopType = planLoopType; + } + + public Date getPlanLoopStart() { + return planLoopStart; + } + + public void setPlanLoopStart(Date planLoopStart) { + this.planLoopStart = planLoopStart; + } + + public Date getPlanLoopEnd() { + return planLoopEnd; + } + + public void setPlanLoopEnd(Date planLoopEnd) { + this.planLoopEnd = planLoopEnd; + } + + public String getPlanPerson() { + return planPerson; + } + + public void setPlanPerson(String planPerson) { + this.planPerson = planPerson; + } + + public String getPlanStatus() { + return planStatus; + } + + public void setPlanStatus(String planStatus) { + this.planStatus = planStatus; + } + + public String getPlanRestrict() { + return planRestrict; + } + + public void setPlanRestrict(String planRestrict) { + this.planRestrict = planRestrict; + } + + public String getPlanType() { + return planType; + } + + public void setPlanType(String planType) { + this.planType = planType; + } + + public String getPlanOutsource() { + return planOutsource; + } + + public void setPlanOutsource(String planOutsource) { + this.planOutsource = planOutsource; + } + + public String getWorkCode() { + return workCode; + } + + public void setWorkCode(String workCode) { + this.workCode = workCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr2() { + return attr2; + } + + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr3() { + return attr3; + } + + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + 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; + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionPlanVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionPlanVO.java new file mode 100644 index 00000000..86b86acb --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionPlanVO.java @@ -0,0 +1,6 @@ +package com.op.device.domain.vo; + +// 巡检计划VO +public class InspectionPlanVO { + +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java new file mode 100644 index 00000000..759b0d0d --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import com.op.device.domain.BaseEquipment; + +import java.util.List; + +/** + * 设备管理Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface BaseEquipmentMapper { + /** + * 查询设备管理 + * + * @param equipmentId 设备管理主键 + * @return 设备管理 + */ + public BaseEquipment selectBaseEquipmentByEquipmentId(Long equipmentId); + + /** + * 查询设备管理列表 + * + * @param baseEquipment 设备管理 + * @return 设备管理集合 + */ + public List selectBaseEquipmentList(BaseEquipment baseEquipment); + + /** + * 新增设备管理 + * + * @param baseEquipment 设备管理 + * @return 结果 + */ + public int insertBaseEquipment(BaseEquipment baseEquipment); + + /** + * 修改设备管理 + * + * @param baseEquipment 设备管理 + * @return 结果 + */ + public int updateBaseEquipment(BaseEquipment baseEquipment); + + /** + * 删除设备管理 + * + * @param equipmentId 设备管理主键 + * @return 结果 + */ + public int deleteBaseEquipmentByEquipmentId(Long equipmentId); + + /** + * 批量删除设备管理 + * + * @param equipmentIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseEquipmentByEquipmentIds(Long[] equipmentIds); +} \ No newline at end of file diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java new file mode 100644 index 00000000..4a1b453b --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquPlanDetail; + +/** + * 计划详情-检查项信息Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface EquPlanDetailMapper { + /** + * 查询计划详情-检查项信息 + * + * @param id 计划详情-检查项信息主键 + * @return 计划详情-检查项信息 + */ + public EquPlanDetail selectEquPlanDetailById(String id); + + /** + * 查询计划详情-检查项信息列表 + * + * @param equPlanDetail 计划详情-检查项信息 + * @return 计划详情-检查项信息集合 + */ + public List selectEquPlanDetailList(EquPlanDetail equPlanDetail); + + /** + * 新增计划详情-检查项信息 + * + * @param equPlanDetail 计划详情-检查项信息 + * @return 结果 + */ + public int insertEquPlanDetail(EquPlanDetail equPlanDetail); + + /** + * 修改计划详情-检查项信息 + * + * @param equPlanDetail 计划详情-检查项信息 + * @return 结果 + */ + public int updateEquPlanDetail(EquPlanDetail equPlanDetail); + + /** + * 删除计划详情-检查项信息 + * + * @param id 计划详情-检查项信息主键 + * @return 结果 + */ + public int deleteEquPlanDetailById(String id); + + /** + * 批量删除计划详情-检查项信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquPlanDetailByIds(String[] ids); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java new file mode 100644 index 00000000..3a838336 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquPlanEqu; + +/** + * 计划详情-设备Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface EquPlanEquMapper { + /** + * 查询计划详情-设备 + * + * @param id 计划详情-设备主键 + * @return 计划详情-设备 + */ + public EquPlanEqu selectEquPlanEquById(String id); + + /** + * 查询计划详情-设备列表 + * + * @param equPlanEqu 计划详情-设备 + * @return 计划详情-设备集合 + */ + public List selectEquPlanEquList(EquPlanEqu equPlanEqu); + + /** + * 新增计划详情-设备 + * + * @param equPlanEqu 计划详情-设备 + * @return 结果 + */ + public int insertEquPlanEqu(EquPlanEqu equPlanEqu); + + /** + * 修改计划详情-设备 + * + * @param equPlanEqu 计划详情-设备 + * @return 结果 + */ + public int updateEquPlanEqu(EquPlanEqu equPlanEqu); + + /** + * 删除计划详情-设备 + * + * @param id 计划详情-设备主键 + * @return 结果 + */ + public int deleteEquPlanEquById(String id); + + /** + * 批量删除计划详情-设备 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquPlanEquByIds(String[] ids); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java index b6d5e50e..a6e22009 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java @@ -3,6 +3,8 @@ package com.op.device.mapper; import java.util.List; import com.op.device.domain.EquPlan; +import com.op.device.domain.dto.InspectionPlanDTO; +import com.op.device.domain.vo.InspectionPlanVO; /** * 计划Mapper接口 diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java new file mode 100644 index 00000000..faaaeca1 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquPlanStandard; + +/** + * 计划详情-标准信息Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface EquPlanStandardMapper { + /** + * 查询计划详情-标准信息 + * + * @param id 计划详情-标准信息主键 + * @return 计划详情-标准信息 + */ + public EquPlanStandard selectEquPlanStandardById(String id); + + /** + * 查询计划详情-标准信息列表 + * + * @param equPlanStandard 计划详情-标准信息 + * @return 计划详情-标准信息集合 + */ + public List selectEquPlanStandardList(EquPlanStandard equPlanStandard); + + /** + * 新增计划详情-标准信息 + * + * @param equPlanStandard 计划详情-标准信息 + * @return 结果 + */ + public int insertEquPlanStandard(EquPlanStandard equPlanStandard); + + /** + * 修改计划详情-标准信息 + * + * @param equPlanStandard 计划详情-标准信息 + * @return 结果 + */ + public int updateEquPlanStandard(EquPlanStandard equPlanStandard); + + /** + * 删除计划详情-标准信息 + * + * @param id 计划详情-标准信息主键 + * @return 结果 + */ + public int deleteEquPlanStandardById(String id); + + /** + * 批量删除计划详情-标准信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquPlanStandardByIds(String[] ids); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java index 24c60365..8f323907 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java @@ -1,7 +1,13 @@ package com.op.device.service; import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.BaseEquipment; import com.op.device.domain.EquPlan; +import com.op.device.domain.EquPlanEqu; +import com.op.device.domain.dto.InspectionPlanDTO; +import com.op.device.domain.vo.InspectionPlanVO; /** * 计划Service接口 @@ -57,4 +63,18 @@ public interface IEquPlanService { * @return 结果 */ public int deleteEquPlanByPlanId(String planId); + + /** + * 获取设备信息list + * @param baseEquipment + * @return + */ + List getEquList(BaseEquipment baseEquipment); + + /** + * 处理计划-设备信息 + * @param equPlanEquList + * @return + */ + AjaxResult formatEquItem(List equPlanEquList); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index 96afd6ec..bc276ae5 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -5,6 +5,12 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.BaseEquipment; +import com.op.device.domain.EquPlanEqu; +import com.op.device.domain.dto.InspectionPlanDTO; +import com.op.device.domain.vo.InspectionPlanVO; +import com.op.device.mapper.BaseEquipmentMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.mapper.EquPlanMapper; @@ -21,6 +27,8 @@ import com.op.device.service.IEquPlanService; public class EquPlanServiceImpl implements IEquPlanService { @Autowired private EquPlanMapper equPlanMapper; + @Autowired + private BaseEquipmentMapper baseEquipmentMapper; /** * 查询计划 @@ -111,4 +119,26 @@ public class EquPlanServiceImpl implements IEquPlanService { public int deleteEquPlanByPlanId(String planId) { return equPlanMapper.deleteEquPlanByPlanId(planId); } + + /** + * 获取设备信息list + * @param baseEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List getEquList(BaseEquipment baseEquipment) { + return baseEquipmentMapper.selectBaseEquipmentList(baseEquipment); + } + + /** + * 处理计划-设备信息 + * @param equPlanEquList + * @return + */ + @Override + public AjaxResult formatEquItem(List equPlanEquList) { + + return null; + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml new file mode 100644 index 00000000..61664188 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into base_equipment + + 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, + + + #{equipmentId}, + #{equipmentCode}, + #{equipmentName}, + #{equipmentBrand}, + #{equipmentSpec}, + #{equipmentTypeId}, + #{equipmentTypeCode}, + #{equipmentTypeName}, + #{workshopId}, + #{workshopCode}, + #{workshopName}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{workshopSection}, + #{equipmentLocation}, + #{hourlyUnitPrice}, + #{equipmentBarcode}, + #{equipmentBarcodeImage}, + #{manufacturer}, + #{supplier}, + #{useLife}, + #{buyTime}, + #{assetOriginalValue}, + #{netAssetValue}, + #{assetHead}, + #{fixedAssetCode}, + #{department}, + #{unitWorkingHours}, + #{plcIp}, + #{plcPort}, + #{delFlag}, + #{sapAsset}, + + + + + update base_equipment + + equipment_code = #{equipmentCode}, + equipment_name = #{equipmentName}, + equipment_brand = #{equipmentBrand}, + equipment_spec = #{equipmentSpec}, + equipment_type_id = #{equipmentTypeId}, + equipment_type_code = #{equipmentTypeCode}, + equipment_type_name = #{equipmentTypeName}, + workshop_id = #{workshopId}, + workshop_code = #{workshopCode}, + workshop_name = #{workshopName}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + workshop_section = #{workshopSection}, + equipment_location = #{equipmentLocation}, + hourly_unit_price = #{hourlyUnitPrice}, + equipment_barcode = #{equipmentBarcode}, + equipment_barcode_image = #{equipmentBarcodeImage}, + manufacturer = #{manufacturer}, + supplier = #{supplier}, + use_life = #{useLife}, + buy_time = #{buyTime}, + asset_original_value = #{assetOriginalValue}, + net_asset_value = #{netAssetValue}, + asset_head = #{assetHead}, + fixed_asset_code = #{fixedAssetCode}, + department = #{department}, + unit_working_hours = #{unitWorkingHours}, + plc_ip = #{plcIp}, + plc_port = #{plcPort}, + del_flag = #{delFlag}, + sap_asset = #{sapAsset}, + + where equipment_id = #{equipmentId} + + + + delete from base_equipment where equipment_id = #{equipmentId} + + + + delete from base_equipment where equipment_id in + + #{equipmentId} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml new file mode 100644 index 00000000..5e0a7703 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, code, plan_id, parent_code, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_detail + + + + + + + + insert into equ_plan_detail + + id, + code, + plan_id, + parent_code, + item_code, + item_name, + item_method, + item_type, + item_type_name, + item_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{code}, + #{planId}, + #{parentCode}, + #{itemCode}, + #{itemName}, + #{itemMethod}, + #{itemType}, + #{itemTypeName}, + #{itemRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan_detail + + code = #{code}, + plan_id = #{planId}, + parent_code = #{parentCode}, + item_code = #{itemCode}, + item_name = #{itemName}, + item_method = #{itemMethod}, + item_type = #{itemType}, + item_type_name = #{itemTypeName}, + item_remark = #{itemRemark}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from equ_plan_detail where id = #{id} + + + + delete from equ_plan_detail where id in + + #{id} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml new file mode 100644 index 00000000..c5a50462 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, code, parent_code, equipment_code, equipment_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_equ + + + + + + + + insert into equ_plan_equ + + id, + code, + parent_code, + equipment_code, + equipment_name, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{code}, + #{parentCode}, + #{equipmentCode}, + #{equipmentName}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan_equ + + code = #{code}, + parent_code = #{parentCode}, + equipment_code = #{equipmentCode}, + equipment_name = #{equipmentName}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from equ_plan_equ where id = #{id} + + + + delete from equ_plan_equ where id in + + #{id} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml new file mode 100644 index 00000000..067fc541 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, code, parent_code, detail_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_standard + + + + + + + + insert into equ_plan_standard + + id, + code, + parent_code, + detail_code, + standard_type, + standard_name, + detail_up_limit, + detail_down_limit, + detail_unit, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{code}, + #{parentCode}, + #{detailCode}, + #{standardType}, + #{standardName}, + #{detailUpLimit}, + #{detailDownLimit}, + #{detailUnit}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan_standard + + code = #{code}, + parent_code = #{parentCode}, + detail_code = #{detailCode}, + standard_type = #{standardType}, + standard_name = #{standardName}, + detail_up_limit = #{detailUpLimit}, + detail_down_limit = #{detailDownLimit}, + detail_unit = #{detailUnit}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from equ_plan_standard where id = #{id} + + + + delete from equ_plan_standard where id in + + #{id} + + + \ No newline at end of file