From 64a8b0a765706cf7e1831f7559f6c59ed00dbde0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 25 六月 2024 09:02:38 +0800
Subject: [PATCH] # led显示
---
src/main/java/com/zy/common/model/MatDto.java | 3 ++-
src/main/resources/mapper/WrkDetlMapper.xml | 2 +-
src/main/java/com/zy/core/thread/LedThread.java | 5 ++---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
4 files changed, 6 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 87c8a27..51f2611 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1650,7 +1650,7 @@
// ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
- wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getSpecs(),wrkDetl.getBatch())));
+ wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getSpecs(),wrkDetl.getBatch(),wrkDetl.getMemo())));
}
commands.add(ledCommand);
}
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 3016567..d443b17 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -40,12 +40,13 @@
this.maknx = maknx;
this.count = count;
}
- public MatDto(String matNo, String maknx, Double count,String specs,String batch) {
+ public MatDto(String matNo, String maknx, Double count,String specs,String batch, String memo) {
this.batch = batch;
this.specs = specs;
this.matnr = matNo;
this.maknx = maknx;
this.count = count;
+ this.total = Double.valueOf(memo);
}
public MatDto(String matNo, String maknx, Double count,Double total,String specs) {
this.specs = specs;
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 966b3ae..75a0f53 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -120,12 +120,11 @@
String strQty = matDto.getCount().toString();
int idx = strQty.lastIndexOf(".");
if(idx >= 0){
- strQty.substring(0,idx);
+ strQty = strQty.substring(0,idx);
}
- page.newLine(matDto.getBatch() + "[鏁伴噺" + strQty +"]");
-
page.newLine(matDto.getMatnr());
page.newLine(matDto.getMaknx());
+ page.newLine("[鏁伴噺锛�" + strQty + "/" + matDto.getTotal().intValue()+"]");
// page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
}
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 715d0c3..0337c60 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -28,7 +28,7 @@
</resultMap>
<select id="findByWorkNo" resultMap="BaseResultMap">
- select wrk_no, mat_no as matnr, mat_name as maktx, qty as anfme ,specs, supplier as batch from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
+ select wrk_no, mat_no as matnr, mat_name as maktx, qty as anfme ,specs, supplier as batch,memo from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
</select>
<update id="updateIoTime">
--
Gitblit v1.9.1