From 64d50dea0a2d166e13dc818f7c6a95394f208860 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 21 二月 2024 09:47:10 +0800
Subject: [PATCH] #显示器更新
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 10 ++++++++--
src/main/resources/mapper/WrkDetlMapper.xml | 1 +
src/main/resources/mapper/WrkDetlLogMapper.xml | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++++--
src/main/java/com/zy/asrs/entity/WrkDetl.java | 10 ++++++++--
5 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 39ea4d5..c0e078f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -35,12 +35,18 @@
private Date ioTime;
/**
- * 鏁伴噺
+ * 浣滀笟鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value= "浣滀笟鏁伴噺")
private Double anfme;
/**
+ * 鎬诲簱瀛�
+ */
+ @ApiModelProperty(value= "鎬诲簱瀛�")
+ private Double stock;
+
+ /**
* 鎵樼洏鏉＄爜
*/
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index d33a855..bed2968 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -42,12 +42,18 @@
private Date ioTime;
/**
- * 鏁伴噺
+ * 浣滀笟鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value= "浣滀笟鏁伴噺")
private Double anfme;
/**
+ * 鎬诲簱瀛�
+ */
+ @ApiModelProperty(value= "鎬诲簱瀛�")
+ private Double stock;
+
+ /**
* 鎵樼洏鏉＄爜
*/
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
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 ee8db79..196cdcd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3061,13 +3061,17 @@
if (locDetls.isEmpty() && ioType != 101) {
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
wrkDetls.forEach(wrkDetl -> {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
+ if (wrkDetl.getAnfme() > 0D) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
+ }
});
if (wrkDetls.isEmpty()) {//浠庡巻鍙叉。鏌ヨ
List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
+ if (wrkDetlLog.getAnfme() > 0D) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
+ }
}
}
}
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 12f44aa..ec5aa8d 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -7,6 +7,7 @@
<result column="wrk_no" property="wrkNo" />
<result column="io_time" property="ioTime" />
<result column="anfme" property="anfme" />
+ <result column="stock" property="stock" />
<result column="zpallet" property="zpallet" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index a018a72..644b20c 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -7,6 +7,7 @@
<result column="wrk_no" property="wrkNo" />
<result column="io_time" property="ioTime" />
<result column="anfme" property="anfme" />
+ <result column="stock" property="stock" />
<result column="zpallet" property="zpallet" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
--
Gitblit v1.9.1