From f532f32fc3769679c3c33c7b0e91c4e33530bf92 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 30 十月 2024 13:56:18 +0800
Subject: [PATCH] #摄像头pic存储增加locNo
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java | 22 ++++++++++++++++++++--
1 files changed, 20 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 dde883f..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
@@ -4,6 +4,7 @@
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;
@@ -286,9 +287,12 @@
@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;
@@ -329,6 +333,7 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// WrkDetl wrkDetl = new WrkDetl(
@@ -380,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){
@@ -472,6 +476,20 @@
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