From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 94 +++++++++++++++++++++-------------------------
1 files changed, 43 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 50f5573..7823e36 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -6,16 +6,13 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
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;
import lombok.Data;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -27,15 +24,15 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value= "搴撲綅鍙�") //Bin Location
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value= "鎵樼洏鏉＄爜")//Pallet No
private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
- @ExcelProperty("鏁伴噺")
+ @ApiModelProperty(value= "鏁伴噺") //Quantity
+ @ExcelProperty("Quantity")
private Double anfme;
@ApiModelProperty(value= "鍟嗗搧缂栧彿")
@@ -46,8 +43,12 @@
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
- @ExcelProperty("鎵瑰彿")
+ @ApiModelProperty(value= "瑙勬牸") //style
+ @ExcelProperty("style")
+ private String specs;
+
+ @ApiModelProperty(value= "鎵瑰彿") //carton number ctn
+ @ExcelProperty("carton number")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -55,13 +56,10 @@
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鍨嬪彿") //size
private String model;
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "棰滆壊") //color
private String color;
@ApiModelProperty(value= "鍝佺墝")
@@ -73,26 +71,26 @@
@ApiModelProperty(value= "鍗曚环")
private Double price;
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value= "buyer Po") //buyer Po
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍗曟嵁鏁伴噺") //order qty
private Double units;
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value= "鏉＄爜") //carton Barcode
private String barcode;
@ApiModelProperty(value= "浜у湴")
private String origin;
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value= "container number") //container number
private String manu;
@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value= "inspection document number") //inspection document number
@TableField("item_num")
private String itemNum;
@@ -106,17 +104,17 @@
@ApiModelProperty(value= "闀垮害")
private Double length;
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value= "ratio") //ratio
private Double volume;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value= "鍗栧") //Buyer
@TableField("three_code")
private String threeCode;
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "閿�鍞崟鍙�") //SO/OC sales order
private String supp;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value= "閲囪喘鍗曞彿")//POrder
@TableField("supp_code")
private String suppCode;
@@ -132,13 +130,13 @@
@TableField("dead_warn")
private Integer deadWarn;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value= "鍖呰绫诲瀷solid/ratio ") //Pack type
private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ @ApiModelProperty(value= "妫�楠岀姸鎬� 1: success 0: fail ") //inspection status
+ private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value= "Pack/open ") //carton status
private Integer danger;
@ApiModelProperty(value= "淇敼浜哄憳")
@@ -157,8 +155,11 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value= "鍗栧鏉＄爜") //Buyer label barcode
private String memo;
+
+ @ApiModelProperty(value= "缁勫悎id") //cartonId-POnumber-item Number
+ private String mixNumber;
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -195,15 +196,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
@@ -235,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);
@@ -252,23 +252,15 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public void sync(Object dest) {
- try {
- BeanInfo sourceBean = Introspector.getBeanInfo(this.getClass(),Object.class);
- PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
- BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
- PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
- for (PropertyDescriptor propertyDescriptor : sourceProperty) {
- for (PropertyDescriptor descriptor : destProperty) {
- if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) {
- descriptor.getWriteMethod().invoke(dest, propertyDescriptor.getReadMethod().invoke(this));
- break;
- }
- }
- }
- } catch (Exception e) {
- throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage());
- }
+ public long getStoreDate(){
+ long timeNow = new Date().getTime();
+ long timeCreate = (this.appeTime != null) ? this.appeTime.getTime() : 0L;
+
+ return (timeNow - timeCreate) /24/60/60/1000;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
}
}
--
Gitblit v1.9.1