From 8e7fb1ba67eedeb4d1ab0899e0ae7bfc559adcf0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 31 五月 2024 20:36:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 ++++++++++++++++++--
src/main/resources/mapper/MatMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/Mat.java | 7 +++++++
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 909108a..48feb8e 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -305,6 +305,13 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 鏃у晢鍝佺紪鍙�
+ */
+ @ApiModelProperty(value= "鏃у晢鍝佺紪鍙�")
+ @ExcelProperty(value = "鏃у晢鍝佺紪鐮�")
+ private String matnr2;
+
public Mat() {}
public Mat(String uuid, Long tagId, String matnr, String maktx, String name, 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/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index b342bbe..1786c7a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -112,6 +112,8 @@
private NavigateMapUtils navigateMapUtils;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private MatService matService;
/**
@@ -2998,7 +3000,14 @@
if (remainNum < 0) {
remainNum = 0;
}
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), remainNum, wrkDetl.getSpecs(), wrkDetl.getSuppCode(), wrkDetl.getOrderNo()));
+ String matnr = wrkDetl.getMatnr();
+ Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
+ if (mat != null) {
+ if (!mat.getMatnr().equals(mat.getMatnr2())) {
+ matnr += " - " + mat.getMatnr2();
+ }
+ }
+ ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetl.getMaktx(), wrkDetl.getAnfme(), remainNum, wrkDetl.getSpecs(), wrkDetl.getSuppCode(), wrkDetl.getOrderNo()));
});
}else {
List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
@@ -3007,7 +3016,14 @@
if (remainNum < 0) {
remainNum = 0;
}
- ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), remainNum, wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
+ String matnr = wrkDetlLog.getMatnr();
+ Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr());
+ if (mat != null) {
+ if (!mat.getMatnr().equals(mat.getMatnr2())) {
+ matnr += " - " + mat.getMatnr2();
+ }
+ }
+ ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), remainNum, wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
}
}
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index de34655..0db0e77 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -44,6 +44,7 @@
<result column="memo" property="memo" />
<result column="stock" property="stock" />
+ <result column="matnr2" property="matnr2" />
</resultMap>
<select id="selectByMatnr" resultMap="BaseResultMap">
--
Gitblit v1.9.1