From 178278bf8d570ace8cc59ee865035b49333a4421 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 27 五月 2025 17:32:25 +0800
Subject: [PATCH] 设备报废功能增加
---
db/数据库产品化设计.pdma.json | 58 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentScrapStatusEnum.java | 22
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java | 19
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml | 7
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java | 352 +++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java | 344 ++++++-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java | 7
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java | 159 +++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java | 6
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java | 34 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java | 2
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java | 179 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentScrapRequest.java | 121 ++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java | 151 +++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java | 188 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentScrapQuery.java | 23
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java | 47 +
18 files changed, 1,507 insertions(+), 217 deletions(-)
diff --git "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json" "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
index 9c54df4..4bafbe9 100644
--- "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
+++ "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-5-26 14:55:20",
+ "updatedTime": "2025-5-27 10:54:54",
"dbConns": [],
"profile": {
"default": {
@@ -14010,6 +14010,62 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "45EE18F4-2F86-4D31-A5A1-FE3C95BDE686"
+ },
+ {
+ "defKey": "approval_deal_type",
+ "defName": "瀹℃牳绫诲瀷",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "74BA9D2B-0477-46CD-9CD1-0E74A864D8B1",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "scrap_status",
+ "defName": "鎶ュ簾锛堣浆璁╋級鐘舵��",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "3147B647-8FB7-41C0-B032-DC415CA853B1",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
}
],
"correlations": [],
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
index 7686edc..e588f05 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
@@ -4,7 +4,9 @@
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
@@ -128,10 +130,30 @@
case PARTIAL_REPAIR:
break;
case LEAN_OUT:
+ if (result instanceof EamEquipmentLeanOut) {
+ EamEquipmentLeanOut order = (EamEquipmentLeanOut) result;
+ if (EquipmentLeanOutStatusEnum.COMPLETE.name().equals(order.getLeanStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getLeanPerson());
+ log.setDescription(order.getLeanReason());
+ log.setCreateTime(order.getLeanStartTime());
+ }
+ }
break;
case GIVE_BACK:
break;
case SEAL_UP:
+ if (result instanceof EamEquipmentSealUp) {
+ EamEquipmentSealUp order = (EamEquipmentSealUp) result;
+ if (EquipmentSealUpStatusEnum.COMPLETE.name().equals(order.getSealStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getReportUser());
+ log.setDescription(order.getSealUpReason());
+ log.setCreateTime(order.getSealEndTime());
+ }
+ }
break;
case UNSEALED:
break;
@@ -148,6 +170,16 @@
}
break;
case SCRAPPED:
+ if (result instanceof EamEquipmentScrap) {
+ EamEquipmentScrap order = (EamEquipmentScrap) result;
+ if (EquipmentScrapStatusEnum.COMPLETE.name().equals(order.getScrapStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getReportUser());
+ log.setDescription(order.getScrapReason());
+ log.setCreateTime(order.getScrapTime());
+ }
+ }
break;
default:
break;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
index 15c9210..a27b1a9 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -25,6 +25,8 @@
String SEAL_UP_CODE_RULE = "EquipmentSealUpCodeRule";
//璁惧璋冩嫧缂栫爜瑙勫垯
String TRANSFER_CODE_RULE = "EquipmentTransferCodeRule";
+ //璁惧璋冩嫧缂栫爜瑙勫垯
+ String SCRAP_CODE_RULE = "EquipmentScrapCodeRule";
/**
* 澶囦欢璇疯喘鍗曠姸鎬� 1:宸插垱寤� 2:宸叉彁浜� 3:宸查�氳繃 4:宸查┏鍥� 5:宸插畬鎴�
*/
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentScrapStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentScrapStatusEnum.java
new file mode 100644
index 0000000..221503f
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentScrapStatusEnum.java
@@ -0,0 +1,22 @@
+package org.jeecg.modules.eam.constant;
+
+/**
+ * @author cuikaidong
+ * @date 2025/5/27
+ */
+public enum EquipmentScrapStatusEnum {
+ WAIT_SUBMIT, //寰呮彁浜�
+ WAIT_CHECK, //寰呭鏍�
+ COMPLETE, //宸插畬鎴�
+ ;
+
+ public static EquipmentScrapStatusEnum getInstance(String code) {
+ EquipmentScrapStatusEnum[] values = EquipmentScrapStatusEnum.values();
+ for (EquipmentScrapStatusEnum value : values) {
+ if (value.name().equals(code)) {
+ return value;
+ }
+ }
+ return null;
+ }
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
new file mode 100644
index 0000000..0ab7939
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
@@ -0,0 +1,179 @@
+package org.jeecg.modules.eam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 璁惧鍊熷嚭褰掕繕
+ * @Author: jeecg-boot
+ * @Date: 2025-05-13
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_equipment_lean_out")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "eam_equipment_lean_out瀵硅薄", description = "璁惧鍊熷嚭褰掕繕")
+public class EamEquipmentLeanOut implements Serializable {
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private Integer delFlag;
+ /**
+ * 璁惧ID
+ */
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**
+ * 鍗曟嵁鍙�
+ */
+ @Excel(name = "鍗曟嵁鍙�", width = 15)
+ @ApiModelProperty(value = "鍗曟嵁鍙�")
+ private String code;
+ /**
+ * 鍊熷叆閮ㄩ棬
+ */
+ @Excel(name = "鍊熷叆閮ㄩ棬", width = 15, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
+ @ApiModelProperty(value = "鍊熷叆閮ㄩ棬")
+ @Dict(dicCode = "mdc_production, production_name, id")
+ private String leanDepartId;
+ /**
+ * 鍊熷叆璐ｄ换浜�
+ */
+ @Excel(name = "鍊熷叆璐ｄ换浜�", width = 15)
+ @ApiModelProperty(value = "鍊熷叆璐ｄ换浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String leanPerson;
+ /**
+ * 鍊熺敤鍘熷洜
+ */
+ @ApiModelProperty(value = "鍊熺敤鍘熷洜")
+ private String leanReason;
+ /**
+ * 瀹℃壒绫诲瀷
+ */
+ @ApiModelProperty(value = "瀹℃壒绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String approvalDealType;
+ /**
+ * 鍊熷嚭鐘舵��
+ */
+ @Excel(name = "鍊熷嚭鐘舵��", width = 15)
+ @ApiModelProperty(value = "鍊熷嚭鐘舵��")
+ @Dict(dicCode = "equipment_lean_out_status")
+ private String leanStatus;
+ /**
+ * 鍊熷嚭寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leanStartTime;
+ /**
+ * 鍊熷嚭褰掕繕鏃堕棿
+ */
+ @ApiModelProperty(value = "褰掕繕鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leanEndTime;
+ /**
+ * 瀹℃牳浜�
+ */
+ @Excel(name = "瀹℃牳浜�", width = 15)
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String approvalUser;
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalComment;
+ /**
+ * 瀹℃牳鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date approvalTime;
+ /**
+ * 纭浜�
+ */
+ @Excel(name = "纭浜�", width = 15)
+ @ApiModelProperty(value = "纭浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmUser;
+ /**
+ * 纭鎰忚
+ */
+ @Excel(name = "纭鎰忚", width = 15)
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /**
+ * 纭鏃堕棿
+ */
+ @ApiModelProperty(value = "纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "褰掕繕澶囨敞", width = 15)
+ @ApiModelProperty(value = "褰掕繕澶囨敞")
+ private String returnComment;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
new file mode 100644
index 0000000..8d245d6
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
@@ -0,0 +1,151 @@
+package org.jeecg.modules.eam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 璁惧鎶ュ簾(杞)
+ * @Author: jeecg-boot
+ * @Date: 2025-05-15
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_equipment_scrap")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "eam_equipment_scrap瀵硅薄", description = "璁惧鎶ュ簾(杞)")
+public class EamEquipmentScrap implements Serializable {
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
+ @Excel(name = "鍒涘缓浜�", width = 15)
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @Excel(name = "鏇存柊浜�", width = 15)
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private Integer delFlag;
+ /**
+ * 鍗曟嵁鍙�
+ */
+ @Excel(name = "鍗曟嵁鍙�", width = 15)
+ @ApiModelProperty(value = "鍗曟嵁鍙�")
+ private String code;
+ /**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15)
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**
+ * 杞/鎶ュ簾
+ */
+ @Excel(name = "杞/鎶ュ簾", width = 15)
+ @ApiModelProperty(value = "杞/鎶ュ簾")
+ @Dict(dicCode = "scrap_sell")
+ private String scrapType;
+ /**
+ * 鐢宠浜�
+ */
+ @Excel(name = "鐢宠浜�", width = 15)
+ @ApiModelProperty(value = "鐢宠浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String reportUser;
+ /**
+ * 澶勭疆鏃堕棿
+ */
+ @ApiModelProperty(value = "澶勭疆鏃堕棿")
+ private Date scrapTime;
+ /**
+ * 澶勭疆鐞嗙敱
+ */
+ @Excel(name = "澶勭疆鐞嗙敱", width = 15)
+ @ApiModelProperty(value = "澶勭疆鐞嗙敱")
+ private String scrapReason;
+ /**
+ * 澶勭疆閲戦
+ */
+ @Excel(name = "澶勭疆閲戦", width = 15)
+ @ApiModelProperty(value = "澶勭疆閲戦")
+ private java.math.BigDecimal scrapAmount;
+ /**
+ * 鎶ュ簾鐘舵��
+ */
+ @Excel(name = "鎶ュ簾鐘舵��", width = 15)
+ @ApiModelProperty(value = "鎶ュ簾鐘舵��")
+ @Dict(dicCode = "equipment_scrap_status")
+ private String scrapStatus;
+ /**
+ * 瀹℃牳浜�
+ */
+ @Excel(name = "瀹℃牳浜�", width = 15)
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String approvalUser;
+ /**
+ * 瀹℃牳绫诲瀷
+ */
+ @Excel(name = "瀹℃牳绫诲瀷", width = 15)
+ @ApiModelProperty(value = "瀹℃牳绫诲瀷")
+ private String approvalDealType;
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalComment;
+ /**
+ * 瀹℃牳鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ private Date approvalTime;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java
new file mode 100644
index 0000000..9f91cce
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java
@@ -0,0 +1,188 @@
+package org.jeecg.modules.eam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 璁惧灏佸瓨鍚皝
+ * @Author: jeecg-boot
+ * @Date: 2025-05-13
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_equipment_seal_up")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "eam_equipment_seal_up瀵硅薄", description = "璁惧灏佸瓨鍚皝")
+public class EamEquipmentSealUp implements Serializable {
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
+ @Excel(name = "鍒涘缓浜�", width = 15)
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @Excel(name = "鏇存柊浜�", width = 15)
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private Integer delFlag;
+ /**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15)
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**
+ * 鍗曟嵁鍙�
+ */
+ @Excel(name = "鍗曟嵁鍙�", width = 15)
+ @ApiModelProperty(value = "鍗曟嵁鍙�")
+ private String code;
+ /**
+ * 鐢宠浜�
+ */
+ @Excel(name = "鐢宠浜�", width = 15)
+ @ApiModelProperty(value = "鐢宠浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String reportUser;
+ /**
+ * 灏佸瓨寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "灏佸瓨寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sealStartTime;
+ /**
+ * 灏佸瓨缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "灏佸瓨缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sealEndTime;
+ /**
+ * 灏佸瓨鍘熷洜
+ */
+ @Excel(name = "灏佸瓨鍘熷洜", width = 15)
+ @ApiModelProperty(value = "灏佸瓨鍘熷洜")
+ private String sealUpReason;
+ /**
+ * 灏佸瓨鐘舵��
+ */
+ @Excel(name = "灏佸瓨鐘舵��", width = 15)
+ @ApiModelProperty(value = "灏佸瓨鐘舵��")
+ @Dict(dicCode = "equipment_seal_up_status")
+ private String sealStatus;
+ /**
+ * 瀹℃牳浜�
+ */
+ @Excel(name = "瀹℃牳浜�", width = 15)
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String approvalUser;
+ /**
+ * 瀹℃牳鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date approvalTime;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**
+ * 瀹℃牳绫诲瀷
+ */
+ @Excel(name = "瀹℃牳绫诲瀷", width = 15)
+ @ApiModelProperty(value = "瀹℃牳绫诲瀷")
+ private String approvalDealType;
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalComment;
+ /**
+ * 鍚皝鐢宠浜�
+ */
+ @Excel(name = "鍚皝鐢宠浜�", width = 15)
+ @ApiModelProperty(value = "鍚皝鐢宠浜�")
+ private String unsealReportUser;
+ /**
+ * 鍚皝鍘熷洜
+ */
+ @Excel(name = "鍚皝鍘熷洜", width = 15)
+ @ApiModelProperty(value = "鍚皝鍘熷洜")
+ private String unsealReason;
+ /**
+ * 鍚皝瀹℃牳浜�
+ */
+ @Excel(name = "鍚皝瀹℃牳浜�", width = 15)
+ @ApiModelProperty(value = "鍚皝瀹℃牳浜�")
+ private String unsealApprovalUser;
+ /**
+ * 鍚皝瀹℃牳鏃堕棿
+ */
+ @Excel(name = "鍚皝瀹℃牳鏃堕棿", width = 15)
+ @ApiModelProperty(value = "鍚皝瀹℃牳鏃堕棿")
+ private Date unsealApprovalTime;
+ /**
+ * 鍚皝瀹℃牳绫诲瀷
+ */
+ @Excel(name = "鍚皝瀹℃牳绫诲瀷", width = 15)
+ @ApiModelProperty(value = "鍚皝瀹℃牳绫诲瀷")
+ private String unsealApprovalDealType;
+ /**
+ * 鍚皝瀹℃牳鎰忚
+ */
+ @Excel(name = "鍚皝瀹℃牳鎰忚", width = 15)
+ @ApiModelProperty(value = "鍚皝瀹℃牳鎰忚")
+ private String unsealApprovalComment;
+
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java
index dee0f33..9aa318e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java
@@ -1,167 +1,215 @@
package org.jeecg.modules.eam.controller;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EamEquipmentScrap;
-import org.jeecg.modules.eam.service.IEamEquipmentScrapService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.util.TranslateDictTextUtils;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentScrapStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipmentScrap;
+import org.jeecg.modules.eam.request.EamEquipmentScrapQuery;
+import org.jeecg.modules.eam.request.EamEquipmentScrapRequest;
+import org.jeecg.modules.eam.service.IEamEquipmentScrapService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
- /**
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+
+/**
* @Description: 璁惧鎶ュ簾(杞)
* @Author: jeecg-boot
- * @Date: 2025-05-15
+ * @Date: 2025-05-15
* @Version: V1.0
*/
@Slf4j
-@Api(tags="璁惧鎶ュ簾(杞)")
+@Api(tags = "璁惧鎶ュ簾(杞)")
@RestController
@RequestMapping("/eam/eamEquipmentScrap")
public class EamEquipmentScrapController extends JeecgController<EamEquipmentScrap, IEamEquipmentScrapService> {
- @Autowired
- private IEamEquipmentScrapService eamEquipmentScrapService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamEquipmentScrap
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "璁惧鎶ュ簾(杞)-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧鎶ュ簾(杞)-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧鎶ュ簾(杞)-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamEquipmentScrap eamEquipmentScrap,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamEquipmentScrap> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipmentScrap, req.getParameterMap());
- Page<EamEquipmentScrap> page = new Page<EamEquipmentScrap>(pageNo, pageSize);
- IPage<EamEquipmentScrap> pageList = eamEquipmentScrapService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamEquipmentScrap
- * @return
- */
- @AutoLog(value = "璁惧鎶ュ簾(杞)-娣诲姞")
- @ApiOperation(value="璁惧鎶ュ簾(杞)-娣诲姞", notes="璁惧鎶ュ簾(杞)-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamEquipmentScrap eamEquipmentScrap) {
- eamEquipmentScrapService.save(eamEquipmentScrap);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamEquipmentScrap
- * @return
- */
- @AutoLog(value = "璁惧鎶ュ簾(杞)-缂栬緫")
- @ApiOperation(value="璁惧鎶ュ簾(杞)-缂栬緫", notes="璁惧鎶ュ簾(杞)-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamEquipmentScrap eamEquipmentScrap) {
- eamEquipmentScrapService.updateById(eamEquipmentScrap);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧鎶ュ簾(杞)-閫氳繃id鍒犻櫎")
- @ApiOperation(value="璁惧鎶ュ簾(杞)-閫氳繃id鍒犻櫎", notes="璁惧鎶ュ簾(杞)-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<?> delete(@RequestParam(name="id",required=true) String id) {
- eamEquipmentScrapService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "璁惧鎶ュ簾(杞)-鎵归噺鍒犻櫎")
- @ApiOperation(value="璁惧鎶ュ簾(杞)-鎵归噺鍒犻櫎", notes="璁惧鎶ュ簾(杞)-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.eamEquipmentScrapService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧鎶ュ簾(杞)-閫氳繃id鏌ヨ")
- @ApiOperation(value="璁惧鎶ュ簾(杞)-閫氳繃id鏌ヨ", notes="璁惧鎶ュ簾(杞)-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamEquipmentScrap eamEquipmentScrap = eamEquipmentScrapService.getById(id);
- return Result.OK(eamEquipmentScrap);
- }
+ @Autowired
+ private IEamEquipmentScrapService eamEquipmentScrapService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamEquipmentScrap
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamEquipmentScrap eamEquipmentScrap) {
- return super.exportXls(request, eamEquipmentScrap, EamEquipmentScrap.class, "璁惧鎶ュ簾(杞)");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamEquipmentScrap
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ュ簾(杞)-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧鎶ュ簾(杞)-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鎶ュ簾(杞)-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamEquipmentScrapQuery query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Page<EamEquipmentScrap> page = new Page<EamEquipmentScrap>(pageNo, pageSize);
+ IPage<EamEquipmentScrap> pageList = eamEquipmentScrapService.queryPageList(page, query);
+ return Result.OK(pageList);
+ }
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamEquipmentScrap.class);
- }
+ /**
+ * 娣诲姞
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ュ簾(杞)-娣诲姞")
+ @ApiOperation(value = "璁惧鎶ュ簾(杞)-娣诲姞", notes = "璁惧鎶ュ簾(杞)-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamEquipmentScrap request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ request.setCode(businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SCRAP_CODE_RULE));
+ request.setScrapStatus(EquipmentScrapStatusEnum.WAIT_SUBMIT.name());
+ request.setDelFlag(CommonConstant.DEL_FLAG_0);
+ boolean b = eamEquipmentScrapService.addScrap(request);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+ /**
+ * 缂栬緫
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ュ簾(杞)-缂栬緫")
+ @ApiOperation(value = "璁惧鎶ュ簾(杞)-缂栬緫", notes = "璁惧鎶ュ簾(杞)-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamEquipmentScrap request) {
+ if (request == null) {
+ return Result.error("缂栬緫鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ boolean b = eamEquipmentScrapService.editScrap(request);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ュ簾(杞)-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "璁惧鎶ュ簾(杞)-閫氳繃id鍒犻櫎", notes = "璁惧鎶ュ簾(杞)-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ EamEquipmentScrap entity = eamEquipmentScrapService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamEquipmentScrapService.updateById(entity);
+ }
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ュ簾(杞)-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "璁惧鎶ュ簾(杞)-鎵归噺鍒犻櫎", notes = "璁惧鎶ュ簾(杞)-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.eamEquipmentScrapService.removeByIds(Arrays.asList(ids.split(",")));
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(id -> {
+ EamEquipmentScrap entity = eamEquipmentScrapService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamEquipmentScrapService.updateById(entity);
+ }
+ });
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ュ簾(杞)-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁惧鎶ュ簾(杞)-閫氳繃id鏌ヨ", notes = "璁惧鎶ュ簾(杞)-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamEquipmentScrap eamEquipmentScrap = eamEquipmentScrapService.getById(id);
+ if (eamEquipmentScrap == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamEquipmentScrap);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("reportUser", eamEquipmentScrap.getReportUser(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
+
+ /**
+ * 鎻愪氦
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ュ簾(杞)-鎻愪氦")
+ @ApiOperation(value = "璁惧鎶ュ簾(杞)-鎻愪氦", notes = "璁惧鎶ュ簾(杞)-鎻愪氦")
+ @GetMapping(value = "/submit")
+ public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
+ boolean b = eamEquipmentScrapService.submit(id);
+ if (!b) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛!");
+ }
+
+ /**
+ * 瀹℃壒娴�
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ュ簾(杞)-瀹℃壒娴�")
+ @ApiOperation(value = "璁惧鎶ュ簾(杞)-瀹℃壒娴�", notes = "璁惧鎶ュ簾(杞)-瀹℃壒娴�")
+ @RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> approval(@RequestBody EamEquipmentScrapRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ EamEquipmentScrap entity = eamEquipmentScrapService.approval(request);
+ if (entity == null) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛!");
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
index 1cf0b3c..8d245d6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -8,85 +9,143 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.Date;
+
/**
* @Description: 璁惧鎶ュ簾(杞)
* @Author: jeecg-boot
- * @Date: 2025-05-15
+ * @Date: 2025-05-15
* @Version: V1.0
*/
@Data
@TableName("eam_equipment_scrap")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_equipment_scrap瀵硅薄", description="璁惧鎶ュ簾(杞)")
+@ApiModel(value = "eam_equipment_scrap瀵硅薄", description = "璁惧鎶ュ簾(杞)")
public class EamEquipmentScrap implements Serializable {
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @Excel(name = "鍒涘缓浜�", width = 15)
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
+ @Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @Excel(name = "鏇存柊浜�", width = 15)
@ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
- /**鍗曟嵁鍙�*/
- @Excel(name = "鍗曟嵁鍙�", width = 15)
+ private Integer delFlag;
+ /**
+ * 鍗曟嵁鍙�
+ */
+ @Excel(name = "鍗曟嵁鍙�", width = 15)
@ApiModelProperty(value = "鍗曟嵁鍙�")
- private String code;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
+ private String code;
+ /**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
- private String equipmentId;
- /**杞/鎶ュ簾*/
- @Excel(name = "杞/鎶ュ簾", width = 15)
+ private String equipmentId;
+ /**
+ * 杞/鎶ュ簾
+ */
+ @Excel(name = "杞/鎶ュ簾", width = 15)
@ApiModelProperty(value = "杞/鎶ュ簾")
- private String scrapType;
- /**鐢宠浜�*/
- @Excel(name = "鐢宠浜�", width = 15)
+ @Dict(dicCode = "scrap_sell")
+ private String scrapType;
+ /**
+ * 鐢宠浜�
+ */
+ @Excel(name = "鐢宠浜�", width = 15)
@ApiModelProperty(value = "鐢宠浜�")
- private String reportUser;
- /**澶勭疆鏃堕棿*/
+ @Dict(dicCode = "sys_user, realname, username")
+ private String reportUser;
+ /**
+ * 澶勭疆鏃堕棿
+ */
@ApiModelProperty(value = "澶勭疆鏃堕棿")
- private Date scrapTime;
- /**澶勭疆鐞嗙敱*/
- @Excel(name = "澶勭疆鐞嗙敱", width = 15)
+ private Date scrapTime;
+ /**
+ * 澶勭疆鐞嗙敱
+ */
+ @Excel(name = "澶勭疆鐞嗙敱", width = 15)
@ApiModelProperty(value = "澶勭疆鐞嗙敱")
- private String scrapReason;
- /**澶勭疆閲戦*/
- @Excel(name = "澶勭疆閲戦", width = 15)
+ private String scrapReason;
+ /**
+ * 澶勭疆閲戦
+ */
+ @Excel(name = "澶勭疆閲戦", width = 15)
@ApiModelProperty(value = "澶勭疆閲戦")
- private java.math.BigDecimal scrapAmount;
- /**瀹℃牳浜�*/
- @Excel(name = "瀹℃牳浜�", width = 15)
+ private java.math.BigDecimal scrapAmount;
+ /**
+ * 鎶ュ簾鐘舵��
+ */
+ @Excel(name = "鎶ュ簾鐘舵��", width = 15)
+ @ApiModelProperty(value = "鎶ュ簾鐘舵��")
+ @Dict(dicCode = "equipment_scrap_status")
+ private String scrapStatus;
+ /**
+ * 瀹℃牳浜�
+ */
+ @Excel(name = "瀹℃牳浜�", width = 15)
@ApiModelProperty(value = "瀹℃牳浜�")
- private String approvalUser;
- /**瀹℃牳鎰忚*/
- @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @Dict(dicCode = "sys_user, realname, username")
+ private String approvalUser;
+ /**
+ * 瀹℃牳绫诲瀷
+ */
+ @Excel(name = "瀹℃牳绫诲瀷", width = 15)
+ @ApiModelProperty(value = "瀹℃牳绫诲瀷")
+ private String approvalDealType;
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
@ApiModelProperty(value = "瀹℃牳鎰忚")
- private String approvalComment;
- /**瀹℃牳鏃堕棿*/
+ private String approvalComment;
+ /**
+ * 瀹℃牳鏃堕棿
+ */
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
- private Date approvalTime;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
+ private Date approvalTime;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java
index 949732a..7e0a3de 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java
@@ -1,17 +1,28 @@
package org.jeecg.modules.eam.mapper;
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamEquipmentScrap;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 璁惧鎶ュ簾(杞)
* @Author: jeecg-boot
- * @Date: 2025-05-15
+ * @Date: 2025-05-15
* @Version: V1.0
*/
public interface EamEquipmentScrapMapper extends BaseMapper<EamEquipmentScrap> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param queryWrapper
+ * @return
+ */
+ IPage<EamEquipmentScrap> queryPageList(Page<EamEquipmentScrap> page, @Param(Constants.WRAPPER) QueryWrapper<EamEquipmentScrap> queryWrapper);
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml
index a0f001e..5c67684 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml
@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentScrapMapper">
+ <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipmentScrap">
+ select wmo.*, e.equipment_code, e.equipment_name
+ from eam_equipment_scrap wmo
+ inner join eam_equipment e
+ on wmo.equipment_id = e.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentScrapQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentScrapQuery.java
new file mode 100644
index 0000000..ad7ee6e
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentScrapQuery.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.eam.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class EamEquipmentScrapQuery {
+ private String code;
+ private String equipmentId;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date leanDateBegin;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date leanDateEnd;
+ private String sealStatus;
+
+ private String column;
+ private String order;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentScrapRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentScrapRequest.java
new file mode 100644
index 0000000..95228bf
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentScrapRequest.java
@@ -0,0 +1,121 @@
+package org.jeecg.modules.eam.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 璁惧鎶ュ簾(杞)
+ * @Author: jeecg-boot
+ * @Date: 2025-05-30
+ * @Version: V1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EamEquipmentScrapRequest extends FlowTaskVo implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private Integer delFlag;
+ /**
+ * 鍗曟嵁鍙�
+ */
+ @ApiModelProperty(value = "鍗曟嵁鍙�")
+ private String code;
+ /**
+ * 璁惧ID
+ */
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**
+ * 杞/鎶ュ簾
+ */
+ @ApiModelProperty(value = "杞/鎶ュ簾")
+ private String scrapType;
+ /**
+ * 鐢宠浜�
+ */
+ @ApiModelProperty(value = "鐢宠浜�")
+ private String reportUser;
+ /**
+ * 澶勭疆鏃堕棿
+ */
+ @ApiModelProperty(value = "澶勭疆鏃堕棿")
+ private Date scrapTime;
+ /**
+ * 澶勭疆鐞嗙敱
+ */
+ @ApiModelProperty(value = "澶勭疆鐞嗙敱")
+ private String scrapReason;
+ /**
+ * 澶勭疆閲戦
+ */
+ @ApiModelProperty(value = "澶勭疆閲戦")
+ private java.math.BigDecimal scrapAmount;
+ /**
+ * 鍙樺姩鐘舵��
+ */
+ @ApiModelProperty(value = "鍙樺姩鐘舵��")
+ @Dict(dicCode = "equipment_transfer_status")
+ private String scrapStatus;
+ /**
+ * 瀹℃牳浜�
+ */
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String approvalUser;
+ /**
+ * 瀹℃牳绫诲瀷
+ */
+ @ApiModelProperty(value = "瀹℃牳绫诲瀷")
+ private String approvalDealType;
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalComment;
+ /**
+ * 瀹℃牳鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ private Date approvalTime;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java
index a477fdf..8b2063e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java
@@ -1,14 +1,57 @@
package org.jeecg.modules.eam.service;
-import org.jeecg.modules.eam.entity.EamEquipmentScrap;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamEquipmentScrap;
+import org.jeecg.modules.eam.request.EamEquipmentScrapQuery;
+import org.jeecg.modules.eam.request.EamEquipmentScrapRequest;
/**
* @Description: 璁惧鎶ュ簾(杞)
* @Author: jeecg-boot
- * @Date: 2025-05-15
+ * @Date: 2025-05-15
* @Version: V1.0
*/
public interface IEamEquipmentScrapService extends IService<EamEquipmentScrap> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<EamEquipmentScrap> queryPageList(Page<EamEquipmentScrap> page, EamEquipmentScrapQuery query);
+ /**
+ * 娣诲姞鎶ュ簾锛堣璁╋級璁板綍
+ *
+ * @param request
+ * @return
+ */
+ boolean addScrap(EamEquipmentScrap request);
+
+ /**
+ * 鎻愪氦鐢宠
+ *
+ * @param id
+ * @return
+ */
+ boolean submit(String id);
+
+ /**
+ * 瀹℃壒娴佺▼鎺у埗
+ *
+ * @param request
+ * @return
+ */
+ EamEquipmentScrap approval(EamEquipmentScrapRequest request);
+
+ /**
+ * 缂栬緫
+ *
+ * @param request
+ * @return
+ */
+ boolean editScrap(EamEquipmentScrap request);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
index c36f796..5ee5fac 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
@@ -17,7 +17,10 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
+import org.jeecg.modules.eam.constant.AssetStatusEnum;
+import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
+import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.mapper.EamEquipmentLeanOutMapper;
@@ -242,6 +245,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.LEAN_OUT, businessTable = "eam_equipment_lean_out")
public EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request) {
EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(request.getId());
if (entity == null) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java
index 21b9f00..ce371e4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java
@@ -1,19 +1,361 @@
package org.jeecg.modules.eam.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
+import org.jeecg.modules.eam.constant.AssetStatusEnum;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
+import org.jeecg.modules.eam.constant.EquipmentScrapStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentScrap;
import org.jeecg.modules.eam.mapper.EamEquipmentScrapMapper;
+import org.jeecg.modules.eam.request.EamEquipmentScrapQuery;
+import org.jeecg.modules.eam.request.EamEquipmentScrapRequest;
import org.jeecg.modules.eam.service.IEamEquipmentScrapService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
+import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
/**
- * @Description: 璁惧鎶ュ簾(杞)
+ * @Description: 璁惧鎶ュ簾(鎶ュ簾 锛� 杞嚭 锛�)
* @Author: jeecg-boot
- * @Date: 2025-05-15
+ * @Date: 2025-05-15
* @Version: V1.0
*/
-@Service
-public class EamEquipmentScrapServiceImpl extends ServiceImpl<EamEquipmentScrapMapper, EamEquipmentScrap> implements IEamEquipmentScrapService {
+@Service("IEamEquipmentScrapService")
+public class EamEquipmentScrapServiceImpl extends ServiceImpl<EamEquipmentScrapMapper, EamEquipmentScrap> implements IEamEquipmentScrapService, FlowCallBackServiceI {
+ @Resource
+ private EamEquipmentScrapMapper equipmentScrapMapper;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
+ @Autowired
+ private FlowCommonService flowCommonService;
+ @Autowired
+ private IFlowDefinitionService flowDefinitionService;
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Override
+ public IPage<EamEquipmentScrap> queryPageList(Page<EamEquipmentScrap> page, EamEquipmentScrapQuery query) {
+ QueryWrapper<EamEquipmentScrap> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return page;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+ }
+ //鎺у埗寰呮彁浜ょ姸鎬佺殑鏁版嵁鍙兘鏈汉鏌ョ湅
+ queryWrapper.and(i -> i.ne("wmo.scrap_status", EquipmentScrapStatusEnum.WAIT_SUBMIT).or().eq("wmo.report_user", sysUser.getUsername()));
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getCode())) {
+ queryWrapper.like("wmo.code", query.getCode());
+ }
+ if (StringUtils.isNotBlank(query.getSealStatus())) {
+ queryWrapper.eq("wmo.scrap_status", query.getSealStatus());
+ }
+ if (query.getLeanDateBegin() != null && query.getLeanDateEnd() != null) {
+ queryWrapper.between("wmo.lean_start_time", query.getLeanDateBegin(), query.getLeanDateEnd());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return equipmentScrapMapper.queryPageList(page, queryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addScrap(EamEquipmentScrap request) {
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
+ throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽鎶ュ簾锛�");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞鍊熺敤璁板綍锛�");
+ }
+ request.setReportUser(sysUser.getUsername());
+ return equipmentScrapMapper.insert(request) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean submit(String id) {
+ EamEquipmentScrap entity = equipmentScrapMapper.selectById(id);
+ if (entity == null) {
+ throw new JeecgBootException("瑕佹彁浜ょ殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!EquipmentScrapStatusEnum.WAIT_SUBMIT.name().equals(entity.getScrapStatus())) {
+ throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+ }
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鎶ュ簾锛堣浆鍑猴級璁板綍锛�");
+ }
+ UpdateWrapper<EamEquipmentScrap> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("scrap_status", EquipmentScrapStatusEnum.WAIT_SUBMIT.name());
+ updateWrapper.eq("id", id);
+ updateWrapper.eq("report_user", sysUser.getUsername());
+ boolean success = super.update(updateWrapper);
+ if (success) {
+ equipment.setAssetStatus(AssetStatusEnum.SCRAP.name()); // 璁惧鎶ュ簾锛堣浆鍑猴級
+ eamEquipmentService.updateById(equipment);
+ }
+ //鍚姩瀹℃壒娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getCode() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧鎶ュ簾锛堣浆鍑猴級",
+ entity.getId(), "IEamEquipmentScrapService", "equipment_scrap", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", entity.getId());
+ variables.put("organization", entity.getScrapReason());
+ variables.put("comment", entity.getScrapReason());
+ variables.put("proofreading", true);
+ // 鍒嗛厤缁欒澶囩鐞嗗憳
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰璁惧绠＄悊鍛橈紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("equipment_scrap", variables);
+ if (result != null) {
+ entity.setScrapTime(new Date());
+ entity.setScrapStatus(EquipmentScrapStatusEnum.WAIT_CHECK.name());
+ //淇濆瓨宸ュ崟
+ equipmentScrapMapper.updateById(entity);
+ return result.isSuccess();
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SCRAPPED, businessTable = "eam_equipment_scrap")
+ public EamEquipmentScrap approval(EamEquipmentScrapRequest request) {
+ EamEquipmentScrap entity = equipmentScrapMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
+ }
+ request.setApprovalUser(user.getUsername());
+ // 鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+
+ boolean userAuthorized = isUserAuthorized(flowMyBusiness, user);
+ if (!userAuthorized) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+ }
+
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+
+ EquipmentScrapStatusEnum status = EquipmentScrapStatusEnum.getInstance(entity.getScrapStatus());
+ if (status == null) {
+ return null;
+ }
+ //娴佺▼鍙橀噺
+ Map<String, Object> values = new HashMap<>();
+ // 瀹℃壒
+ if (status == EquipmentScrapStatusEnum.WAIT_CHECK) {//鎵ц瀹屾垚
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getApprovalComment());
+ values.put("comment", request.getApprovalComment());
+ values.put("approvalDealType", request.getApprovalDealType());
+ request.setComment(request.getApprovalComment());
+ entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
+ entity.setApprovalComment(request.getApprovalComment());// 瀹℃牳鎰忚
+ entity.setApprovalTime(new Date());// 瀹℃牳鏃堕棿
+ entity.setApprovalDealType(request.getApprovalDealType()); // 瀹℃壒绫诲瀷
+ // 楠岃瘉閫氳繃杩樻槸椹冲洖
+ if (request.getApprovalDealType().equals("1")) {
+ //璁剧疆entity
+ entity.setScrapStatus(EquipmentScrapStatusEnum.COMPLETE.name());
+ List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getReportUser()));
+ values.put("NextAssignee", userApprovalList);
+ // 淇敼璁惧鐘舵��
+ equipment.setAssetStatus(AssetStatusEnum.SCRAP.name());
+
+ } else {
+ //璁剧疆entity
+ entity.setScrapStatus(EquipmentScrapStatusEnum.COMPLETE.name());
+ // 淇敼璁惧鐘舵��
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
+ }
+ entity.setApprovalUser(user.getUsername());
+ entity.setApprovalComment(request.getApprovalComment());
+ entity.setApprovalTime(new Date());
+ eamEquipmentService.updateById(equipment);
+ }
+ request.setValues(values);
+
+ // 瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(request);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+ }
+ //淇濆瓨宸ュ崟
+ equipmentScrapMapper.updateById(entity);
+ return entity;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean editScrap(EamEquipmentScrap request) {
+ EamEquipmentScrap entity = equipmentScrapMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瑕佺紪杈戠殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!EquipmentScrapStatusEnum.WAIT_SUBMIT.name().equals(entity.getScrapStatus())) {
+ throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+ }
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鎶ュ簾璁板綍锛�");
+ }
+ UpdateWrapper<EamEquipmentScrap> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("equipment_id", request.getEquipmentId());
+ updateWrapper.set("remark", request.getRemark());
+ updateWrapper.set("scrap_reason", request.getScrapReason());
+ updateWrapper.set("scrap_amount", request.getScrapAmount());
+ updateWrapper.set("scrap_type", request.getScrapType());
+ updateWrapper.eq("id", request.getId());
+ updateWrapper.eq("report_user", sysUser.getUsername());
+ return super.update(updateWrapper);
+ }
+
+ @Override
+ public void afterFlowHandle(FlowMyBusiness business) {
+ business.getTaskNameId();//鎺ヤ笅鏉ュ鎵圭殑鑺傜偣
+ business.getValues();//鍓嶇浼犺繘鏉ョ殑鍙傛暟
+ business.getActStatus();
+ }
+
+ @Override
+ public Object getBusinessDataById(String dataId) {
+ return this.getById(dataId);
+ }
+
+ @Override
+ public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
+ return null;
+ }
+
+ @Override
+ public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
+ return null;
+ }
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁姝ゆ潈闄�
+ *
+ * @param flowMyBusiness
+ * @param user
+ * @return
+ */
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
+ }
+
+ private boolean claimTask(String taskId, LoginUser user) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ if (task == null) {
+ return false;
+ }
+ if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
+ return false;
+ }
+ taskService.claim(taskId, user.getUsername());
+ return true;
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
index b02edfc..0228d7c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
@@ -18,8 +18,10 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
@@ -278,6 +280,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SEAL_UP, businessTable = "eam_equipment_seal_up")
public EamEquipmentSealUp approval(EamEquipmentSealUpRequest request) {
EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(request.getId());
if (entity == null) {
@@ -336,7 +339,7 @@
values.put("NextAssignee", userApprovalList);
} else {
//璁剧疆entity
- entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_SUBMIT.name());
+ entity.setSealStatus(EquipmentSealUpStatusEnum.COMPLETE.name());
// 淇敼璁惧鐘舵��
equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
eamEquipmentService.updateById(equipment);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
index de1b2b1..b25c467 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
@@ -259,13 +259,12 @@
entity.setTransferStatus(EquipmentTransferStatusEnum.COMPLETE.name());
List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getReportUser()));
values.put("NextAssignee", userApprovalList);
- // 淇敼璁惧鐘舵��
- equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
} else {
//璁剧疆entity
- entity.setTransferStatus(EquipmentTransferStatusEnum.WAIT_SUBMIT.name());
- // 淇敼璁惧鐘舵��
+ entity.setTransferStatus(EquipmentTransferStatusEnum.COMPLETE.name());
}
+ // 淇敼璁惧鐘舵��
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
entity.setApprovalUser(user.getUsername());
entity.setApprovalComment(request.getApprovalComment());
entity.setApprovalTime(new Date());
--
Gitblit v1.9.3