From cd146ec4e1f80c6666d7696f75c060c052145d30 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 20:59:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/FinFileController.java | 17
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 4
consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java | 31
consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java | 67 +++
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 17
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 6
consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java | 4
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 17
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 7
consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java | 151 ++++---
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 3
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java | 20
consum-base/src/main/java/com/consum/base/service/impl/FinFileServiceImpl.java | 15
consum-base/src/main/java/com/consum/base/service/impl/FinSysServerServiceImpl.java | 14
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 4
consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQry.java | 1
consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java | 20
consum-base/src/main/java/com/consum/base/cache/LocalFinOrgCache.java | 7
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 8
consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java | 27 +
consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 4
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 13
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 28
consum-base/src/main/java/com/consum/base/cache/RedisFinOrgCache.java | 6
consum-base/src/main/java/com/consum/base/service/FinSysServerService.java | 35 +
consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java | 13
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java | 37 +
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 5
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 23
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 4
consum-base/src/main/java/com/consum/base/core/utils/DateUtil.java | 10
consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java | 4
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateService.java | 103 +++++
/dev/null | 103 -----
deploy-jar-single/src/main/resources/import/出库单.xls | 0
consum-base/src/main/java/com/consum/base/service/FinFileService.java | 8
consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java | 20
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java | 25
consum-base/src/main/java/com/consum/base/service/FinOrgService.java | 16
consum-base/src/main/java/com/consum/base/service/impl/FinOrgServiceImpl.java | 33 +
consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java | 19
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 54 ++
consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsService.java | 64 +++
consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java | 8
consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService1.java | 8
47 files changed, 738 insertions(+), 349 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/cache/LocalFinOrgCache.java b/consum-base/src/main/java/com/consum/base/cache/LocalFinOrgCache.java
index b5ac8a2..08cd322 100644
--- a/consum-base/src/main/java/com/consum/base/cache/LocalFinOrgCache.java
+++ b/consum-base/src/main/java/com/consum/base/cache/LocalFinOrgCache.java
@@ -2,12 +2,11 @@
import com.consum.base.Constants;
import com.consum.base.FinOrgCacheProvider;
-import com.consum.base.service.FinOrgServiceImpl;
+import com.consum.base.service.FinOrgService;
import com.consum.model.po.FinSysOrg;
import com.walker.cache.AbstractCacheProvider;
import com.walker.cache.Cache;
import com.walker.infrastructure.utils.StringUtils;
-
import java.util.List;
/**
@@ -60,9 +59,9 @@
return FinSysOrg.class;
}
- public void setFinOrgService(FinOrgServiceImpl finOrgService) {
+ public void setFinOrgService(FinOrgService finOrgService) {
this.finOrgService = finOrgService;
}
- private FinOrgServiceImpl finOrgService;
+ private FinOrgService finOrgService;
}
diff --git a/consum-base/src/main/java/com/consum/base/cache/RedisFinOrgCache.java b/consum-base/src/main/java/com/consum/base/cache/RedisFinOrgCache.java
index d194649..97faf7f 100644
--- a/consum-base/src/main/java/com/consum/base/cache/RedisFinOrgCache.java
+++ b/consum-base/src/main/java/com/consum/base/cache/RedisFinOrgCache.java
@@ -2,7 +2,7 @@
import com.consum.base.Constants;
import com.consum.base.FinOrgCacheProvider;
-import com.consum.base.service.FinOrgServiceImpl;
+import com.consum.base.service.FinOrgService;
import com.consum.model.po.FinSysOrg;
import com.walker.support.redis.cache.RedisCacheProvider;
@@ -57,10 +57,10 @@
return FinSysOrg.class;
}
- public void setFinOrgService(FinOrgServiceImpl finOrgService) {
+ public void setFinOrgService(FinOrgService finOrgService) {
this.finOrgService = finOrgService;
}
- private FinOrgServiceImpl finOrgService;
+ private FinOrgService finOrgService;
}
diff --git a/consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java b/consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java
index d152b91..1179225 100644
--- a/consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java
+++ b/consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java
@@ -8,7 +8,7 @@
import com.consum.base.cache.LocalFinSysTenantCache;
import com.consum.base.cache.LocalFinSysTenantUserCache;
import com.consum.base.cache.LocalTokenCache;
-import com.consum.base.service.FinOrgServiceImpl;
+import com.consum.base.service.FinOrgService;
import com.consum.base.service.FinSysTenantServiceImpl;
import com.consum.base.service.FinSysTenantUserServiceImpl;
import com.iplatform.base.config.CacheConfiguration;
@@ -27,7 +27,7 @@
* @date 2023-07-05
*/
@Bean
- public FinOrgCacheProvider finOrgCacheProvider(FinOrgServiceImpl finOrgService){
+ public FinOrgCacheProvider finOrgCacheProvider(FinOrgService finOrgService){
LocalFinOrgCache cache = new LocalFinOrgCache();
cache.setFinOrgService(finOrgService);
return cache;
diff --git a/consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java b/consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java
index 7bc787f..b9665c6 100644
--- a/consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java
+++ b/consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java
@@ -8,7 +8,7 @@
import com.consum.base.cache.RedisFinSysTenantCache;
import com.consum.base.cache.RedisFinSysTenantUserCache;
import com.consum.base.cache.RedisTokenCache;
-import com.consum.base.service.FinOrgServiceImpl;
+import com.consum.base.service.FinOrgService;
import com.consum.base.service.FinSysTenantServiceImpl;
import com.consum.base.service.FinSysTenantUserServiceImpl;
import com.iplatform.base.config.CacheConfiguration;
@@ -35,7 +35,7 @@
* @date 2023-07-05
*/
@Bean
- public FinOrgCacheProvider finOrgCacheProvider(RedisHelper redisHelper, FinOrgServiceImpl finOrgService){
+ public FinOrgCacheProvider finOrgCacheProvider(RedisHelper redisHelper, FinOrgService finOrgService){
RedisFinOrgCache cache = new RedisFinOrgCache();
cache.setRedisHelper(redisHelper);
cache.setFinOrgService(finOrgService);
diff --git a/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java b/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java
index 0b28684..a282ed8 100644
--- a/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java
+++ b/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java
@@ -3,15 +3,14 @@
import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult;
import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler;
import com.consum.base.pojo.WarnConfImEntity;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseGoodsModelsService;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;
import com.consum.model.po.BaseWarehouse;
import com.iplatform.core.BeanContextAware;
import com.walker.infrastructure.utils.CollectionUtils;
-
import java.util.HashMap;
import java.util.List;
import java.util.StringJoiner;
@@ -29,16 +28,16 @@
private HashMap<String, Integer> containMap;
// 褰撳墠浜烘満鏋�
private Long agencyId;
- private BaseWarehouseServiceImpl baseWarehouseService;
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseWarehouseService baseWarehouseService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
+ private BaseGoodsModelsService baseGoodsModelsService;
public WhWarningImportVerifyHandler(Long agencyId) {
this.agencyId = agencyId;
this.containMap = new HashMap<>();
- this.baseWarehouseService = BeanContextAware.getBeanByType(BaseWarehouseServiceImpl.class);
- this.baseGoodsTemplateService = BeanContextAware.getBeanByType(BaseGoodsTemplateServiceImpl.class);
- this.baseGoodsModelsService = BeanContextAware.getBeanByType(BaseGoodsModelsServiceImpl.class);
+ this.baseWarehouseService = BeanContextAware.getBeanByType(BaseWarehouseService.class);
+ this.baseGoodsTemplateService = BeanContextAware.getBeanByType(BaseGoodsTemplateService.class);
+ this.baseGoodsModelsService = BeanContextAware.getBeanByType(BaseGoodsModelsService.class);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
index 055a230..6de9ff5 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
@@ -5,7 +5,7 @@
import com.consum.base.pojo.BaseCategoryParam;
import com.consum.base.pojo.ProjectTreeResult;
import com.consum.base.service.BaseCategoryService;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
+import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.model.po.BaseCategory;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -38,7 +38,7 @@
private BaseCategoryService baseCategoryService;
@Autowired
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
private boolean multiRoot = true;
private TreeNode dummyRoot = null;
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
index f074e93..f84a751 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -2,16 +2,19 @@
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
+import com.consum.base.service.BaseGoodsModelsService;
import com.consum.model.po.BaseGoodsModels;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 瑙勬牸鍨嬪彿
@@ -23,7 +26,7 @@
public class BaseGoodsModelsController extends BaseController {
@Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseGoodsModelsService baseGoodsModelsService;
/**
* @Description 瑙勬牸鍒楄〃鏌ヨ锛堟牴鎹墿鍝乮d鏌ヨ瑙勬牸鍨嬪彿锛�
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index 4b6bed5..f2fb5c7 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -6,8 +6,8 @@
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.BaseGoodsTemplateParam;
import com.consum.base.pojo.response.GoodsTemplateVO;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;
@@ -43,13 +43,13 @@
public class BaseGoodsTemplateController extends BaseController {
@Autowired
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
/**
* @Description 鏂板鐗╁搧妯℃澘
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index 54fca16..e0bf1e5 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -4,7 +4,7 @@
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.pojo.query.WarehouseQry;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
@@ -33,7 +33,7 @@
public class BaseWarehouseController extends BaseController {
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
@Autowired
private LWhGoodsService lWhGoodsService;
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinFileController.java b/consum-base/src/main/java/com/consum/base/controller/FinFileController.java
index 9d9dae5..293602a 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinFileController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinFileController.java
@@ -1,7 +1,7 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.service.FinFileServiceImpl;
+import com.consum.base.service.FinFileService;
import com.consum.model.po.FinFile;
import com.walker.file.FileInfo;
import com.walker.infrastructure.utils.DateUtils;
@@ -14,8 +14,6 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import java.text.NumberFormat;
-
/**
* @Description 鏂囦欢涓婁紶
* @Author wh
@@ -25,19 +23,12 @@
@RequestMapping("/pc/fin/file")
public class FinFileController extends BaseController {
- public static void main(String[] args) {
- NumberFormat nf = NumberFormat.getPercentInstance();
- nf.setMaximumFractionDigits(2); // 灏嗗皬鏁颁繚鐣� 2 浣�
- System.out.println(nf.format(0.123456));;
- }
+
@Autowired
- private FinFileServiceImpl finFileService;
+ private FinFileService finFileService;
/**
- * @Description
- * fileContentType 缁勪欢涓璾ploadf 涓烘枃浠� 鍏朵粬涓哄浘鐗�
- * groupId 1瀹㈡湇瀵硅瘽鑱婂ぉ
- * owner 鎵�灞炰汉
+ * @Description fileContentType 缁勪欢涓璾ploadf 涓烘枃浠� 鍏朵粬涓哄浘鐗� groupId 1瀹㈡湇瀵硅瘽鑱婂ぉ owner 鎵�灞炰汉
* @Author wh
* @Date 2023/8/1 10:45
*/
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
index f3d3962..50b6caa 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
@@ -4,7 +4,7 @@
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.FinSysServerSearchParam;
import com.consum.base.pojo.FinSysServerVo;
-import com.consum.base.service.FinSysServerImpl;
+import com.consum.base.service.FinSysServerService;
import com.consum.model.po.FinSysServer;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
@@ -22,11 +22,11 @@
@RequestMapping("/pc/fin/sys/server")
public class FinSysServerController extends BaseController {
- private FinSysServerImpl finSysServerImpl;
+ private FinSysServerService finSysServerServiceImpl;
@Autowired
- public void setfinSysCategory(FinSysServerImpl finSysServerImpl) {
- this.finSysServerImpl = finSysServerImpl;
+ public void setfinSysCategory(FinSysServerService finSysServerServiceImpl) {
+ this.finSysServerServiceImpl = finSysServerServiceImpl;
}
/**
@@ -36,7 +36,7 @@
*/
@GetMapping("/selectByDataScope")
public ResponseValue selectByDataScope(Integer dataScope) {
- return ResponseValue.success(finSysServerImpl.getByDataScope(dataScope));
+ return ResponseValue.success(finSysServerServiceImpl.getByDataScope(dataScope));
}
/**
@@ -47,7 +47,7 @@
@GetMapping("/select/tree")
public ResponseValue selectFinSysCategoryTree() {
- List<FinSysServerVo> finSysCategoryVos = finSysServerImpl.queryAllCategory();
+ List<FinSysServerVo> finSysCategoryVos = finSysServerServiceImpl.queryAllCategory();
if (finSysCategoryVos != null) {
return ResponseValue.success(finSysCategoryVos);
}
@@ -57,7 +57,7 @@
@GetMapping("/select/detail")
public ResponseValue selectById(@RequestParam(name = "id") Long Id) {
- FinSysServer finSysServer = this.finSysServerImpl.get(new FinSysServer(Id));
+ FinSysServer finSysServer = this.finSysServerServiceImpl.get(new FinSysServer(Id));
if (finSysServer == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
@@ -76,7 +76,7 @@
CommonUtil.copyProperties(param, param2);
param = param2;
- GenericPager<FinSysServer> pager = this.finSysServerImpl.selectServerListByPage(param);
+ GenericPager<FinSysServer> pager = this.finSysServerServiceImpl.selectServerListByPage(param);
return ResponseValue.success(pager);
}
@@ -99,7 +99,7 @@
param.setCreatedTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
param.setCreatedBy(this.getCurrentUser().getUser_name());
param.setLv(param.getParentId() + 1);
- int num = this.finSysServerImpl.insert(param);
+ int num = this.finSysServerServiceImpl.insert(param);
if (num > 0) {
return ResponseValue.success(1);
}
@@ -122,7 +122,7 @@
// if(finSysServer.getLvType()!=null) {
// finSysServer.setLv(Long.valueOf(finSysServer.getLvType()));
// }
- int num = this.finSysServerImpl.save(param);
+ int num = this.finSysServerServiceImpl.save(param);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 946f689..a29a688 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -21,12 +21,10 @@
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.base.ArgumentsConstants;
-import com.iplatform.base.service.DeptServiceImpl;
import com.iplatform.base.service.RoleServiceImpl;
import com.iplatform.base.service.UserServiceImpl;
import com.iplatform.base.util.PlatformRSAUtils;
import com.iplatform.core.util.AESUtils;
-import com.iplatform.model.po.S_config;
import com.iplatform.model.po.S_dept;
import com.iplatform.model.po.S_role;
import com.iplatform.model.po.S_user_core;
@@ -80,7 +78,6 @@
private UserServiceImpl userService;
- private DeptServiceImpl deptService;
private FinSysTenantServiceImpl finSysTenantService;
@@ -95,7 +92,6 @@
this.userService = userService;
}
- private S_config sConfig;
@Autowired
public FinSysTenantUserController(FinSysTenantServiceImpl finSysTenantService, FinSysTenantUserServiceImpl finSysTenantUserService,
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index c025739..9c9640c 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -215,7 +215,7 @@
if (sysInfo == null) {
throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- ClassPathResource classPathResource = new ClassPathResource("import/閲囪喘閫�璐у崟.xls");
+ ClassPathResource classPathResource = new ClassPathResource("import/鍑哄簱鍗�.xls");
// 鑾峰彇鏂囦欢杈撳叆娴�
InputStream inputStream = classPathResource.getInputStream();
Workbook wb = new HSSFWorkbook(inputStream);
@@ -224,6 +224,7 @@
params.setHeadingStartRow(2);
List<OutputExcelTemplate> exportList = lWhFormOutputService.getExportList(id);
+
if (CollectionUtils.isEmpty(exportList)) {
throw new RuntimeException("鏁版嵁涓虹┖");
}
@@ -243,7 +244,7 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
- downLoadExcel("閲囪喘閫�璐у崟", response, workbook);
+ downLoadExcel("鍑哄簱鍗�", response, workbook);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index e3879e3..d9bc273 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -7,15 +7,36 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.utils.*;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.pojo.LWhProcureModelParam;
import com.consum.base.pojo.excel.ProcureExcelTemplate;
import com.consum.base.pojo.query.FormProcureQry;
-import com.consum.base.pojo.response.*;
-import com.consum.base.service.*;
-import com.consum.model.po.*;
+import com.consum.base.pojo.response.FormProcureVO;
+import com.consum.base.pojo.response.FromProcureTemplateInfoVO;
+import com.consum.base.pojo.response.GoodsModelVO;
+import com.consum.base.pojo.response.LWhFormProcureExtendVO;
+import com.consum.base.pojo.response.LWhFormProcureGoodsVO;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LOrgSupplierServiceImpl;
+import com.consum.base.service.LWhFormProcureCoreService;
+import com.consum.base.service.LWhFormProcureGoodsService;
+import com.consum.base.service.LWhFormProcureService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LOrgSupplier;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhFormProcureGoods;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
@@ -25,15 +46,24 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import org.apache.commons.compress.utils.Lists;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.Field;
-import java.util.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @ClassName LWhFormProcureController
@@ -49,7 +79,7 @@
@Resource
private LWhFormProcureService lWhFormProcureService;
@Resource
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
@Resource
private CodeGeneratorService codeGeneratorService;
@Resource
@@ -59,7 +89,7 @@
@Resource
private LWhGoodsService lWhGoodsService;
@Resource
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
@Resource
private LWhProcureModelService lWhProcureModelService;
@Resource
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 4041761..f78775b 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -22,7 +22,7 @@
import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhFormTransferCoreService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhProcureModelService;
@@ -81,7 +81,7 @@
@Autowired
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
/**
* @Description 鏂板
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
index bb83f02..42fec85 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
@@ -11,7 +11,7 @@
import com.consum.base.pojo.WarnConfImEntity;
import com.consum.base.pojo.WhWarningConfigParam;
import com.consum.base.pojo.query.WhWarningConfigQry;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhWarningConfigServiceImpl;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
@@ -23,18 +23,6 @@
import com.walker.web.ResponseCode;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -44,6 +32,21 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
/**
* @ClassName LWhWarningConfigController
@@ -60,7 +63,7 @@
@Resource
private LWhWarningConfigServiceImpl lWhWarningConfigService;
@Resource
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
private ObjectMapper mapper = new ObjectMapper();
/**
diff --git a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
index 1d1737c..a9e5089 100644
--- a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
@@ -2,8 +2,8 @@
import cn.hutool.core.convert.Convert;
import com.consum.base.core.utils.IdUtil;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseGoodsModelsService;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhWarningServiceImpl;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
@@ -33,9 +33,9 @@
@Resource
private LWhWarningServiceImpl lWhWarningService;
@Resource
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
@Resource
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseGoodsModelsService baseGoodsModelsService;
/**
* 褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java
new file mode 100644
index 0000000..3c56920
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java
@@ -0,0 +1,27 @@
+package com.consum.base.core.utils;
+
+import java.math.BigDecimal;
+
+/**
+ * 鍒嗚浆鍏冨伐鍏�
+ */
+public class CurrencyUtil {
+
+ public static BigDecimal convertFenToYuan(long price) {
+ return new BigDecimal(price).divide(new BigDecimal(100));
+ }
+
+ public static Integer convertFenToYuan(Integer price) {
+ if (price == null) {
+ return null;
+ }
+ return new BigDecimal(price).divide(new BigDecimal(100)).intValueExact();
+ }
+
+ public static BigDecimal convertFenToYuan(BigDecimal price) {
+ if (price == null) {
+ return null;
+ }
+ return price.divide(new BigDecimal(100));
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/DateUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/DateUtil.java
index e4bba75..add4bd1 100644
--- a/consum-base/src/main/java/com/consum/base/core/utils/DateUtil.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/DateUtil.java
@@ -1,24 +1,20 @@
package com.consum.base.core.utils;
import com.walker.infrastructure.utils.DateUtils;
-
import java.text.SimpleDateFormat;
import java.util.Date;
public class DateUtil extends DateUtils {
- public static void main(String[] args) {
- System.out.println(DateUtil.getCurrentDateFor14());
- }
-
/**
* 杩斿洖14浣嶅勾鏈堟棩鏃跺垎绉� 20230912081256
+ *
* @return
*/
- public static Long getCurrentDateFor14(){
+ public static Long getCurrentDateFor14() {
Date date = new Date();
- SimpleDateFormat dateFormat= new SimpleDateFormat("yyyyMMddHHmmss");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
return Long.valueOf(dateFormat.format(date));
}
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQry.java b/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQry.java
index 6bb7682..28e426d 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQry.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQry.java
@@ -21,6 +21,7 @@
* 浠撳簱缂栧彿
*/
@ApiModelProperty(value = "浠撳簱缂栧彿")
+
private Long warehouseId;
/**
* 鍏ュ簱鍗曞彿
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java
index b5074c7..ad262fc 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java
@@ -46,7 +46,7 @@
@ApiModelProperty(value = "瀹炵洏鏁伴噺")
private Integer realNum;
- @ApiModelProperty(value = "鐘舵��")
+ @ApiModelProperty(value = "鐘舵��,")
private Integer status;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsService.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsService.java
new file mode 100644
index 0000000..6742226
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsService.java
@@ -0,0 +1,64 @@
+package com.consum.base.service;
+
+import com.consum.model.po.BaseGoodsModels;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+import java.util.List;
+import java.util.Map;
+
+public interface BaseGoodsModelsService extends BaseService {
+
+ GenericPager<BaseGoodsModels> queryList(Long goodsTemplatesId);
+
+ /**
+ * @Description 鏍规嵁 鍨嬪彿鍚嶇О鍜岀墿鍝佹ā鏉縤d 鏌ヨ瑙勬牸鍨嬪彿
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/25
+ */
+ BaseGoodsModels getByModelNameAndGoodsTemplatesId(BaseGoodsModels models);
+
+ /**
+ * @Description 鏂板
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/23
+ */
+ int add(BaseGoodsModels models);
+
+ /**
+ * 淇敼鐘舵��
+ *
+ * @author 鍗㈠簡闃�
+ * @date 2023/10/25
+ */
+ int updateStatus(BaseGoodsModels models);
+
+ /**
+ * @Description 鏍规嵁id鍒犻櫎瑙勬牸鍨嬪彿
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/25
+ */
+ int updateById(BaseGoodsModels models);
+
+ /**
+ * @param idList
+ * @Description 鏍规嵁瑙勬牸鍨嬪彿id鏌ヨ瑙勬牸鍨嬪彿
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ List<BaseGoodsModels> selectByModelsIdList(List<Long> idList);
+
+ /**
+ * @Description 鏍规嵁鐗╁搧id鏌ヨ瑙勬牸鍨嬪彿
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ List<BaseGoodsModels> queryByGoodsTemplatesId(Long goodsTemplatesId);
+
+ /**
+ * 鏍规嵁鐗╁搧鍨嬪彿id 鏌ヨ鐗╁搧淇℃伅
+ *
+ * @param baseGoodsModelsId
+ * @return
+ */
+ List<Map<String, Object>> queryGoodsModelInfo(Long baseGoodsModelsId);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateService.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateService.java
new file mode 100644
index 0000000..249e67b
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateService.java
@@ -0,0 +1,103 @@
+package com.consum.base.service;
+
+import com.consum.base.pojo.BaseGoodsTemplateParam;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.SDictData;
+import com.consum.model.vo.BaseGoodsTemplateVo;
+import com.iplatform.model.po.S_user_core;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+import java.util.List;
+import java.util.Map;
+
+public interface BaseGoodsTemplateService extends BaseService {
+
+ List<BaseCategory> getByCategoryId(Long categoryId);
+
+ /**
+ * @Description 鏂板鐗╁搧妯℃澘
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/24
+ */
+ int add(BaseGoodsTemplateParam param, FinSysTenantUser currentUser);
+
+ /**
+ * @Description 鐗╁搧妯℃澘鍒楄〃鏌ヨ
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/24
+ */
+ GenericPager<BaseGoodsTemplate> queryList(BaseGoodsTemplateParam param);
+
+ /**
+ * 鏍规嵁鐗╁搧id鏌ヨ鐗╁搧璇︽儏
+ *
+ * @author 鍗㈠簡闃�
+ * @date 2023/9/26
+ */
+ BaseGoodsTemplateVo getById(Long id);
+
+ /**
+ * @Description 缂栬緫
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/24
+ */
+ int updateBaseGoodsTemplate(BaseGoodsTemplateParam param);
+
+ /**
+ * @Description 鏍规嵁鐗╁搧鍚嶇О鍜屽垎绫籭d鏌ヨ鐗╁搧
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/24
+ */
+ BaseGoodsTemplate getByGoodsNameAndCategoryId(String goodsName, Long categoryId);
+
+ /**
+ * 鏍规嵁鍨嬪彿ID鏌ヨ鐗╁搧淇℃伅
+ *
+ * @param modelId
+ * @return
+ */
+
+ Map<String, Object> queryGoodsInfoByModelId(Long modelId);
+
+ /**
+ * 淇敼鐘舵��
+ *
+ * @author 鍗㈠簡闃�
+ * @date 2023/10/25
+ */
+ int updateStatus(BaseGoodsTemplate goodsTemplate);
+
+ /**
+ * @Description 鏍规嵁鐗╁搧id鍒犻櫎鐗╁搧
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/25
+ */
+ int updateById(BaseGoodsTemplate goodsTemplate, S_user_core currentUser);
+
+ /**
+ * @return
+ * @Description 鏌ヨ浠撳簱绫诲瀷(鏁版嵁瀛楀吀)
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ List<SDictData> queryClassificationCode();
+
+ /**
+ * @Description 鏍规嵁鍒嗙被id鏌ヨ鐗╁搧妯℃澘
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ List<BaseGoodsTemplate> queryByCategoryId(Long categoryId);
+
+ /**
+ * @param agencyId
+ * @param categoryId
+ * @param states
+ * @param goodsName 鍏ㄥ尮閰嶏紒锛侊紒
+ * @return
+ */
+
+ List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Short states, String goodsName);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService1.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService1.java
new file mode 100644
index 0000000..9795436
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService1.java
@@ -0,0 +1,8 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseService;
+
+public interface BaseWarehouseManagerService1 extends BaseService {
+
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
new file mode 100644
index 0000000..5476972
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
@@ -0,0 +1,67 @@
+package com.consum.base.service;
+
+import com.consum.base.pojo.BaseWarehouseParam;
+import com.consum.model.po.BaseWarehouse;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+import java.util.List;
+
+public interface BaseWarehouseService extends BaseService {
+
+ int add(BaseWarehouseParam param);
+
+ /**
+ * @Description 浠撳簱鍒楄〃鏌ヨ
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param);
+
+ /**
+ * @Description 缂栬緫(淇敼鐘舵��)
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ int updateBaseWarehouse(BaseWarehouse baseWarehouse);
+
+ /**
+ * 鏍规嵁id鏌ヨ浠撳簱璇︽儏
+ *
+ * @author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ BaseWarehouse getById(Long id);
+
+ /**
+ * @Description 鏍规嵁id鍒犻櫎浠撳簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ int updateById(BaseWarehouse baseWarehouse);
+
+ /**
+ * @Description 鏍规嵁浠撳簱id鑾峰彇鏈烘瀯鐢ㄦ埛淇℃伅
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ void queryUserList(Long baseWarehouseId);
+
+ /**
+ * @return
+ * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+ List<BaseWarehouse> getByAgencyId(Long agencyId, Short isDefault, Short states);
+
+
+ /**
+ * 鏍规嵁鏈烘瀯id鏌ヨ榛樿浠撳簱
+ *
+ * @param agencyId
+ * @return
+ */
+ BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId);
+
+ BaseWarehouse getWarehouseByAgencyId(Long agencyId, String warehouseName);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
index 8c66969..b109af4 100644
--- a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
@@ -11,7 +11,14 @@
import com.consum.base.pojo.LDeptFormScrappedParam;
import com.consum.base.pojo.query.LDeptFormScrappedQry;
import com.consum.base.pojo.response.DepFormScrappedExtendVo;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.DepFormScrapped;
+import com.consum.model.po.DepFormScrappedGoods;
+import com.consum.model.po.DepFormScrappedModel;
+import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.SDictData;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -20,16 +27,15 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import com.walker.web.ResponseValue;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* @ClassName DepFormScrappedServiceImpl
@@ -52,7 +58,7 @@
@Resource
private SDictDataServiceImpl sDictDataService;
@Resource
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseGoodsModelsService baseGoodsModelsService;
@Resource
private DepFormScrappedCoreServiceImpl depFormScrappedCoreService;
diff --git a/consum-base/src/main/java/com/consum/base/service/FinFileService.java b/consum-base/src/main/java/com/consum/base/service/FinFileService.java
new file mode 100644
index 0000000..0af2f43
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/FinFileService.java
@@ -0,0 +1,8 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseService;
+
+public interface FinFileService extends BaseService {
+
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/FinFileServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/FinFileServiceImpl.java
deleted file mode 100644
index 8c13e39..0000000
--- a/consum-base/src/main/java/com/consum/base/service/FinFileServiceImpl.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.consum.base.service;
-
-import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description 鏂囦欢涓婁紶
- * @Author wh
- * @Date 2023/8/1 10:34
- */
-@Service
-public class FinFileServiceImpl extends BaseServiceImpl {
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/service/FinOrgService.java b/consum-base/src/main/java/com/consum/base/service/FinOrgService.java
new file mode 100644
index 0000000..d0eb4c8
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/FinOrgService.java
@@ -0,0 +1,16 @@
+package com.consum.base.service;
+
+import com.consum.model.po.FinSysOrg;
+import com.walker.jdbc.service.BaseService;
+
+public interface FinOrgService extends BaseService {
+
+ /**
+ * 鏍规嵁鏈烘瀯浠ｇ爜锛屾煡璇㈠敮涓�鏈烘瀯瀵硅薄銆�
+ *
+ * @param orgCode
+ * @return
+ * @date 2023-07-05
+ */
+ FinSysOrg queryOneByCode(String orgCode);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/FinOrgServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/FinOrgServiceImpl.java
deleted file mode 100644
index c68b75f..0000000
--- a/consum-base/src/main/java/com/consum/base/service/FinOrgServiceImpl.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.consum.base.service;
-
-import com.consum.model.po.FinSysOrg;
-import com.iplatform.model.po.S_dept;
-import com.walker.infrastructure.utils.StringUtils;
-import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class FinOrgServiceImpl extends BaseServiceImpl {
-
- private static final String QUERY_SYS_ORG_BY_TENANT_ID = "select * from FIN_SYS_ORG where TENANT_ID = ?";
- private static final String QUERY_TREE_ALL = "select * from FIN_SYS_ORG where org_type = ? order by parent_id, LV ASC";
- private static final String QUERY_TREE_ONE = "select * from FIN_SYS_ORG where org_type = ? and parent_id = ? order by parent_id, LV ASC";
- private static final String QUERY_SYS_ORG_BY_ORGID = "SELECT * FROM FIN_SYS_ORG WHERE PARENT_ID IN (\n" +
- "SELECT PARENT_ID FROM FIN_SYS_ORG where ID = ? AND ORG_TYPE = ?) ORDER BY ORG_CODE ASC";
-
- /**
- * 鏍规嵁鏈烘瀯浠ｇ爜锛屾煡璇㈠敮涓�鏈烘瀯瀵硅薄銆�
- * @param orgCode
- * @return
- * @date 2023-07-05
- */
- public FinSysOrg queryOneByCode(String orgCode){
- FinSysOrg org = new FinSysOrg();
- org.setOrgCode(orgCode);
- List<FinSysOrg> orgList = this.select(org);
- if(!StringUtils.isEmptyList(orgList)){
- return orgList.get(0);
- }
- return null;
- }
-
- /**
- * 鎵归噺鍐欏叆鏂扮殑鏈烘瀯闆嗗悎銆�
- * @param finSysOrgList
- * @date 2023-07-05
- */
- public List<S_dept> execBatchInsertOrgList(List<FinSysOrg> finSysOrgList){
- if(StringUtils.isEmptyList(finSysOrgList)){
- return null;
- }
- List<S_dept> deptList = new ArrayList<>(finSysOrgList.size());
- for(FinSysOrg e : finSysOrgList){
- deptList.add(this.acquirePlatformDept(e));
- }
- this.insertBatch(deptList);
- this.insertBatch(finSysOrgList);
- return deptList;
- }
-
- private S_dept acquirePlatformDept(FinSysOrg finSysOrg){
- S_dept dept = new S_dept();
- dept.setId(Long.valueOf(finSysOrg.getId())); // FinSysOrg 鐨刬d 鍜宲artentId 杩欓噷鏀规垚String绫诲瀷浜�
- dept.setDept_name(finSysOrg.getName());
- dept.setOrder_num(finSysOrg.getOrderNum());
- dept.setOrg_type(finSysOrg.getOrgType());
- dept.setCreate_time(finSysOrg.getCreateTime());
-
- if(finSysOrg.getParentId() != null){
- //if(finSysOrg.getParentId().longValue() == 0){
- if(finSysOrg.getParentId() == null){
- // 鐖惰妭鐐逛笉瀛樺湪锛�
- dept.setAncestors("0");
- } else {
- dept.setAncestors(String.valueOf(finSysOrg.getParentId()));
- }
- dept.setOrg_id(Long.valueOf(finSysOrg.getParentId()));
- dept.setParent_id(Long.valueOf(finSysOrg.getParentId()));
- } else {
- dept.setAncestors("0");
- dept.setOrg_id(dept.getId());
- dept.setParent_id(0L);
- }
- return dept;
- }
-
- /**
- * @Description 鏌ヨ鏈烘瀯鏍�
- * @Author wh
- * @Date 2023/7/11 11:32
- */
- public List<FinSysOrg> queryOrgListForTree(int orgType, Long parentId) {
- if (parentId <= 0) {
- // 灞曠ず鍏ㄩ儴鑺傜偣
- return this.select(QUERY_TREE_ALL, new Object[]{orgType}, new FinSysOrg());
- } else {
- // 鏄剧ず鎸囧畾涓嬬骇
- return this.select(QUERY_TREE_ONE, new Object[]{orgType, parentId}, new FinSysOrg());
- }
- }
-
- public List<FinSysOrg> getAllSysOrgByPhone(String orgId, Integer orgType) {
- return this.select(QUERY_SYS_ORG_BY_ORGID, new Object[]{orgId, orgType}, new FinSysOrg());
- }
-
- public List<FinSysOrg> getByTenantId(String tenantId) {
- return this.select(QUERY_SYS_ORG_BY_TENANT_ID, new Object[]{tenantId}, new FinSysOrg());
- }
-}
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysServerService.java b/consum-base/src/main/java/com/consum/base/service/FinSysServerService.java
new file mode 100644
index 0000000..640c2ea
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysServerService.java
@@ -0,0 +1,35 @@
+package com.consum.base.service;
+
+import com.consum.base.pojo.FinSysServerSearchParam;
+import com.consum.base.pojo.FinSysServerVo;
+import com.consum.model.po.FinSysServer;
+import com.iplatform.model.po.S_role;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+import java.util.List;
+
+public interface FinSysServerService extends BaseService {
+
+ public List<FinSysServerVo> queryAllCategory();
+
+
+ /**
+ * 鏍规嵁id鏌ヨ褰撲笅鑿滃崟鎵�灞炲瓙鑿滃崟
+ */
+ public List<FinSysServer> findChildById(Long parentId);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param param
+ * @return
+ */
+ public GenericPager<FinSysServer> selectServerListByPage(FinSysServerSearchParam param);
+
+ /**
+ * @Description 鏍规嵁DataScope鏌ヨ淇℃伅
+ * @Author wh
+ * @Date 2023/9/13 9:35
+ */
+ public List<S_role> getByDataScope(Integer dataScope);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
index dfffa9c..e9d6325 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
@@ -2,8 +2,17 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhProcureModel;
import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -14,11 +23,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.PostConstruct;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
/**
* @ClassName LWarehouseFlowService
@@ -36,7 +40,7 @@
private LWarehouseFlowService lWarehouseFlowService;
private LWhGoodsService lWhGoodsService;
private LWhGoodsRecordService lWhGoodsRecordService;
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
@Value("${spring.datasource.dataBaseName}")
private String dataBaseName;
@@ -48,7 +52,7 @@
@Autowired
public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService, LWhGoodsRecordService lWhGoodsRecordService) {
+ BaseGoodsTemplateService baseGoodsTemplateService, LWhGoodsRecordService lWhGoodsRecordService) {
this.jdbcTemplate = jdbcTemplate;
this.lWarehouseFlowService = lWarehouseFlowService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
index 6cab42f..718a4fb 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
@@ -4,9 +4,21 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.IdUtil;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormInventory;
+import com.consum.model.po.LWhFormInventoryGoods;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhFormProcureGoods;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -14,12 +26,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
/**
* @ClassName LWhFormInventoryCoreService
@@ -36,10 +42,10 @@
private LWhFormOutputCoreService lWhFormOutputCoreService;
private CodeGeneratorService codeGeneratorService;
private LWhFormProcureService lWhFormProcureService;
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
private LWhFormProcureGoodsService lWhFormProcureGoodsService;
private LWhProcureModelService lWhProcureModelService;
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private LWhFormInventoryService lWhFormInventoryService;
private LWhFormProcureCoreService lWhFormProcureCoreService;
@@ -50,10 +56,10 @@
LWhFormOutputCoreService lWhFormOutputCoreService,
CodeGeneratorService codeGeneratorService,
LWhFormProcureService lWhFormProcureService,
- BaseWarehouseServiceImpl baseWarehouseService,
+ BaseWarehouseService baseWarehouseService,
LWhFormProcureGoodsService lWhFormProcureGoodsService,
LWhProcureModelService lWhProcureModelService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
LWhFormInventoryService lWhFormInventoryService,
LWhFormProcureCoreService lWhFormProcureCoreService,
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index 9cebb1c..e0c1238 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -46,7 +46,7 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
@Autowired
private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;
@Autowired
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index 25e980b..cca17c4 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -8,20 +8,23 @@
import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
-import com.consum.model.po.*;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
/**
* @ClassName WhFormOutputCoreService
@@ -34,7 +37,7 @@
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
public class LWhFormOutputCoreService {
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private CodeGeneratorService codeGeneratorService;
private LWhProcureModelService lWhProcureModelService;
@@ -45,7 +48,7 @@
private LWhGoodsRecordService lWhGoodsRecordService;
@Autowired
- public LWhFormOutputCoreService(BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ public LWhFormOutputCoreService(BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
CodeGeneratorService codeGeneratorService,
LWhProcureModelService lWhProcureModelService,
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index 1815c52..14b247b 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -4,6 +4,7 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.param.BaseWarehouseParam1;
+import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
@@ -12,22 +13,25 @@
import com.consum.base.pojo.LWhFormOutputParam;
import com.consum.base.pojo.excel.OutputExcelTemplate;
import com.consum.base.pojo.query.LWhFormOutputQry;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* @Description 鍑哄簱鍗�
@@ -41,7 +45,7 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
@@ -49,7 +53,7 @@
@Autowired
private LWhFormOutputCoreService lWhFormOutputCoreService;
@Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseGoodsModelsService baseGoodsModelsService;
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
@@ -120,7 +124,7 @@
}
//3.鏍规嵁鍑哄簱鍗曞嚭搴�
- Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.CHUKU, currentUser, param.getDealTime(),null);
+ Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.CHUKU, currentUser, param.getDealTime(), null);
if (lWarehouseFlowId == null) {
log.error("鏍规嵁鍑哄簱鍗曞嚭搴撳け璐�");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -254,6 +258,7 @@
List<OutputExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
OutputExcelTemplate templateExcelExport = MapUtils.convertMapToObj(item, OutputExcelTemplate.class);
+ templateExcelExport.setTotalAmount(CurrencyUtil.convertFenToYuan(templateExcelExport.getTotalAmount()));
list.add(templateExcelExport);
});
return list;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index f2b8590..a84f859 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
@@ -1,5 +1,6 @@
package com.consum.base.service;
+import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.core.utils.PageUtil;
@@ -148,6 +149,8 @@
List<ProcureExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
ProcureExcelTemplate templateExcelExport = MapUtils.convertMapToObj(item, ProcureExcelTemplate.class);
+ templateExcelExport.setTotalAmount(CurrencyUtil.convertFenToYuan(templateExcelExport.getTotalAmount()));
+ templateExcelExport.setPrice(CurrencyUtil.convertFenToYuan(templateExcelExport.getPrice()));
list.add(templateExcelExport);
});
return list;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
index fef5945..28040ff 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
@@ -11,17 +11,16 @@
import com.consum.model.po.LWhGoodsRecord;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
/**
* @ClassName LWhFormScrappedCoreService
@@ -36,7 +35,7 @@
private GoodsBaseServiceImpl goodsBaseService;
private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
private LWhGoodsRecordService lWhGoodsRecordService;
@@ -46,7 +45,7 @@
@Autowired
public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,
LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
LWhGoodsRecordService lWhGoodsRecordService,
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
index daf8093..aa78516 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
@@ -51,7 +51,7 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
@Autowired
private FinSysTenantDepartmentService departmentService;
@Autowired
@@ -61,9 +61,9 @@
@Autowired
private SDictDataServiceImpl sDictDataService;
@Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseGoodsModelsService baseGoodsModelsService;
@Autowired
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
@Autowired
private LWhFormScrappedCoreService lWhFormScrappedCoreService;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
similarity index 94%
rename from consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
index c2edf64..d01ab23 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
@@ -1,18 +1,18 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import com.consum.base.Constants;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.service.BaseGoodsModelsService;
import com.consum.model.po.BaseGoodsModels;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
/**
* @Description 鐗╁搧妯℃澘
@@ -20,13 +20,14 @@
* @Date 2023/10/23
*/
@Service
-public class BaseGoodsModelsServiceImpl extends BaseServiceImpl {
+public class BaseGoodsModelsServiceImpl extends BaseServiceImpl implements BaseGoodsModelsService {
/**
* @Description 瑙勬牸鍒楄〃鏌ヨ锛堟牴鎹墿鍝乮d鏌ヨ瑙勬牸鍨嬪彿锛�
* @Author 鍗㈠簡闃�
* @Date 2023/10/25
*/
+ @Override
public GenericPager<BaseGoodsModels> queryList(Long goodsTemplatesId) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -44,6 +45,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/25
*/
+ @Override
public BaseGoodsModels getByModelNameAndGoodsTemplatesId(BaseGoodsModels models) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -54,7 +56,7 @@
//鐗╁搧妯℃澘id
sql.append(" and GOODS_TEMPLATES_ID =:GOODS_TEMPLATES_ID ");
paramts.put("GOODS_TEMPLATES_ID", models.getGoodsTemplatesId());
- if (models.getStates() != null){
+ if (models.getStates() != null) {
sql.append(" and STATES =:states ");
paramts.put("states", models.getStates());
}
@@ -67,6 +69,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
+ @Override
public int add(BaseGoodsModels models) {
models.setId(IdUtil.generateId());
models.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
@@ -79,6 +82,7 @@
* @author 鍗㈠簡闃�
* @date 2023/10/25
*/
+ @Override
public int updateStatus(BaseGoodsModels models) {
return this.update(models);
}
@@ -88,6 +92,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/25
*/
+ @Override
public int updateById(BaseGoodsModels models) {
models.setStates(Constants.STATES_DELETED);
return this.update(models);
@@ -99,6 +104,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
*/
+ @Override
public List<BaseGoodsModels> selectByModelsIdList(List<Long> idList) {
if (CollectionUtils.isEmpty(idList)) {
log.error("鍙傛暟閿欒");
@@ -124,11 +130,15 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
+ @Override
public List<BaseGoodsModels> queryByGoodsTemplatesId(Long goodsTemplatesId) {
BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
baseGoodsModels.setGoodsTemplatesId(goodsTemplatesId);
return this.select(baseGoodsModels);
}
+
+
+ private String QUERY_GOODS_MODEL_INFO = "SELECT CLASSIFICATION type, goodsTemp.CATEGORY_ID,goodsTemp.CATEGORY_NAME,goodsTemp.id goods_Id,goodsTemp.GOODS_NAME,model.MODEL_NAME,model.id base_Goods_Models_Id,model.UNIT FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON model.GOODS_TEMPLATES_ID=goodsTemp.id";
/**
* 鏍规嵁鐗╁搧鍨嬪彿id 鏌ヨ鐗╁搧淇℃伅
@@ -136,8 +146,7 @@
* @param baseGoodsModelsId
* @return
*/
- private String QUERY_GOODS_MODEL_INFO = "SELECT CLASSIFICATION type, goodsTemp.CATEGORY_ID,goodsTemp.CATEGORY_NAME,goodsTemp.id goods_Id,goodsTemp.GOODS_NAME,model.MODEL_NAME,model.id base_Goods_Models_Id,model.UNIT FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON model.GOODS_TEMPLATES_ID=goodsTemp.id";
-
+ @Override
public List<Map<String, Object>> queryGoodsModelInfo(Long baseGoodsModelsId) {
StringBuilder sql = new StringBuilder(QUERY_GOODS_MODEL_INFO);
HashMap<String, Object> paramts = new HashMap<>();
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
similarity index 94%
rename from consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
index 5e6fc4a..31f86de 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
@@ -1,24 +1,30 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseGoodsTemplateParam;
-import com.consum.model.po.*;
+import com.consum.base.service.BaseCategoryService;
+import com.consum.base.service.BaseGoodsModelsService;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.SDictData;
import com.consum.model.vo.BaseGoodsTemplateVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* @Description 鐗╁搧妯℃澘
@@ -26,14 +32,14 @@
* @Date 2023/10/23
*/
@Service
-public class BaseGoodsTemplateServiceImpl extends BaseServiceImpl {
+public class BaseGoodsTemplateServiceImpl extends BaseServiceImpl implements BaseGoodsTemplateService {
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
private BaseCategoryService baseCategoryService;
@Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseGoodsModelsService baseGoodsModelsService;
/**
* @return
@@ -41,6 +47,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
+ @Override
public List<BaseCategory> getByCategoryId(Long categoryId) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -60,6 +67,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/24
*/
+ @Override
public int add(BaseGoodsTemplateParam param, FinSysTenantUser currentUser) {
//1.鏂板鐗╁搧妯℃澘
BaseGoodsTemplate baseGoodsTemplate = new BaseGoodsTemplate();
@@ -115,6 +123,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/24
*/
+ @Override
public GenericPager<BaseGoodsTemplate> queryList(BaseGoodsTemplateParam param) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -160,6 +169,7 @@
* @author 鍗㈠簡闃�
* @date 2023/9/26
*/
+ @Override
public BaseGoodsTemplateVo getById(Long id) {
//1.鏍规嵁鐗╁搧id鏌ヨ鐗╁搧妯℃澘
BaseGoodsTemplate goodsTemplate = this.get(new BaseGoodsTemplate(id));
@@ -187,6 +197,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/24
*/
+ @Override
public int updateBaseGoodsTemplate(BaseGoodsTemplateParam param) {
//1.淇敼鐗╁搧妯℃澘
BaseGoodsTemplate baseGoodsTemplate = new BaseGoodsTemplate();
@@ -217,6 +228,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/24
*/
+ @Override
public BaseGoodsTemplate getByGoodsNameAndCategoryId(String goodsName, Long categoryId) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -237,8 +249,9 @@
* @param modelId
* @return
*/
- private static String QUERY_GOODSINFO_BY_MODELID = "SELECT model.MODEL_NAME modelName,model.UNIT,temp.id goodsId, temp.GOODS_CODE goodsCode,temp.GOODS_NAME goodsName,temp.CLASSIFICATION classification,temp.CATEGORY_ID categoryId FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 ";
+ private static String QUERY_GOODSINFO_BY_MODELID = "SELECT model.MODEL_NAME modelName,model.UNIT,temp.id goodsId, temp.GOODS_CODE goodsCode,temp.GOODS_NAME goodsName,temp.CLASSIFICATION classification,temp.CATEGORY_ID categoryId FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 ";
+ @Override
public Map<String, Object> queryGoodsInfoByModelId(Long modelId) {
StringBuilder sqlStr = new StringBuilder(QUERY_GOODSINFO_BY_MODELID);
Map<String, Object> params = new HashMap<>();
@@ -259,6 +272,7 @@
* @author 鍗㈠簡闃�
* @date 2023/10/25
*/
+ @Override
public int updateStatus(BaseGoodsTemplate goodsTemplate) {
return this.update(goodsTemplate);
}
@@ -268,6 +282,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/25
*/
+ @Override
public int updateById(BaseGoodsTemplate goodsTemplate, S_user_core currentUser) {
goodsTemplate.setStates(Constants.STATES_DELETED);
//鍒犻櫎鏃堕棿
@@ -284,6 +299,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
+ @Override
public List<SDictData> queryClassificationCode() {
StringBuilder sql = new StringBuilder("SELECT * FROM s_dict_data WHERE dict_type = 'CLASSIFICATION_CODE' order by dict_sort");
return this.select(sql.toString(), new Object[]{}, new SDictData());
@@ -294,6 +310,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
+ @Override
public List<BaseGoodsTemplate> queryByCategoryId(Long categoryId) {
BaseGoodsTemplate goodsTemplate = new BaseGoodsTemplate();
goodsTemplate.setCategoryId(categoryId);
@@ -307,7 +324,7 @@
* @param goodsName 鍏ㄥ尮閰嶏紒锛侊紒
* @return
*/
-
+ @Override
public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Short states, String goodsName) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1=1 ");
Map<String, Object> params = new HashMap<>();
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
similarity index 94%
rename from consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
index f2d56cd..c2e08b0 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
@@ -1,9 +1,13 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseWarehouseParam;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.FinSysTenantDepartmentService;
+import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.SDictDataServiceImpl;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantDepartment;
@@ -28,7 +32,7 @@
* @Date 2023/10/26
*/
@Service
-public class BaseWarehouseServiceImpl extends BaseServiceImpl {
+public class BaseWarehouseServiceImpl extends BaseServiceImpl implements BaseWarehouseService {
@Autowired
private CodeGeneratorService codeGeneratorService;
@@ -44,6 +48,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public int add(BaseWarehouseParam param) {
BaseWarehouse baseWarehouse = new BaseWarehouse();
BeanUtils.copyProperties(param, baseWarehouse);
@@ -71,6 +76,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -107,6 +113,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public int updateBaseWarehouse(BaseWarehouse baseWarehouse) {
SDictData SDictData = this.sDictDataService.get(new SDictData(Long.valueOf(baseWarehouse.getClassificationCode())));
if (SDictData != null) {
@@ -127,6 +134,7 @@
* @author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public BaseWarehouse getById(Long id) {
return this.get(new BaseWarehouse(id));
}
@@ -136,6 +144,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public int updateById(BaseWarehouse baseWarehouse) {
baseWarehouse.setStates(Constants.STATES_DELETED);
return this.update(baseWarehouse);
@@ -146,6 +155,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public void queryUserList(Long baseWarehouseId) {
//1.鏍规嵁浠撳簱id鏌ヨ浠撳簱
BaseWarehouse baseWarehouse = this.getById(baseWarehouseId);
@@ -170,6 +180,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+ @Override
public List<BaseWarehouse> getByAgencyId(Long agencyId, Short isDefault, Short states) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -199,6 +210,7 @@
* @param agencyId
* @return
*/
+ @Override
public BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE IS_DEFAULT = 1 and AGENCY_ID =:agencyId ");
Map<String, Object> param = new HashMap<>();
@@ -211,6 +223,7 @@
return null;
}
+ @Override
public BaseWarehouse getWarehouseByAgencyId(Long agencyId, String warehouseName) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE STATES= 1");
Map<String, Object> param = new HashMap<>();
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/FinFileServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinFileServiceImpl.java
new file mode 100644
index 0000000..fa7f5ab
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinFileServiceImpl.java
@@ -0,0 +1,15 @@
+package com.consum.base.service.impl;
+
+import com.consum.base.service.FinFileService;
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 鏂囦欢涓婁紶
+ * @Author wh
+ * @Date 2023/8/1 10:34
+ */
+@Service
+public class FinFileServiceImpl extends BaseServiceImpl implements FinFileService {
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/FinOrgServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinOrgServiceImpl.java
new file mode 100644
index 0000000..0419431
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinOrgServiceImpl.java
@@ -0,0 +1,33 @@
+package com.consum.base.service.impl;
+
+import com.consum.base.service.FinOrgService;
+import com.consum.model.po.FinSysOrg;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.List;
+import org.springframework.stereotype.Service;
+
+@Service
+public class FinOrgServiceImpl extends BaseServiceImpl implements FinOrgService {
+
+
+ /**
+ * 鏍规嵁鏈烘瀯浠ｇ爜锛屾煡璇㈠敮涓�鏈烘瀯瀵硅薄銆�
+ *
+ * @param orgCode
+ * @return
+ * @date 2023-07-05
+ */
+ @Override
+ public FinSysOrg queryOneByCode(String orgCode) {
+ FinSysOrg org = new FinSysOrg();
+ org.setOrgCode(orgCode);
+ List<FinSysOrg> orgList = this.select(org);
+ if (!StringUtils.isEmptyList(orgList)) {
+ return orgList.get(0);
+ }
+ return null;
+ }
+
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysServerImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysServerServiceImpl.java
similarity index 92%
rename from consum-base/src/main/java/com/consum/base/service/FinSysServerImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/FinSysServerServiceImpl.java
index a55fa5c..c844506 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysServerImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysServerServiceImpl.java
@@ -1,25 +1,27 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import com.consum.base.pojo.FinSysServerSearchParam;
import com.consum.base.pojo.FinSysServerVo;
+import com.consum.base.service.FinSysServerService;
import com.consum.model.po.FinSysServer;
import com.iplatform.model.po.S_role;
import com.walker.db.page.GenericPager;
import com.walker.jdbc.service.BaseServiceImpl;
import com.walker.jdbc.util.StringUtils;
-import org.springframework.stereotype.Service;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.springframework.stereotype.Service;
@Service
-public class FinSysServerImpl extends BaseServiceImpl {
+public class FinSysServerServiceImpl extends BaseServiceImpl implements FinSysServerService {
+
private static final String SELECT_TREE_ALL = "select * from FIN_SYS_SERVER";
private static final String SELECT_CHILD_BY_ID = "select * from FIN_SYS_SERVER where 1=1";
// private static final String S
+
/**
* 鏌ヨ鎵�鏈夋湇鍔＄洰褰�
*
@@ -27,7 +29,7 @@
* @date 2023-07-11
*/
public List<FinSysServerVo> queryAllCategory() {
- List<FinSysServer> finSysCategories = this.select(SELECT_TREE_ALL, new Object[] {}, new FinSysServer());
+ List<FinSysServer> finSysCategories = this.select(SELECT_TREE_ALL, new Object[]{}, new FinSysServer());
List<FinSysServerVo> result = null;
if (finSysCategories != null) {
List<FinSysServerVo> finSysCategoryVos = finSysCategories.stream().map(category -> {
@@ -57,7 +59,7 @@
* 鏍规嵁id鏌ヨ褰撲笅鑿滃崟鎵�灞炲瓙鑿滃崟
*/
public List<FinSysServer> findChildById(Long parentId) {
- List<FinSysServer> children = this.select(SELECT_CHILD_BY_ID, new Object[] {parentId}, new FinSysServer());
+ List<FinSysServer> children = this.select(SELECT_CHILD_BY_ID, new Object[]{parentId}, new FinSysServer());
return children;
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 1df2daf..7607610 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -2,6 +2,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
@@ -15,9 +16,8 @@
import com.consum.base.pojo.response.FormTransferGoodsVO;
import com.consum.base.pojo.response.GoodsModelVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
import com.consum.base.service.BaseWarehouseManagerService;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.FinSysTenantServiceImpl;
import com.consum.base.service.LWhFormOutputServiceImpl;
import com.consum.base.service.LWhFormTransferService;
@@ -57,7 +57,7 @@
public class LWhFormTransferServiceImpl extends BaseServiceImpl implements LWhFormTransferService {
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
@@ -443,6 +443,7 @@
} else {
templateExcelTransfer.setTenantName(templateExcelTransfer.getInAgencyName());
}
+ templateExcelTransfer.setTotalAmount(CurrencyUtil.convertFenToYuan(templateExcelTransfer.getTotalAmount()));
list.add(templateExcelTransfer);
});
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
index e00cb1f..273cd1c 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
@@ -12,26 +12,43 @@
import com.consum.base.pojo.request.UsingFormBackGoodsInfo;
import com.consum.base.pojo.request.UsingFormBackParam;
import com.consum.base.pojo.request.baseGoodModel;
-import com.consum.base.pojo.response.*;
-import com.consum.base.service.*;
-import com.consum.model.po.*;
+import com.consum.base.pojo.response.BaseGoodsTemplateInfo;
+import com.consum.base.pojo.response.UseInfo;
+import com.consum.base.pojo.response.UsingFormBackDetailListVO;
+import com.consum.base.pojo.response.UsingFormBackDetailVO;
+import com.consum.base.pojo.response.UsingFormBackGoodsTemplateInfo;
+import com.consum.base.pojo.response.UsingFormBackModelInfo;
+import com.consum.base.pojo.response.UsingFormBackVO;
+import com.consum.base.service.BaseCategoryService;
+import com.consum.base.service.FinSysTenantDepartmentService;
+import com.consum.base.service.LWhFormTransferService;
+import com.consum.base.service.UsingFormBackGoodsService;
+import com.consum.base.service.UsingFormBackModelService;
+import com.consum.base.service.UsingFormBackService;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.UsingFormBack;
+import com.consum.model.po.UsingFormBackGoods;
+import com.consum.model.po.UsingFormBackModel;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
/**
* @author asus
@@ -56,76 +73,88 @@
private LWhFormTransferService lWhFormTransferService;
@Resource
private DepUsingFormBackCoreServiceImpl depUsingFormBackCoreService;
+
@Override
public void add(UsingFormBackParam usingFormBackParam, FinSysTenantUser sysInfo, S_user_core currentUser) {
Long departmentId = usingFormBackParam.getDepartmentId();
+ Long operatorId = usingFormBackParam.getOperatorId();
+ String operatorName = usingFormBackParam.getOperatorName();
+ Long backTime = usingFormBackParam.getDealTime();
+ String procureDoc = usingFormBackParam.getProcureDoc();
+ List<UsingFormBackGoodsInfo> goodsList = usingFormBackParam.getGoods();
+
+ // 妫�鏌ラ儴闂ㄦ槸鍚﹀瓨鍦�
FinSysTenantDepartment department = finSysTenantDepartmentService.getById(departmentId);
if (department == null) {
throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�");
}
String departmentName = department.getName();
- Long operatorId = usingFormBackParam.getOperatorId();
- String operatorName = usingFormBackParam.getOperatorName();
- Long backTime = usingFormBackParam.getDealTime();
- String procureDoc = usingFormBackParam.getProcureDoc();
- List<UsingFormBackGoodsInfo> usingFormBackGoodsInfo = usingFormBackParam.getGoods();
+ // 娣诲姞閫�鍥炶〃鍗�
Long usingFormBackId = addUsingFormBack(sysInfo, departmentId, departmentName, operatorId, operatorName, backTime, procureDoc);
- for (UsingFormBackGoodsInfo backingGoodsInfo : usingFormBackGoodsInfo) {
- Long baseCategoryId = backingGoodsInfo.getBaseCategoryId();
- Long baseGoodsTemplateId = backingGoodsInfo.getBaseGoodsTemplateId();
- String goodsTemplateName = backingGoodsInfo.getGoodsTemplateName();
- Long transBusinessId = backingGoodsInfo.getTransBusinessId();
- String businessFormCode = backingGoodsInfo.getBusinessFormCode();
- UsingFormBackGoods usingFormBackGoods = new UsingFormBackGoods();
- usingFormBackGoods.setId(IdUtil.generateId());
- usingFormBackGoods.setUsingFormBackId(usingFormBackId);
- usingFormBackGoods.setBaseGoodsTemplateId(baseGoodsTemplateId);
- usingFormBackGoods.setBaseGoodsTemplateName(goodsTemplateName);
+ // 鎵归噺鎻掑叆閫�鍥炲晢鍝佸拰閫�鍥炲晢鍝佹ā鍨�
+ List<UsingFormBackGoods> goodsBatch = new ArrayList<>();
+ List<UsingFormBackModel> modelBatch = new ArrayList<>();
- BaseCategory baseCategory = baseCategoryService.getById(baseCategoryId);
- String categoryName = baseCategory.getCategoryName();
- String classification = baseCategory.getClassification();
- usingFormBackGoods.setCategoryName(categoryName);
- usingFormBackGoods.setClassification(classification);
- usingFormBackGoods.setTransBusinessId(transBusinessId);
- usingFormBackGoods.setBusinessFormCode(businessFormCode);
+ for (UsingFormBackGoodsInfo goodsInfo : goodsList) {
+ UsingFormBackGoods goods = createUsingFormBackGoods(usingFormBackId, goodsInfo);
+ goodsBatch.add(goods);
- LWhFormTransfer lWhFormTransfer = lWhFormTransferService.selectById(transBusinessId);
- Integer outWarehouseType = lWhFormTransfer.getOutWarehouseType();
- Long outWarehouseId = lWhFormTransfer.getOutWarehouseId();
- usingFormBackGoods.setTransOutWarehouseType(outWarehouseType);
- usingFormBackGoods.setTransOutWarehouseId(outWarehouseId);
-
- usingFormBackModelService.insert(usingFormBackGoods);
- for (baseGoodModel model : backingGoodsInfo.getModels()) {
-
- UsingFormBackModel usingFormBackModel = new UsingFormBackModel();
- usingFormBackModel.setId(IdUtil.generateId());
- usingFormBackModel.setUsingFormBackId(usingFormBackId);
- usingFormBackModel.setUsingFormBackGoodsId(usingFormBackGoods.getId());
- usingFormBackModel.setBaseGoodsTemplateId(model.getGoodsTemplatesId());
- usingFormBackModel.setBaseGoodsTemplateName(goodsTemplateName);
- usingFormBackModel.setClassification(model.getClassification());
- usingFormBackModel.setUnit(model.getUnit());
- usingFormBackModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
- usingFormBackModel.setBaseGoodsModelsName(model.getModelName());
- usingFormBackModel.setProcureModelUserId(model.getModelUserId());
- usingFormBackModel.setInitialCount(model.getGoodsNum());
- usingFormBackModel.setUseCount(model.getUserUseCount());
- usingFormBackModel.setCounts(model.getCounts());
- usingFormBackModel.setGoodsUserName(model.getNowUserName());
-
- usingFormBackGoodsService.insert(usingFormBackModel);
+ for (baseGoodModel model : goodsInfo.getModels()) {
+ UsingFormBackModel formModel = createUsingFormBackModel(usingFormBackId, goods.getId(), goodsInfo, model);
+ modelBatch.add(formModel);
}
-
-
}
- depUsingFormBackCoreService.updateBack(usingFormBackId ,currentUser,DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+
+ // 鎵归噺鎻掑叆閫�鍥炲晢鍝佸拰閫�鍥炲晢鍝佹ā鍨�
+ usingFormBackModelService.insertBatch(goodsBatch);
+ usingFormBackGoodsService.insertBatch(modelBatch);
+
+ depUsingFormBackCoreService.updateBack(usingFormBackId, currentUser, DateUtils.getDateTimeNumber(System.currentTimeMillis()));
}
+ private UsingFormBackGoods createUsingFormBackGoods(Long usingFormBackId, UsingFormBackGoodsInfo goodsInfo) {
+ UsingFormBackGoods goods = new UsingFormBackGoods();
+ goods.setId(IdUtil.generateId());
+ goods.setUsingFormBackId(usingFormBackId);
+ goods.setBaseGoodsTemplateId(goodsInfo.getBaseGoodsTemplateId());
+ goods.setBaseGoodsTemplateName(goodsInfo.getGoodsTemplateName());
+
+ BaseCategory baseCategory = baseCategoryService.getById(goodsInfo.getBaseCategoryId());
+ goods.setCategoryName(baseCategory.getCategoryName());
+ goods.setClassification(baseCategory.getClassification());
+
+ LWhFormTransfer lWhFormTransfer = lWhFormTransferService.selectById(goodsInfo.getTransBusinessId());
+ goods.setTransOutWarehouseType(lWhFormTransfer.getOutWarehouseType());
+ goods.setTransOutWarehouseId(lWhFormTransfer.getOutWarehouseId());
+
+ return goods;
+ }
+
+ private UsingFormBackModel createUsingFormBackModel(Long usingFormBackId, Long usingFormBackGoodsId, UsingFormBackGoodsInfo goodsInfo,
+ baseGoodModel model) {
+ UsingFormBackModel formModel = new UsingFormBackModel();
+ formModel.setId(IdUtil.generateId());
+ formModel.setUsingFormBackId(usingFormBackId);
+ formModel.setUsingFormBackGoodsId(usingFormBackGoodsId);
+ formModel.setBaseGoodsTemplateId(model.getGoodsTemplatesId());
+ formModel.setBaseGoodsTemplateName(goodsInfo.getGoodsTemplateName());
+ formModel.setClassification(model.getClassification());
+ formModel.setUnit(model.getUnit());
+ formModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
+ formModel.setBaseGoodsModelsName(model.getModelName());
+ formModel.setProcureModelUserId(model.getModelUserId());
+ formModel.setInitialCount(model.getGoodsNum());
+ formModel.setUseCount(model.getUserUseCount());
+ formModel.setCounts(model.getCounts());
+ formModel.setGoodsUserName(model.getNowUserName());
+
+ return formModel;
+ }
+
+
@Override
public PageUtil selectPageByList(UsingFormBackQry usingFormBackParam) {
diff --git "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xls" "b/deploy-jar-single/src/main/resources/import/\345\207\272\345\272\223\345\215\225.xls"
similarity index 78%
rename from "deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xls"
rename to "deploy-jar-single/src/main/resources/import/\345\207\272\345\272\223\345\215\225.xls"
index a1d7662..54b87bb 100644
--- "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\351\200\200\350\264\247\345\215\225.xls"
+++ "b/deploy-jar-single/src/main/resources/import/\345\207\272\345\272\223\345\215\225.xls"
Binary files differ
--
Gitblit v1.9.1