From fe4646d6fe6144c8e1e1a13a999e6947f9d35640 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 08:41:32 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 1 +
src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java | 1 +
src/main/resources/application.yml | 2 +-
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index 6c63f2c..a379794 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -300,6 +300,7 @@
itemsDTO.setRealdeAmt(item.getRealdeAmt());
itemsDTO.setPlaninAmt(item.getPlaninAmt());
itemsDTO.setRealinAmt(item.getRealinAmt());
+ itemsDTO.setType(item.getType());
List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
.eq("item_id", item.getId()));
for (ProjectPlan projectPlan : allPlans) {
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java b/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
index 6f68f99..08ee5e9 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
@@ -18,4 +18,5 @@
private Double realdeAmt;
private Double planinAmt;
private Double realinAmt;
+ private String type;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 74938e2..27e1ab9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -17,7 +17,7 @@
# url: jdbc:sqlserver://127.0.0.1:51433;databasename=zypms
# username: sa
# password: Zoneyung@zy56$
- url: jdbc:sqlserver://localhost:1433;databasename=zypms
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1