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 | 15 +++++++++++++++
zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js | 1 +
2 files changed, 16 insertions(+), 0 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..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
@@ -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;
@@ -333,6 +335,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);
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js b/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
index f0a85c9..76a0046 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
@@ -5,6 +5,7 @@
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ ,{field: 'orderType', align: 'center',title: '鍗曟嵁绫诲瀷', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', width: 100}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
--
Gitblit v1.9.1