From 133848ee1872b889ab5357db88f77d80e7084a3b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 03 六月 2024 16:31:01 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 1 +
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java | 7 +++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java | 3 ++-
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
index 21db862..2023165 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.zy.asrs.common.wms.entity.Mat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -20,4 +21,10 @@
@ExcelProperty(index = 1, value = "浜岀骇鍒嗙被")
private String secClass;
+ @ExcelProperty(index = 2, value = "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ @ExcelProperty(index = 3, value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
index 231555a..6e5237a 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
@@ -129,10 +129,11 @@
tagId = tagService.getTop(hostId).getId();
}
// 鍟嗗搧
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()));
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()).eq(Mat::getHostId, hostId));
if (mat == null) {
mat = excel;
mat.setTagId(tagId);
+ mat.setHostId(hostId);
if (!matService.save(mat)) {
throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index 83f7b0f..4612333 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.zy.asrs.common.wms.service.TagService;
import org.springframework.format.annotation.DateTimeFormat;
--
Gitblit v1.9.1