From e90dba0edc93be26e1509cfb2ec1d0681eb86e48 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 27 八月 2025 08:37:04 +0800
Subject: [PATCH] 合并出库添加日志
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 192 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 156 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 58cceeb..1ee80a7 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -3,12 +3,11 @@
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.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -26,20 +25,26 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "搴撲綅鍙�")
- @TableId(value = "loc_no", type = IdType.INPUT)
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty("鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "璐ф灦鏉＄爜")
+ private String zpallet;
+
+ @ApiModelProperty(value= "鏁伴噺")
+ @ExcelProperty("鏁伴噺")
+ private Double anfme;
+
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty("鐗╂枡鍙�")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @ExcelProperty("鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @ExcelProperty("鐗╂枡鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
- @ExcelProperty("鎵瑰彿")
+ @ApiModelProperty(value= "搴忓垪鐮�")
+ @ExcelProperty("搴忓垪鐮�")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -48,42 +53,90 @@
private String orderNo;
@ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
- private String lgnum;
+ private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
- @ExcelProperty("鍨嬪彿")
- private String type;
+ @ApiModelProperty(value= "鎵规")
+ private String model;
- @ApiModelProperty(value= "鏉＄爜")
- @ExcelProperty("鏉＄爜")
+ @ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鎵瑰彿")
- private String supplier;
-
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String warehouse;
-
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value= "鍝佺墝")
private String brand;
- @ApiModelProperty(value= "鏁伴噺")
- @ExcelProperty("鏁伴噺")
- private Double anfme;
-
@ApiModelProperty(value= "鍗曚綅")
- @ExcelProperty("鍗曚綅")
- private String altme;
+ private String unit;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
+ @ApiModelProperty(value= "鍗曚环")
+ private Double price;
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String bname;
+ @ApiModelProperty(value= "sku")
+ private String sku;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value= "鍖呮暟")
+ private Double units;
+
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ private String origin;
+
+ @ApiModelProperty(value= "鍘傚")
+ private String manu;
+
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
+ @TableField("manu_date")
+ private String manuDate;
+
+ @ApiModelProperty(value= "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ @ApiModelProperty(value= "閲嶉噺")
+ private Double weight;
+
+ @ApiModelProperty(value= "闀垮害")
+ private Double length;
+
+ @ApiModelProperty(value= "浣撶Н")
+ private Double volume;
+
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supp;
+
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ @ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
+ private String deadTime;
+
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ @TableField("dead_warn")
+ private Integer deadWarn;
+
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
@ApiModelProperty(value= "淇敼浜哄憳")
@TableField("modi_user")
@@ -101,6 +154,13 @@
@TableField("appe_time")
private Date appeTime;
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ @TableField("stock_freeze")
+ @ApiModelProperty(value= "搴撳瓨鍐荤粨{1:姝ｅ父,0:鍐荤粨}")
+ private Integer stockFreeze;
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
@@ -108,6 +168,56 @@
return String.valueOf(locMast.getLocNo());
}
return null;
+ }
+
+ public String getBeBatch$(){
+ if (null == this.beBatch){ return null; }
+ switch (this.beBatch){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
+ public String getSource$(){
+ if (null == this.source){ return null; }
+ switch (this.source){
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
+ }
+
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
+ }
+
+ public String getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
}
public String getModiUser$(){
@@ -126,7 +236,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
-
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
@@ -143,4 +252,15 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+ public String getStockFreeze$() {
+ if (Cools.isEmpty(this.stockFreeze)){
+ return "";
+ }
+ return this.stockFreeze == 1 ? "姝ｅ父" : "鍐荤粨";
+ }
+
}
--
Gitblit v1.9.1