From 30bb734c3c5de070ab9513128980bfdbe1880857 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 03 十二月 2025 12:54:15 +0800
Subject: [PATCH] 入库流程功能开发
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 129453c..6f95e0b 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -3,7 +3,9 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
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;
@@ -18,6 +20,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -28,9 +31,21 @@
private static final long serialVersionUID = 1L;
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @TableField("loc_id")
+ private Long locId;
+
@ApiModelProperty(value= "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
+
+ @ApiModelProperty("area_id")
+ private Long areaId;
+
+ @ApiModelProperty("area_name")
+ private String areaName;
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
@@ -51,8 +66,8 @@
@ExcelProperty("瑙勬牸")
private String specs;
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ @ApiModelProperty(value= "鎵瑰彿")
+ @ExcelProperty("鎵瑰彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -106,7 +121,7 @@
private Double weight;
@ApiModelProperty(value= "闀垮害")
- private Double man_length;
+ private Double manLength;
@ApiModelProperty(value= "浣撶Н")
private Double volume;
@@ -213,6 +228,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);
--
Gitblit v1.9.1