From 332420e29973a6768c50558df5775554882f6be7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 18:55:35 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index bc060c1..4ba1d22 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -3,7 +3,10 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.common.wms.service.DocTypeService;
import com.zy.asrs.common.wms.service.LocMastService;
+import com.zy.asrs.common.wms.service.OrderService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -30,6 +33,10 @@
public class LocDetl implements Serializable {
private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
* 搴撲綅鍙�
@@ -186,9 +193,18 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鎺堟潈鍟嗘埛
+ */
+ @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
+ private Long hostId;
+
+ @ApiModelProperty(value= "璐т富")
+ private Integer owner;
+
public LocDetl() {}
- public LocDetl(String locNo,String zpallet,Double anfme,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo) {
+ public LocDetl(String locNo,String zpallet,Double anfme,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,Integer owner) {
this.locNo = locNo;
this.zpallet = zpallet;
this.anfme = anfme;
@@ -227,6 +243,8 @@
this.appeUser = appeUser;
this.appeTime = appeTime;
this.memo = memo;
+ this.hostId = hostId;
+ this.owner = owner;
}
// LocDetl locDetl = new LocDetl(
@@ -267,7 +285,8 @@
// null, // 淇敼鏃堕棿
// null, // 鍒涘缓鑰�
// null, // 娣诲姞鏃堕棿
-// null // 澶囨敞
+// null, // 澶囨敞
+// null // 鎺堟潈鍟嗘埛
// );
public String getLocNo$(){
@@ -277,6 +296,18 @@
return String.valueOf(locMast.getLocNo());
}
return null;
+ }
+
+ public String getOwner$(){
+ if (null == this.owner){ return null; }
+ switch (this.owner){
+ case 1:
+ return "瀹佹尝";
+ case 2:
+ return "鏂版槍";
+ default:
+ return String.valueOf(this.owner);
+ }
}
public String getModiUser$(){
@@ -311,5 +342,30 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getOrderType() {
+ if (Cools.isEmpty(this.orderNo)){
+ return "";
+ }
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ DocTypeService docTypeService = SpringUtils.getBean(DocTypeService.class);
+ Order order = orderService.selectByNo(orderNo, hostId);
+ if (order != null) {
+ return order.getDocType$();
+ }
+ return this.orderNo;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1