From a44e66e91a00405d4651a9b9dd395c35708df5b9 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 七月 2024 15:21:44 +0800
Subject: [PATCH] 找库位逻辑bug修改
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 f302516..a816f62 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
@@ -4,7 +4,9 @@
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;
@@ -197,9 +199,12 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ @ApiModelProperty(value= "璐т富")
+ private String 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,Long hostId) {
+ 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,String owner) {
this.locNo = locNo;
this.zpallet = zpallet;
this.anfme = anfme;
@@ -239,6 +244,7 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// LocDetl locDetl = new LocDetl(
@@ -333,6 +339,19 @@
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