From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java | 76 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
index 3cfe075..5c16c7d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
@@ -1,16 +1,20 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,8 +24,10 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
+@Accessors(chain = true)
@TableName("man_check_diff_item")
public class CheckDiffItem implements Serializable {
@@ -39,6 +45,12 @@
*/
@ApiModelProperty(value= "鐩樼偣ID")
private Long checkId;
+
+ @ApiModelProperty("浠诲姟ID")
+ private Long taskId;
+
+ @ApiModelProperty("浠诲姟鏄庣粏ID")
+ private Long taskItemId;
/**
* 鐩樼偣鍗�
@@ -95,16 +107,13 @@
private Double checkQty;
/**
- * 鎵ц鐘舵��
- */
- @ApiModelProperty(value= "鎵ц鐘舵��")
- private Integer exceStatus;
-
- /**
* 宸紓鍘熷洜
*/
@ApiModelProperty(value= "宸紓鍘熷洜")
private String reason;
+
+ @ApiModelProperty("鎵ц鐘舵��")
+ private Integer exceStatus;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -159,7 +168,7 @@
public CheckDiffItem() {}
- public CheckDiffItem(Long checkId,String orderCode,String maktx,String matnrCode,String spec,String model,String barcode,String batch,Double anfme,Double checkQty,Integer exceStatus,String reason,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public CheckDiffItem(Long checkId,String orderCode,String maktx,String matnrCode,String spec,String model,String barcode,String batch,Double anfme,Double checkQty,String reason,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.checkId = checkId;
this.orderCode = orderCode;
this.maktx = maktx;
@@ -170,7 +179,6 @@
this.batch = batch;
this.anfme = anfme;
this.checkQty = checkQty;
- this.exceStatus = exceStatus;
this.reason = reason;
this.status = status;
this.deleted = deleted;
@@ -182,28 +190,6 @@
this.memo = memo;
}
-// CheckDiffItem checkDiffItem = new CheckDiffItem(
-// null, // 鐩樼偣ID
-// null, // 鐩樼偣鍗�
-// null, // 鐗╂枡鍚嶇О
-// null, // 鐗╂枡缂栫爜
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 鎵樼洏鐮�
-// null, // 鎵规
-// null, // 甯愰潰搴撳瓨
-// null, // 鐩樼偣搴撳瓨
-// null, // 鎵ц鐘舵��
-// null, // 宸紓鍘熷洜
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
public String getStatus$(){
if (null == this.status){ return null; }
@@ -217,6 +203,28 @@
}
}
+ 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 Double getDiffQty() {
+ if (checkQty.compareTo(0.0) <= 0) {
+ return 0.0;
+ }
+ Double diffQty = Math.round((this.checkQty - this.anfme) * 1000) / 1000.0;
+ return diffQty;
+ }
+
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
--
Gitblit v1.9.1