From 66706d2019bbf43236ed66748fb101a3e9f6b30a Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 26 Sep 2022 15:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/StockOrderDetailController.java | 6 +-- .../controller/inout/OrderController.java | 6 ++- .../impl/UdiInfoImportDetailServiceImpl.java | 52 +++++++------------ .../info/SystemParamConfigService.java | 5 ++ .../impl/SystemParamConfigServiceImpl.java | 25 +++++++++ .../glxp/api/admin/thread/DlBasicService.java | 15 +++--- .../src/main/resources/application.properties | 2 +- 7 files changed, 63 insertions(+), 48 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index 8dd8434a..2da47fdf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -422,11 +422,7 @@ public class StockOrderDetailController { if (code.length() > 13) { String tStr = code.substring(0, 2); if (tStr.contains("MA") || tStr.contains("#") || tStr.contains("01")) { - try { - udiEntity = FilterUdiUtils.getUdi(code); - } catch (Exception e) { - - } + udiEntity = FilterUdiUtils.getUdi(code); } } StockOrderDetailQueryProductResponse stockOrderDetailQueryProductResponse = new StockOrderDetailQueryProductResponse(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 5017732e..65b90b2b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -376,7 +376,11 @@ public class OrderController { } else { if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) { - transferOrder(orderEntity, entrustReceEntity); + + if (StrUtil.isEmpty(entrustReceEntity.getAction())) { + transferOrder(orderEntity, entrustReceEntity); + } + } if (!entrustReceEntity.isFinishRece()) { StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java index 5adfe5c3..a9d7c262 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java @@ -83,15 +83,12 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic //基础表导入 SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) { - try { - List corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities(); - UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); - for (UdiInfoEntity basicUnitMaintainEntity : corpList) { - mapper.insertUdiInfo(basicUnitMaintainEntity); - } - batchSession.commit(); - } catch (Exception e) { + List corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities(); + UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); + for (UdiInfoEntity basicUnitMaintainEntity : corpList) { + mapper.insertUdiInfo(basicUnitMaintainEntity); } + batchSession.commit(); } batchSession.close(); // udiInfoDao.importUdiInfo(udiRelevanceExportJsonResponse.getUdiInfoEntities()); @@ -101,15 +98,12 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic //关联表导入 if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiRelevanceEntities())) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); - try { - List corpList = udiRelevanceExportJsonResponse.getUdiRelevanceEntities(); - UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class); - for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) { - mapper.insertUdiRelevance(basicUnitMaintainEntity); - } - batchSession.commit(); - } catch (Exception e) { + List corpList = udiRelevanceExportJsonResponse.getUdiRelevanceEntities(); + UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class); + for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) { + mapper.insertUdiRelevance(basicUnitMaintainEntity); } + batchSession.commit(); batchSession.close(); // udiRelevanceDao.importUdiRelevance(udiRelevanceExportJsonResponse.getUdiRelevanceEntities()); } @@ -118,15 +112,12 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getThrProductsEntities())) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); - try { - List corpList = udiRelevanceExportJsonResponse.getThrProductsEntities(); - ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class); - for (ThrProductsEntity basicUnitMaintainEntity : corpList) { - mapper.insertThrProducts(basicUnitMaintainEntity); - } - batchSession.commit(); - } catch (Exception e) { + List corpList = udiRelevanceExportJsonResponse.getThrProductsEntities(); + ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class); + for (ThrProductsEntity basicUnitMaintainEntity : corpList) { + mapper.insertThrProducts(basicUnitMaintainEntity); } + batchSession.commit(); batchSession.close(); // thrProductsDao.importThrProductss(udiRelevanceExportJsonResponse.getThrProductsEntities()); } @@ -135,15 +126,12 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getCompanyProductRelevanceEntities())) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); - try { - List companyProductRelevanceEntities = udiRelevanceExportJsonResponse.getCompanyProductRelevanceEntities(); - CompanyProductRelevanceDao mapper = batchSession.getMapper(CompanyProductRelevanceDao.class); - for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) { - mapper.importCompanyProductRelevance(companyProductRelevanceEntity); - } - batchSession.commit(); - } catch (Exception e) { + List companyProductRelevanceEntities = udiRelevanceExportJsonResponse.getCompanyProductRelevanceEntities(); + CompanyProductRelevanceDao mapper = batchSession.getMapper(CompanyProductRelevanceDao.class); + for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) { + mapper.importCompanyProductRelevance(companyProductRelevanceEntity); } + batchSession.commit(); batchSession.close(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java index f46d337e..e5680133 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java @@ -6,6 +6,7 @@ import com.glxp.api.admin.req.info.SystemParamConfigRequest; import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; import java.util.List; +import java.util.Map; public interface SystemParamConfigService { @@ -29,4 +30,8 @@ public interface SystemParamConfigService { boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest); boolean insert(SystemParamConfigEntity systemParamConfigEntity); + + Map findBasicAll(); + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java index 4c34b5c9..91a5f954 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.service.info.impl; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.schedule.SystemParamConfigDao; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; @@ -9,7 +10,9 @@ import com.glxp.api.admin.service.info.SystemParamConfigService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class SystemParamConfigServiceImpl implements SystemParamConfigService { @@ -78,4 +81,26 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { return systemParamConfigDao.insert(systemParamConfigEntity); } + + + + @Override + public Map findBasicAll() { + + SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest(); + systemParamConfigRequest.setParamType(2); + systemParamConfigRequest.setParamStatus(1); + + List systemParamConfigEntities = queryPage(systemParamConfigRequest); + Map systemParamConfigEntityMap = new HashMap<>(); + + if (CollUtil.isNotEmpty(systemParamConfigEntities)) { + for (SystemParamConfigEntity systemParamConfigEntity : systemParamConfigEntities) { + systemParamConfigEntityMap.put(systemParamConfigEntity.getParamKey(), systemParamConfigEntity); + } + } + + return systemParamConfigEntityMap; + + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index 3ce629e2..46d0c2bd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -208,16 +208,13 @@ public class DlBasicService { //耗材字典导入 if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) { if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) { - try { - List corpList = syncDataResponse.getUdiInfoEntities(); - UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); - for (UdiInfoEntity udiInfoEntity : corpList) { - mapper.insertUdiInfo(udiInfoEntity); - } - batchSession.commit(); - remark.append("耗材字典：").append(syncDataResponse.getUdiInfoEntities().size()).append("条\n"); - } catch (Exception e) { + List corpList = syncDataResponse.getUdiInfoEntities(); + UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); + for (UdiInfoEntity udiInfoEntity : corpList) { + mapper.insertUdiInfo(udiInfoEntity); } + batchSession.commit(); + remark.append("耗材字典：").append(syncDataResponse.getUdiInfoEntities().size()).append("条\n"); } } diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index 3ff5cc7c..cb3acd23 100644 --- a/api-admin/src/main/resources/application.properties +++ b/api-admin/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=test2 +spring.profiles.active=test1 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver