From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:45:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureUploadListener.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureUploadListener.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureUploadListener.java
index 89d7a99..a923db7 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureUploadListener.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureUploadListener.java
@@ -21,16 +21,14 @@
* 鍋囪杩欎釜鏄竴涓狣AO锛屽綋鐒舵湁涓氬姟閫昏緫杩欎釜涔熷彲浠ユ槸涓�涓猻ervice銆傚綋鐒跺鏋滀笉鐢ㄥ瓨鍌ㄨ繖涓璞℃病鐢ㄣ��
*/
private StructureService structureService;
- private DictUtils dictUtils;
/**
* 濡傛灉浣跨敤浜唖pring,璇蜂娇鐢ㄨ繖涓瀯閫犳柟娉曘�傛瘡娆″垱寤篖istener鐨勬椂鍊欓渶瑕佹妸spring绠＄悊鐨勭被浼犺繘鏉�
*
* @param structureService
*/
- public StructureUploadListener(StructureService structureService,DictUtils dictUtils) {
+ public StructureUploadListener(StructureService structureService) {
this.structureService = structureService;
- this.dictUtils = dictUtils;
}
/**
@@ -41,23 +39,6 @@
*/
@Override
public void invoke(StructureData data, AnalysisContext context) {
- Map<String, String> dicbomtype = dictUtils.getDicKey("bom_type_db");
- if (StringUtils.isEmpty(data.getAlternativeNo())) {
- data.setAlternativeNo("*");
- }
- //if (StringUtils.isEmpty(data.getChildPartNo()) || StringUtils.isEmpty(data.getChildVersion()) || StringUtils.isEmpty(data.getFatherPartNo()) || StringUtils.isEmpty(data.getFatherVersion())) {
- // throw new RuntimeException("缂哄皯闆朵欢鏁版嵁缂栧彿鎴栬�呯増鏈�");
- //}
- //if (StringUtils.isEmpty(data.getQpa())) {
- // throw new RuntimeException("缂哄皯鏁伴噺");
- //}
- //if (StringUtils.isEmpty(data.getLineItemNo())) {
- // throw new RuntimeException("缂哄皯琛岄」鍙�");
- //}
- //if (StringUtils.isEmpty(data.getOperationName())) {
- // throw new RuntimeException("缂哄皯宸ュ簭");
- //}
- data.setStructureType(StringUtils.isEmpty(data.getStructureType()) ? "M" : dicbomtype.get(data.getStructureType()));
list.add(data);
// 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
if (list.size() >= BATCH_COUNT) {
--
Gitblit v1.9.3