From 91aa478d200d53ecf5e3032ce7f7e026a218e526 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 17:26:57 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index c95626c..89ae35e 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -5,33 +5,30 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasProcessProceduresService;
-import com.zy.asrs.service.BasQualityTestingService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.LocOwnerService;
+import com.zy.asrs.service.*;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@Data
@TableName("asr_loc_detl")
-@Accessors(chain = true)
@ExcelIgnoreUnannotated
public class LocDetl implements Serializable {
private static final long serialVersionUID = 1L;
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
@TableField("loc_id")
@@ -66,8 +63,8 @@
@ExcelProperty("瑙勬牸")
private String specs;
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ @ApiModelProperty(value= "鎵瑰彿")
+ @ExcelProperty("鎵瑰彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -121,7 +118,7 @@
private Double weight;
@ApiModelProperty(value= "闀垮害")
- private Double man_length;
+ private Double manLength;
@ApiModelProperty(value= "浣撶Н")
private Double volume;
@@ -228,6 +225,32 @@
@ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
private Integer frozen;
+ /**
+ * 宸紓鏁伴噺
+ */
+ @ApiModelProperty(value= "宸紓鏁伴噺")
+ @TableField("diff_qty")
+ private BigDecimal diffQty = BigDecimal.ZERO;
+
+
+
+ @ApiModelProperty(value= "璐﹂潰鏁伴噺")
+ @TableField("book_qty")
+ private BigDecimal bookQty = BigDecimal.ZERO;
+// private BigDecimal bookQty = Cools.isEmpty(anfme)? BigDecimal.ZERO : new BigDecimal(anfme.toString());
+
+
+ public BigDecimal getBookQty() {
+
+ if (diffQty.compareTo(BigDecimal.ZERO) == 0 ) {
+ return BigDecimal.ZERO;
+ }
+ if ( diffQty.compareTo(BigDecimal.ZERO) > 0) {
+ return new BigDecimal(anfme.toString());
+ }
+ return new BigDecimal(anfme.toString()).subtract(diffQty);
+ }
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
@@ -256,6 +279,15 @@
}
}
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
public String getSource$(){
if (null == this.source){ return null; }
switch (this.source){
--
Gitblit v1.9.1