From 7885e0cb06992d03da37105c0a9f56ced99b338d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 19 七月 2025 10:27:05 +0800
Subject: [PATCH] 盘点差异单优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java | 113 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 42 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java
index 36faced..d71e25c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java
@@ -1,11 +1,18 @@
package com.vincent.rsf.server.manager.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
+
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -20,8 +27,10 @@
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
+
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@Accessors(chain = true)
@@ -33,14 +42,14 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鐩樼偣鍗�
*/
- @ApiModelProperty(value= "鐩樼偣鍗�")
+ @ApiModelProperty(value = "鐩樼偣鍗�")
private String orderCode;
@@ -48,95 +57,96 @@
private Long orderId;
/**
- * 鐩樼偣绫诲瀷 0: 鏄庣洏 1: 鏆楃洏
+ * 鐩樼偣绫诲瀷 0: 鏄庣洏 1: 鏆楃洏
*/
- @ApiModelProperty(value= "鐩樼偣绫诲瀷 0: 鏄庣洏 1: 鏆楃洏 ")
+ @ApiModelProperty(value = "鐩樼偣绫诲瀷 0: 鏄庣洏 1: 鏆楃洏 ")
private Integer checkType;
/**
* 搴撳尯ID
*/
- @ApiModelProperty(value= "搴撳尯ID")
+ @ApiModelProperty(value = "搴撳尯ID")
private Long areaId;
/**
* 搴撳尯鍚嶇О
*/
- @ApiModelProperty(value= "搴撳尯鍚嶇О")
+ @ApiModelProperty(value = "搴撳尯鍚嶇О")
private String areaName;
/**
* 甯愰潰搴撳瓨
*/
- @ApiModelProperty(value= "甯愰潰搴撳瓨")
+ @ApiModelProperty(value = "甯愰潰搴撳瓨")
private Double anfme;
/**
* 鐩樼偣搴撳瓨
*/
- @ApiModelProperty(value= "鐩樼偣搴撳瓨")
+ @ApiModelProperty(value = "鐩樼偣搴撳瓨")
private Double checkQty;
/**
* 鎵ц鐘舵��
*/
- @ApiModelProperty(value= "鎵ц鐘舵��")
+ @ApiModelProperty(value = "鎵ц鐘舵��")
private Integer exceStatus;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
private Integer deleted;
/**
* 绉熸埛
*/
- @ApiModelProperty(value= "绉熸埛")
+ @ApiModelProperty(value = "绉熸埛")
private Integer tenantId;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public CheckDiff() {}
+ public CheckDiff() {
+ }
- public CheckDiff(String orderCode,Integer checkType,Long areaId,String areaName,Double anfme,Double checkQty,Integer exceStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public CheckDiff(String orderCode, Integer checkType, Long areaId, String areaName, Double anfme, Double checkQty, Integer exceStatus, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderCode = orderCode;
this.checkType = checkType;
this.areaId = areaId;
@@ -172,21 +182,39 @@
// null // 澶囨敞
// );
- public String getCheckType$(){
- if (null == this.checkType){ return null; }
- switch (this.checkType){
+ public String getCheckType$() {
+ if (null == this.checkType) {
+ return null;
+ }
+ switch (this.checkType) {
case 0:
return "鏄庣洏";
- case 1:
+ case 1:
return "鏆楃洏";
default:
return String.valueOf(this.checkType);
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getExceStatus$() {
+ if (Cools.isEmpty(this.exceStatus)) {
+ return "";
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_DIFF_EXCE_STATUS)
+ .eq(DictData::getValue, this.exceStatus));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -196,43 +224,44 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
-
- public Boolean getStatusBool(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public Boolean getStatusBool() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return true;
case 0:
--
Gitblit v1.9.1