From b17071a2983415b7a93f8847b6bb496961d40d62 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 28 一月 2024 11:13:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 17 ++++++++++++++---
src/main/resources/application.yml | 2 +-
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index f8e26dc..6194887 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -11,6 +11,7 @@
// 鐗╂枡缂栧彿 瑙勬牸
private String matNo;
+ private String matnr;
// 鐗╂枡鍚嶇О 瑙勬牸
private String maknx;
@@ -25,10 +26,14 @@
private String model;
//鍗峰彿
- private String juanNo;
+// private String juanNo;
+ private String price;
+ private String orderNo;
// 鐗╂枡鏁伴噺
private Double count;
+ private Double weight;
+ private Double volume;
public MatDto() {
}
@@ -47,10 +52,16 @@
}
public MatDto(WrkDetl wrkDetl) {
this.matNo = wrkDetl.getMatnr();
+ this.matnr = wrkDetl.getMatnr();
this.maknx = wrkDetl.getMaktx();
- this.specs = wrkDetl.getMatnr();
+ this.specs = wrkDetl.getSpecs();
this.batch = wrkDetl.getBatch();
- this.juanNo = wrkDetl.getSku();
+ this.model = wrkDetl.getModel();
+ this.price = wrkDetl.getPrice().toString();
+// this.juanNo = wrkDetl.getSku();
this.count = wrkDetl.getAnfme();
+ this.weight = wrkDetl.getWeight();
+ this.volume = wrkDetl.getVolume();
+ this.orderNo = wrkDetl.getOrderNo();
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eebedc9..d53c4d1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=srjtasrs
+ url: jdbc:sqlserver://localhost:49977;databasename=srjtasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1