From 5fc438a3adb8c2f52dac7786e5ee4a6564f82d70 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 05 七月 2024 18:35:10 +0800
Subject: [PATCH] #库存明细显示单据类型
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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 febd9af..d3150b6 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;
/**
* 搴撲綅鍙�
@@ -187,14 +194,14 @@
private String memo;
/**
- * 浠撳簱ID
+ * 鎺堟潈鍟嗘埛
*/
- @ApiModelProperty(value= "浠撳簱ID")
+ @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
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) {
this.locNo = locNo;
this.zpallet = zpallet;
this.anfme = anfme;
@@ -233,6 +240,7 @@
this.appeUser = appeUser;
this.appeTime = appeTime;
this.memo = memo;
+ this.hostId = hostId;
}
// LocDetl locDetl = new LocDetl(
@@ -273,7 +281,8 @@
// null, // 淇敼鏃堕棿
// null, // 鍒涘缓鑰�
// null, // 娣诲姞鏃堕棿
-// null // 澶囨敞
+// null, // 澶囨敞
+// null // 鎺堟潈鍟嗘埛
// );
public String getLocNo$(){
@@ -317,5 +326,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