From 111d09d2f3fadf841e3df1c72dfd423ea1c91649 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 14 一月 2022 13:59:30 +0800
Subject: [PATCH] #单据类型区分入库单和出库单
---
src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
index 179c69c..d7df651 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
@@ -206,6 +206,15 @@
// );
+ public String getItemId$(){
+ ItemService bean = SpringUtils.getBean(ItemService.class);
+ Item id = bean.selectOne(new EntityWrapper<Item>()
+ .eq("id", this.itemId));
+ if (!Cools.isEmpty(id)) {
+ return id.getName();
+ }
+ return null;
+ }
public Long getId() {
return id;
}
@@ -246,7 +255,7 @@
if (Cools.isEmpty(this.startTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.startTime);
}
public void setStartTime(Date startTime) {
@@ -261,7 +270,7 @@
if (Cools.isEmpty(this.realStartTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realStartTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realStartTime);
}
public void setRealStartTime(Date realStartTime) {
@@ -276,7 +285,7 @@
if (Cools.isEmpty(this.endTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.endTime);
}
public void setEndTime(Date endTime) {
@@ -291,7 +300,7 @@
if (Cools.isEmpty(this.realEndTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realEndTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realEndTime);
}
public void setRealEndTime(Date realEndTime) {
@@ -392,17 +401,17 @@
this.flowName = flowName;
}
- public String getItemId$(){
- ItemService itemService = SpringUtils.getBean(ItemService.class);
- Item id = itemService.selectOne(new EntityWrapper<Item>()
- .eq("id", this.getItemId()));
- if (!Cools.isEmpty(id)) {
-
- return id.getName();
- }else {
- return null;
- }
- }
+// public String getItemId$(){
+// ItemService itemService = SpringUtils.getBean(ItemService.class);
+// Item id = itemService.selectOne(new EntityWrapper<Item>()
+// .eq("id", this.getItemId()));
+// if (!Cools.isEmpty(id)) {
+//
+// return id.getName();
+// }else {
+// return null;
+// }
+// }
public String getFlowId$(){
FlowStatusService bean = SpringUtils.getBean(FlowStatusService.class);
FlowStatus id = bean.selectOne(new EntityWrapper<FlowStatus>()
--
Gitblit v1.9.1