From fc464a48c95cc0710d89501d9df99312c3efa603 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 13 八月 2024 18:35:12 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
index 8bcbf64..e1ea2c5 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
@@ -2,6 +2,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.common.wms.service.OrderService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -278,9 +281,18 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ /**
+ * 宸ヤ綔妗D
+ */
+ @ApiModelProperty(value= "宸ヤ綔妗D")
+ private Long wrkMastId;
+
+ @ApiModelProperty(value= "璐т富")
+ private String owner;
+
public WrkDetl() {}
- public WrkDetl(Integer wrkNo,Date ioTime,Double anfme,String zpallet,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) {
+ public WrkDetl(Integer wrkNo,Date ioTime,Double anfme,String zpallet,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,String owner) {
this.wrkNo = wrkNo;
this.ioTime = ioTime;
this.anfme = anfme;
@@ -321,6 +333,7 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// WrkDetl wrkDetl = new WrkDetl(
@@ -372,7 +385,6 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
-
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
@@ -464,5 +476,22 @@
return null;
}
+ public String getOrderType(){
+ if(Cools.isEmpty(orderNo)){
+ return "";
+ }
+
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ Order order = orderService.selectByNo(orderNo, hostId);
+ if(!Cools.isEmpty(order)){
+ return order.getDocType$();
+ }
+
+ return "";
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1