From 94f419e47e5fbbcc52515ff98103eb8fa3bc1849 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 30 Aug 2023 14:23:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E8=AE=BE?= =?UTF-8?q?=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/BaseEquipment.java | 72 +++++++++---------- .../mapper/wms/BaseEquipmentMapper.xml | 30 ++++---- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java index df94a4b1..595dd266 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java @@ -7,7 +7,7 @@ import com.op.common.core.web.domain.BaseEntity; /** * 设备管理对象 base_equipment - * + * * @author Open Platform * @date 2023-07-20 */ @@ -78,8 +78,8 @@ public class BaseEquipment extends BaseEntity { private Long attr4; /** 单台能力工时 */ -// @Excel(name = "单台能力工时") -// private String unitWorkingHours; + @Excel(name = "单台能力工时") + private String unitWorkingHours; /** 工段 */ @Excel(name = "工段") @@ -205,13 +205,13 @@ public class BaseEquipment extends BaseEntity { public Long getAttr4() { return attr4; } -// public void setUnitWorkingHours(String unitWorkingHours) { -// this.unitWorkingHours = unitWorkingHours; -// } -// -// public String getUnitWorkingHours() { -// return unitWorkingHours; -// } + public void setUnitWorkingHours(String unitWorkingHours) { + this.unitWorkingHours = unitWorkingHours; + } + + public String getUnitWorkingHours() { + return unitWorkingHours; + } public void setWorkshopSection(String workshopSection) { this.workshopSection = workshopSection; } @@ -237,31 +237,31 @@ public class BaseEquipment extends BaseEntity { @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("unitWorkingHours", getUnitWorkingHours()) - .append("workshopSection", getWorkshopSection()) - .append("equipmentLocation", getEquipmentLocation()) - .append("hourlyUnitPrice", getHourlyUnitPrice()) - .toString(); + .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("unitWorkingHours", getUnitWorkingHours()) + .append("workshopSection", getWorkshopSection()) + .append("equipmentLocation", getEquipmentLocation()) + .append("hourlyUnitPrice", getHourlyUnitPrice()) + .toString(); } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index e06d5d61..c049babf 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -26,19 +26,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - 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 from base_equipment + 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,unit_working_hours from base_equipment - + - + insert into base_equipment @@ -89,11 +89,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + unit_working_hours, workshop_section, equipment_location, hourly_unit_price, - + #{equipmentCode}, #{equipmentName}, @@ -115,11 +115,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + #{unitWorkingHours}, #{workshopSection}, #{equipmentLocation}, #{hourlyUnitPrice}, - + @@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, - + workshop_section = #{workshopSection}, equipment_location = #{equipmentLocation}, hourly_unit_price = #{hourlyUnitPrice}, @@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from base_equipment where equipment_id in + delete from base_equipment where equipment_id in #{equipmentId}