From 996c93b444d441373b81cfdebcc9cc47e097b8d6 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 27 一月 2026 16:35:01 +0800
Subject: [PATCH] 新增海创达主体
---
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index 84b05a5..8f145dd 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -29,6 +29,7 @@
private static final String OWNER_HZ = "娴锋鐢熺墿";
private static final String OWNER_HNE = "娴疯灏�";
+ private static final String OWNER_HCD = "娴峰垱杈�";
private int total = 0;
private int index = 1;
@@ -107,6 +108,41 @@
throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屾壒鍙凤細" + excel.getBatch() + ", 鍖呭彿锛�" + excel.getPackageNo() + "鍘熷洜涓猴細" + e.getMessage());
}
total++;
+ } else if (Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_2) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_4)) {
+ // 琛ヤ紶璐ㄩ噺鎸囨爣
+ pla.setProDate(excel.getProDate());
+ pla.setWeight(excel.getWeight());
+ pla.setPackageType(excel.getPackageType());
+ pla.setZpalletType(excel.getZpalletType());
+ pla.setFingerMelting(excel.getFingerMelting());
+ pla.setWater(excel.getWater());
+ pla.setFusingPoint(excel.getFusingPoint());
+ pla.setVadf1(excel.getVadf1());
+ pla.setVadf2(excel.getVadf2());
+ pla.setYellowness(excel.getYellowness());
+ pla.setOpacity(excel.getOpacity());
+ pla.setLactideContent(excel.getLactideContent());
+ pla.setL(excel.getL());
+ pla.setA(excel.getA());
+ pla.setB(excel.getB());
+ pla.setFillIn(excel.getFillIn());
+ pla.setStr1(excel.getStr1());
+ pla.setStr2(excel.getStr2());
+ pla.setStr3(excel.getStr3());
+ pla.setStr4(excel.getStr4());
+ pla.setStr5(excel.getStr5());
+ pla.setStr6(excel.getStr6());
+ pla.setMassState(excel.getMassState());
+ pla.setProblem(excel.getProblem());
+ pla.setModifyTime(now);
+ 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());
+ }
+ total++;
}
}
@@ -140,10 +176,13 @@
}
if(Cools.isEmpty(pla.getOwner()) && Cools.isEmpty(pla.getWorkshop())){
- if("绾爲鑴�".equals(pla.getType())){
+ if("绾爲鑴�".equals(pla.getType()) || "鍓骇鐗�".equals(pla.getType()) || "鏈哄ご鏂�".equals(pla.getType())){
if("01".equals(line) || "02".equals(line)){
pla.setOwner(OWNER_HZ);
pla.setWorkshop("涓�杞﹂棿");
+ } else if("07".equals(line) || "08".equals(line)) {
+ pla.setOwner(OWNER_HCD);
+ pla.setWorkshop("涓冭溅闂�");
}else {
pla.setOwner(OWNER_HNE);
pla.setWorkshop("涓夎溅闂�");
@@ -184,6 +223,9 @@
if(Cools.isEmpty(mat)){
throw new CoolException("鏃犳硶鎵惧埌瀵瑰簲鐨勭墝鍙蜂俊鎭紝鐗屽彿=" + pla.getBrand());
}
+ if (!Cools.isEmpty(excel.getProblem()) && excel.getProblem().contains("瀹為獙鏂�")) {
+ excel.setMassState("瀹為獙鏂�");
+ }
pla.setMatnr(mat.getMatnr());
try {
if(Cools.isEmpty(pla.getType())){
--
Gitblit v1.9.1