From 48bdd6d0b6c13c99dfc8ec5801d70a056d9db315 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 04 三月 2025 10:43:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazmat_manage
---
hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/vo/HzTabooWarningVO.java | 19 +++++++++++++++----
hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml | 11 +++++++++--
hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzTabooWarning.java | 15 +++++++++++++--
hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/TaBooWarningServiceImpl.java | 4 +++-
4 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzTabooWarning.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzTabooWarning.java
index 0f54bbe..7ae7040 100644
--- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzTabooWarning.java
+++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzTabooWarning.java
@@ -52,10 +52,12 @@
@TableField("taboo_basic_id")
private Long tabooBasicId;
- @ApiModelProperty(value = "仓库id",required = true)
+ @ApiModelProperty(value = "源仓库id",required = true)
+ @TableField("warehouse_id")
private Long warehouseId;
- @ApiModelProperty(value = "存储柜Id",required = true)
+ @ApiModelProperty(value = "源存储柜Id",required = true)
+ @TableField("cupboard_id")
private Long cupboardId;
// @ApiModelProperty("相忌危化品表数据id")
@@ -95,4 +97,13 @@
@ApiModelProperty("备注")
@TableField("remark")
private String remark;
+
+
+ @ApiModelProperty(value = "新仓库id",required = false)
+ @TableField("re_warehouse_id")
+ private Long reWarehouseId;
+
+ @ApiModelProperty(value = "新存储柜Id",required = false)
+ @TableField("re_cupboard_id")
+ private Long reCupboardId;
}
diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/vo/HzTabooWarningVO.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/vo/HzTabooWarningVO.java
index e4e6486..d548e85 100644
--- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/vo/HzTabooWarningVO.java
+++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/vo/HzTabooWarningVO.java
@@ -32,16 +32,16 @@
@ApiModelProperty("状态(0未处理，1已处理)")
private Integer state;
- @ApiModelProperty(value = "仓库id")
+ @ApiModelProperty(value = "原仓库id")
private Long warehouseId;
- @ApiModelProperty(value = "仓库名称")
+ @ApiModelProperty(value = "原仓库名称")
private String warehouseName;
- @ApiModelProperty(value = "存储柜Id")
+ @ApiModelProperty(value = "原存储柜Id")
private Long cupboardId;
- @ApiModelProperty(value = "存储柜")
+ @ApiModelProperty(value = "原存储柜")
private String cupboardName;
@ApiModelProperty("危化品基础数据id")
@@ -66,4 +66,15 @@
@ApiModelProperty("备注")
private String remark;
+
+ @ApiModelProperty(value = "新仓库id",required = false)
+ private Long reWarehouseId;
+
+ @ApiModelProperty(value = "新存储柜Id",required = false)
+ private Long reCupboardId;
+
+ @ApiModelProperty(value = "新仓库名称")
+ private String reWarehouseName;
+ @ApiModelProperty(value = "新存储柜")
+ private String reCupboardName;
}
diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/TaBooWarningServiceImpl.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/TaBooWarningServiceImpl.java
index e318f52..7c691db 100644
--- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/TaBooWarningServiceImpl.java
+++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/TaBooWarningServiceImpl.java
@@ -181,7 +181,9 @@
//处理数据本身
- baseMapper.updateById(new HzTabooWarning().setState(1).setUpdateBy(currentUser.getUsername()).setId(entryTransferVO.getId()));
+ baseMapper.updateById(new HzTabooWarning().setState(1).
+ setUpdateBy(currentUser.getUsername()).setReCupboardId(entryTransferVO.getCupboardId()).setReWarehouseId(entryTransferVO.getWarehouseId())
+ .setId(entryTransferVO.getId()));
}
public void checkUserAllowed(HzEntryRecord entryRecord,SysUser user) {
diff --git a/hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml
index 3d734d0..76b8a28 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml
@@ -19,6 +19,10 @@
<result property="remark" column="remark" />
<result property="basicName" column="basic_name" />
<result property="warehouseName" column="warehouse_name" />
+ <result property="reWarehouseId" column="re_warehouse_id" />
+ <result property="reCupboardId" column="re_cupboard_id" />
+ <result property="reWarehouseName" column="re_warehouse_name" />
+ <result property="reCupboardName" column="re_cupboard_name" />
</resultMap>
@@ -26,16 +30,19 @@
select aa.id,aa.warning_type,aa.state,aa.taboo_basic_id,aa.create_by,aa.create_time,aa.update_time,
aa.update_by,aa.version,aa.warehouse_id,a.basic_id,a.company_id,
b.name as basic_name,
- c.name as warehouse_name,aa.cupboard_id,d.cupboard_name as cupboard_name,bb.name as taboo_basic_name
+ c.name as warehouse_name,aa.cupboard_id,d.cupboard_name as cupboard_name,bb.name as taboo_basic_name,
+ aa.re_cupboard_id,aa.re_warehouse_id,dh.cupboard_name re_cupboard_name,bbh.name as re_warehouse_name
from hz_taboo_warning aa
left join hz_entry_record a on aa.entry_id=a.id
left join hz_hazmat_basic b on b.id=a.basic_id
left join hz_warehouse c on c.id=aa.warehouse_id
left join hz_warehouse_cupboard d on d.id=aa.cupboard_id
left join hz_hazmat_basic bb on bb.id=aa.taboo_basic_id
+ left join hz_warehouse_cupboard dh on dh.id=aa.re_cupboard_id
+ left join hz_warehouse bbh on bbh.id=aa.re_warehouse_id
</sql>
<select id="selectHzTabooWarningList" resultMap="HzTabooWarningResult"
- parameterType="com.gkhy.hazmat.system.domain.HzEntryRecord">
+ parameterType="com.gkhy.hazmat.system.domain.HzTabooWarning">
<include refid="selectHzTabooWarningVo"/>
<where>
and aa.del_flag = 0
--
Gitblit v1.9.2