From cf074430480e44eba1e6ddce09ccce9f28067120 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 17 九月 2025 08:56:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index acdcd54..8ae131b 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -9,6 +9,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasBoxTypeService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.MatService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -37,34 +38,34 @@
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty("鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty("瑙勬牸")
private String matnr;
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
+ @ApiModelProperty(value= "鎺ュご")
private String specs;
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ @ApiModelProperty(value= "鎵规")
+// @ExcelProperty("鎵规")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @ExcelProperty("鍗曟嵁缂栧彿")
+// @ExcelProperty("鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "MES宸ヤ綔鍙�")
private String model;
@ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鏈ㄧ绫诲瀷")
+ @ExcelProperty("鏈ㄧ绫诲瀷")
private String brand;
@ApiModelProperty(value= "鍗曚綅")
@@ -267,6 +268,37 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public long getStoreDate(){
+ try{
+ long timeNow = new Date().getTime();
+ long timeCreate = this.appeTime.getTime();
+
+ return (timeNow - timeCreate) /24/60/60/1000;
+ }catch (Exception e){
+ return 0;
+ }
+ }
+
+ public String getStoreMax$(){
+ MatService matService = SpringUtils.getBean(MatService.class);
+ Mat mat = matService.selectByMatnr(this.matnr);
+ if (!Cools.isEmpty(mat)){
+ return String.valueOf(mat.getStoreMin());
+ }
+ return null;
+ }
+
+
+ public String getStoreMin$(){
+ MatService matService = SpringUtils.getBean(MatService.class);
+ Mat mat = matService.selectByMatnr(this.matnr);
+ if (!Cools.isEmpty(mat)){
+ return String.valueOf(mat.getStoreMax());
+ }
+ return null;
+ }
+
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1