设备台账表加入字段设备位置,作业中心ID

develop-QA
qinyulong 3 months ago
parent 9397872131
commit 9722720ebb
  1. 11
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
  2. 6
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/EquipmentExcel.java
  3. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml
  4. 11
      doc/sql/mes/increase-260108.sql

@ -144,7 +144,16 @@ public class EquipmentEntity extends BaseEntity {
*/ */
@Schema(description = "附件链接") @Schema(description = "附件链接")
private String attachLink; private String attachLink;
/**
* 设备位置
*/
@Schema(description = "设备位置")
private String equipmentLocation;
/**
* 作业中心ID
*/
@Schema(description = "作业中心ID")
private Long workstationId;
public void setDocking(String docking) { public void setDocking(String docking) {
// 核心逻辑:如果传入的是 null 或空字符串,则使用默认值 "0" // 核心逻辑:如果传入的是 null 或空字符串,则使用默认值 "0"
if (docking == null || docking.trim().isEmpty()) { if (docking == null || docking.trim().isEmpty()) {

@ -124,8 +124,14 @@ public class EquipmentExcel implements Serializable {
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("设备分类") @ExcelProperty("设备分类")
private String categorys; private String categorys;
/**
* 设备位置
*/
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("设备位置")
private String equipmentLocation;
@ColumnWidth(20)
@ExcelProperty("附件链接") @ExcelProperty("附件链接")
private String attachLink; private String attachLink;

@ -26,6 +26,8 @@
<result column="STATUS" property="status"/> <result column="STATUS" property="status"/>
<result column="IS_DELETED" property="isDeleted"/> <result column="IS_DELETED" property="isDeleted"/>
<result column="ATTACH_LINK" property="attachLink"/> <result column="ATTACH_LINK" property="attachLink"/>
<result column="EQUIPMENT_LOCATION" property="equipmentLocation"/>
<result column="WORKSTATION_ID" property="workstationId"/>
</resultMap> </resultMap>
<!-- 定义结果映射,将查询结果的列映射到VO的属性上 --> <!-- 定义结果映射,将查询结果的列映射到VO的属性上 -->
<resultMap id="EquipmentStatusStatisticsResultMap" <resultMap id="EquipmentStatusStatisticsResultMap"

@ -362,4 +362,13 @@ ON TABLE MES_EQUIPMENT_MAINTENANCE IS '岗位设备维护';
ALTER TABLE MES_CULTIVATE_DETAIL ALTER TABLE MES_CULTIVATE_DETAIL
ADD (FINISH_TIME DATE); ADD (FINISH_TIME DATE);
COMMENT COMMENT
ON COLUMN MES_CULTIVATE_DETAIL.FINISH_TIME IS '完成时间' ON COLUMN MES_CULTIVATE_DETAIL.FINISH_TIME IS '完成时间'
--
ALTER TABLE MES_EQUIPMENT
ADD (EQUIPMENT_LOCATION NVARCHAR2(255))
ADD (WORKSTATION_ID NUMBER(11));
COMMENT
ON COLUMN MES_EQUIPMENT.EQUIPMENT_LOCATION IS '设备位置';
COMMENT
ON COLUMN MES_EQUIPMENT.WORKSTATION_ID IS '作业中心ID';
Loading…
Cancel
Save