From da870bd19369d176995dac80d1ae0a537b64d59a Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 16 七月 2025 08:53:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 5 ++++-
src/main/resources/mapper/WrkDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 89cd345..d235049 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -105,7 +105,7 @@
@Value("${wms.url}")
private String wmsUrl;
- public int workNo = 9900;
+ public int workNo = 10000;
public int workNoMax = 12000;
@@ -1711,13 +1711,13 @@
List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
wrkDetls.forEach(wrkDetl -> {
if (wrkMast.getIoType() == 101) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getBatch()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getBatch(),wrkDetl.getSpecs()));
}
if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getBatch()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getBatch(),wrkDetl.getSpecs()));
}
if (wrkMast.getIoType() == 107) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getBatch()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getBatch(),wrkDetl.getSpecs()));
}
});
}
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index b397860..01abeff 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -20,13 +20,16 @@
// 鎵瑰彿
private String batch;
+ private String specs;
+
public MatDto() {
}
- public MatDto(String matnr, String maknx, Double count, String batch) {
+ public MatDto(String matnr, String maknx, Double count, String batch, String specs) {
this.matnr = matnr;
this.maknx = maknx;
this.count = count;
this.batch = batch;
+ this.specs = specs;
}
}
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index a1fd469..cbf88e0 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -27,7 +27,7 @@
</resultMap>
<select id="findByWorkNo" resultMap="BaseResultMap">
- select wrk_no, matnr, maktx, anfme, batch from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
+ select wrk_no, matnr, maktx, anfme, batch,specs from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
</select>
<update id="updateIoTime">
--
Gitblit v1.9.1