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/ViewWorkInBean.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index a4947ff..0cd9ece 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+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.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.Date;
/**
@@ -155,6 +159,24 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鏄惁绠″埗
+ */
+ @ApiModelProperty(value= "鏄惁绠″埗,0.鍙栨秷绠″埗锛�1.绠″埗")
+ private Integer frozen;
+
+ private String control_memo;
+
+ private Date control_date;
+
+ private String control_user;
+
+ private String uncontrol_memo;
+
+ private Date uncontrol_date;
+
+ private String uncontrol_user;
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modi_user);
@@ -190,4 +212,36 @@
}
}
+ public String getControlDate$(){
+ if (Cools.isEmpty(this.control_date)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.control_date);
+ }
+
+ public String getUncontrolDate$(){
+ if (Cools.isEmpty(this.uncontrol_date)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.uncontrol_date);
+ }
+
+ 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());
+ Date appeTime = (Date) this.appe_time;
+ LocalDate appLocalDate = appeTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate newAppLocalDate = appLocalDate.plusDays(day);
+ return newAppLocalDate.isAfter(LocalDate.now()) ? "宸茬鍒�1": "宸茬鍒�2";
+ default:
+ return null;
+ }
+ }
+
}
--
Gitblit v1.9.1