From 8665f2f7f1dd64787b0b62fe1f76a22ccbfd3f24 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 15:32:13 +0800
Subject: [PATCH] 聚乳酸明细分页限制最多500条数据
---
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index e971964..84b05a5 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -87,12 +87,13 @@
// 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.setStockFreeze(pla.getStockFreeze());
if(Cools.isEmpty(excel.getLocNo())){
excel.setLocNo(pla.getLocNo());
}
@@ -148,7 +149,10 @@
pla.setWorkshop("涓夎溅闂�");
}
}else if ("鏀规�ф爲鑴�".equals(pla.getType())){
- if ("01".equals(line) || "02".equals(line) || "03".equals(line) || "04".equals(line)){
+ if (pla.getBrand() != null && (pla.getBrand().equals("161") || pla.getBrand().equals("171") || pla.getBrand().equals("181"))) {
+ pla.setOwner(OWNER_HZ);
+ pla.setWorkshop("涓�杞﹂棿");
+ } else if ("01".equals(line) || "02".equals(line) || "03".equals(line) || "04".equals(line)){
pla.setOwner(OWNER_HNE);
pla.setWorkshop("浜岃溅闂�");
}
@@ -174,7 +178,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