From b6bf5c99a551f042616c184313a9abb9cab1008a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 15:04:18 +0800
Subject: [PATCH] 导入聚乳酸明细时 牌号为161,171,181并且物资类别为改性树脂时指定主体为海正生物，生产车间为一车间
---
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..84b05a5 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());
@@ -87,13 +87,16 @@
// 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 {
@@ -146,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("浜岃溅闂�");
}
@@ -172,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