From 6154d01e223e051fc87650ee87baea9c913eac3e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 25 三月 2025 16:21:08 +0800
Subject: [PATCH] 库存管制/解除管制
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 10586f1..44add5a 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -8,13 +8,17 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
import com.zy.common.utils.Synchro;
+import com.zy.system.entity.Config;
import com.zy.system.entity.User;
+import com.zy.system.service.ConfigService;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.Date;
@Data
@@ -158,6 +162,24 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鏄惁绠″埗
+ */
+ @ApiModelProperty(value= "鏄惁绠″埗,0.鍙栨秷绠″埗锛�1.绠″埗")
+ private Integer frozen;
+
+ private String controlMemo;
+
+ private Date controlDate;
+
+ private String controlUser;
+
+ private String uncontrolMemo;
+
+ private Date uncontrolDate;
+
+ private String uncontrolUser;
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
@@ -249,12 +271,42 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getControlDate$(){
+ if (Cools.isEmpty(this.controlDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.controlDate);
+ }
+
+ public String getUncontrolDate$(){
+ if (Cools.isEmpty(this.uncontrolDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.uncontrolDate);
+ }
+
// public long getStoreDate(){
// long timeNow = new Date().getTime();
// long timeCreate = this.appeTime.getTime();
//
// return (timeNow - timeCreate) /24/60/60/1000;
// }
+public String getFrozen$() {
+ if (null == this.frozen){ return null; }
+ switch (this.frozen){
+ case 0:
+ return "鏈鍒�";
+ case 1:
+ ConfigService service = SpringUtils.getBean(ConfigService.class);
+ Config config = service.selectConfigByCode("durationOfFilmRollControl");
+ int day = Integer.parseInt(config.getValue());
+ LocalDate appLocalDate = this.appeTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate newAppLocalDate = appLocalDate.plusDays(day);
+ return newAppLocalDate.isAfter(LocalDate.now()) ? "宸茬鍒�1": "宸茬鍒�2";
+ default:
+ return null;
+ }
+}
public void sync(Object source) {
Synchro.Copy(source, this);
--
Gitblit v1.9.1