From b0841619e23dd01b8fba9561ad9036c7c3d6aa08 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 14 十一月 2023 14:05:20 +0800
Subject: [PATCH] 出库单管理
---
consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
index 04840be..253d995 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
@@ -3,7 +3,7 @@
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.pojo.BaseWarehouseParam;
-import com.consum.base.util.IdUtil;
+import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.*;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
@@ -47,16 +47,16 @@
baseWarehouse.setId(IdUtil.generateId());
baseWarehouse.setWarehouseType(Constants.WAREHOUSE_TYPE_TENANT);
baseWarehouse.setWarehouseCode(codeGeneratorService.createWarehouseCode());
-// //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
-// FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
-// if (finSysTenant != null) {
-// baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
-// baseWarehouse.setAgencyName(finSysTenant.getName());
-// }
+ //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
+ FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
+ if (finSysTenant != null) {
+ baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
+ baseWarehouse.setAgencyName(finSysTenant.getName());
+ }
//鏍规嵁CLASSIFICATION_CODE鏌ヨCLASSIFICATION_NAME
- S_dict_data s_dict_data = this.sDictDataService.get(new S_dict_data(Long.valueOf(param.getClassificationCode())));
- if (s_dict_data != null) {
- baseWarehouse.setClassificationName(s_dict_data.getDict_label());
+ SDictData dictData = this.sDictDataService.get(new SDictData(Long.valueOf(param.getClassificationCode())));
+ if (dictData != null) {
+ baseWarehouse.setClassificationName(dictData.getDict_label());
}
baseWarehouse.setIsDefault(Constants.IS_DEFAULT_YES);
@@ -108,9 +108,15 @@
* @Date 2023/10/26
*/
public int updateBaseWarehouse(BaseWarehouse baseWarehouse) {
- S_dict_data s_dict_data = this.sDictDataService.get(new S_dict_data(Long.valueOf(baseWarehouse.getClassificationCode())));
- if (s_dict_data != null) {
- baseWarehouse.setClassificationName(s_dict_data.getDict_label());
+ SDictData SDictData = this.sDictDataService.get(new SDictData(Long.valueOf(baseWarehouse.getClassificationCode())));
+ if (SDictData != null) {
+ baseWarehouse.setClassificationName(SDictData.getDict_label());
+ }
+ //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
+ FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
+ if (finSysTenant != null) {
+ baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
+ baseWarehouse.setAgencyName(finSysTenant.getName());
}
return this.update(baseWarehouse);
}
--
Gitblit v1.9.1