From dc8367b8e744f9f02b606597a2c3a3b0783afc19 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:44:47 +0800
Subject: [PATCH] 地图数据json文件改为常量存储
---
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index fff1643..e971964 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -73,7 +73,7 @@
if(Cools.isEmpty(excel.getBatch()) || Cools.isEmpty(excel.getPackageNo())){
throw new CoolException("绗�" + index++ + "鏁版嵁閿欒锛屽寘鍙锋垨鑰呮壒鍙蜂负绌�");
}
- Pla pla = plaService.selectByBatchAndPackageNo(excel.getBatch(),excel.getPackageNo());
+ Pla pla = plaService.selectByBatchAndPackageNo(excel.getBatch(),excel.getPackageNo(),excel.getBrand());
if (pla == null) {
pla = plaCreate(pla,excel,matService,nodeService);
pla.setCreateTime(new Date());
@@ -93,7 +93,9 @@
excel.setStatus(pla.getStatus());
excel.setPakinTime(pla.getPakinTime());
excel.setStash(pla.getStash());
- excel.setLocNo(pla.getLocNo());
+ if(Cools.isEmpty(excel.getLocNo())){
+ excel.setLocNo(pla.getLocNo());
+ }
BeanUtils.copyProperties(excel,pla);
pla = plaCreate(pla,excel,matService,nodeService);
try {
--
Gitblit v1.9.1