From 62ffb5697252f566d221a9caf548811520437a11 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 18 十二月 2024 10:51:42 +0800
Subject: [PATCH] #加字段
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 9 +++++++++
src/main/webapp/static/image/logo-bai.png | 0
src/main/java/com/zy/asrs/entity/OrderDetl.java | 9 +++++++++
src/main/java/com/zy/asrs/entity/LocDetl.java | 9 +++++++++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 9 +++++++++
src/main/java/com/zy/common/model/DetlDto.java | 14 +++++++++++---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 +++++---
src/main/webapp/static/image/logo.png | 0
8 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 0e32867..59974a3 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -158,6 +158,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp1;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp2;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp3;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp4;
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f08621d..a7b0338 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -295,6 +295,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp1;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp2;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp3;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp4;
+
public OrderDetl() {}
public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, 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, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 349a127..dc93a16 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -269,6 +269,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp1;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp2;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp3;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp4;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 22321c2..bdf4453 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -269,6 +269,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp1;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp2;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp3;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp4;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 46d3e6d..da1864d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -114,7 +114,8 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo(), detail.getMark(),detail.getCustomer(),detail.getSuppName());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
+ , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -144,7 +145,7 @@
orderDetl.setSuppCode(detlDto.getFromOrderNo());
orderDetl.setMemo(detlDto.getMemo());
orderDetl.setManu(detlDto.getMark());
- orderDetl.setSupp(detlDto.getSuppName());
+ orderDetl.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
orderDetl.setSku(detlDto.getCustomer());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -255,7 +256,8 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo(), detail.getMark(),detail.getCustomer(),detail.getSuppName());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
+ , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index fafced2..d6d2cc3 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,13 +21,17 @@
private String fromOrderNo; //鏉ユ簮鍗曞彿
private String memo; //澶囨敞
private String mark;
- private String customer;
- private String suppName = "";
+ private String customer = ""; //瀹㈡埛鍚嶇О
+ private String suppName = ""; //渚涘簲鍟�
+ private String temp1 = "";
+ private String temp2 = "";
+ private String temp3 = "";
+ private String temp4 = "";
public DetlDto() {
}
- public DetlDto(String matnr, String batch, Double anfme,String fromOrderNo,String mark,String customer,String suppName) {
+ public DetlDto(String matnr, String batch, Double anfme,String fromOrderNo,String mark,String customer,String suppName,String temp1,String temp2,String temp3,String temp4) {
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
@@ -35,6 +39,10 @@
this.mark = mark;
this.customer = customer;
this.suppName = suppName;
+ this.temp1 = temp1;
+ this.temp2 = temp2;
+ this.temp3 = temp3;
+ this.temp4 = temp4;
}
public DetlDto(String matnr, Double anfme) {
diff --git a/src/main/webapp/static/image/logo-bai.png b/src/main/webapp/static/image/logo-bai.png
new file mode 100644
index 0000000..21a19b9
--- /dev/null
+++ b/src/main/webapp/static/image/logo-bai.png
Binary files differ
diff --git a/src/main/webapp/static/image/logo.png b/src/main/webapp/static/image/logo.png
index 7b00fa9..df4e153 100644
--- a/src/main/webapp/static/image/logo.png
+++ b/src/main/webapp/static/image/logo.png
Binary files differ
--
Gitblit v1.9.1