From 3babe039d11eeadeace6e4a8c8505b4270592b69 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 07 二月 2025 08:32:43 +0800
Subject: [PATCH] 登录页去除字体加载
---
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index 4cf7385..9f46630 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -18,10 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by vincent on 2019-11-25
@@ -35,6 +32,7 @@
private int total = 0;
private int index = 1;
+ private String recordLog = "";
private Long userId;
public PlaExcelListener() {
@@ -69,14 +67,16 @@
MatService matService = SpringUtils.getBean(MatService.class);
Date now = new Date();
+
+
// 鍟嗗搧
if(Cools.isEmpty(excel.getBatch()) || Cools.isEmpty(excel.getPackageNo())){
- return;
+ 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());
- plaCreate(pla,excel,matService,nodeService);
try {
plaService.insert(pla);
}catch (Exception e){
@@ -87,17 +87,21 @@
// throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
// }
total++;
- }else if(Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_00)){
+ }else if(Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_00) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1) ){
excel.setId(pla.getId());
excel.setCreateTime(pla.getCreateTime());
excel.setStatus(pla.getStatus());
excel.setPakinTime(pla.getPakinTime());
excel.setStash(pla.getStash());
- excel.setLocNo(pla.getLocNo());
+ excel.setStockFreeze(pla.getStockFreeze());
+ if(Cools.isEmpty(excel.getLocNo())){
+ excel.setLocNo(pla.getLocNo());
+ }
BeanUtils.copyProperties(excel,pla);
pla = plaCreate(pla,excel,matService,nodeService);
try {
plaService.updateById(pla);
+ recordLog = recordLog + index + "," + pla.getBatch() + "," + pla.getPackageNo() + ";" ;
}catch (Exception e){
log.error("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屾壒鍙凤細" + excel.getBatch() + ", 鍖呭彿锛�" + excel.getPackageNo() + "鍘熷洜涓猴細" + e.getMessage());
throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屾壒鍙凤細" + excel.getBatch() + ", 鍖呭彿锛�" + excel.getPackageNo() + "鍘熷洜涓猴細" + e.getMessage());
@@ -171,7 +175,7 @@
pla.setStep(2);
pla.setModifyTime(new Date());
pla.setStatus(GlobleParameter.PLA_STATUS_00);
- pla.setStockFreeze(1);
+ pla.setStockFreeze(Cools.isEmpty(excel.getStockFreeze()) ? 1 : excel.getStockFreeze());
pla.setWeightAnfme(pla.getWeight());
Mat mat = matService.selectByMaktx(pla.getBrand());
if(Cools.isEmpty(mat)){
--
Gitblit v1.9.1