From dc1800d4d2d252b7b37d80d9f54285200c94ff3c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 15 十一月 2023 19:34:40 +0800
Subject: [PATCH] 出库单管理
---
consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 86 +++++++++++++++++++++++++++++++++++-------
1 files changed, 71 insertions(+), 15 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 8201368..fbc426c 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
@@ -2,24 +2,24 @@
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.util.IdUtil;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.SDictData;
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 java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
/**
* @Description 浠撳簱绠＄悊
@@ -37,6 +37,8 @@
private FinSysTenantDepartmentServiceImpl departmentService;
@Autowired
private FinSysTenantUserServiceImpl userService;
+ @Autowired
+ private SDictDataServiceImpl sDictDataService;
/**
* @Description 鏂板
@@ -55,6 +57,11 @@
baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
baseWarehouse.setAgencyName(finSysTenant.getName());
}
+ //鏍规嵁CLASSIFICATION_CODE鏌ヨCLASSIFICATION_NAME
+ 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);
return this.insert(baseWarehouse);
@@ -65,7 +72,8 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
- public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser sysInfo) {
+// public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser sysInfo) {
+ public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -80,12 +88,12 @@
paramts.put("CLASSIFICATION_CODE", param.getClassificationCode());
}
//鏈烘瀯id
- sql.append(" and AGENCY_ID =:AGENCY_ID ");
- if (param.getAgencyId() != null) {
- paramts.put("AGENCY_ID", param.getAgencyId());
- } else {
- paramts.put("AGENCY_ID", Long.valueOf(sysInfo.getTenantId()));
- }
+// sql.append(" and AGENCY_ID =:AGENCY_ID ");
+// if (param.getAgencyId() != null) {
+// paramts.put("AGENCY_ID", param.getAgencyId());
+// } else {
+// paramts.put("AGENCY_ID", Long.valueOf(sysInfo.getTenantId()));
+// }
//鐘舵��
if (param.getStates() != null) {
sql.append(" and states =:states ");
@@ -104,11 +112,22 @@
* @Date 2023/10/26
*/
public int updateBaseWarehouse(BaseWarehouse baseWarehouse) {
+ 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);
}
/**
* 鏍规嵁id鏌ヨ浠撳簱璇︽儏
+ *
* @author 鍗㈠簡闃�
* @Date 2023/10/26
*/
@@ -148,4 +167,41 @@
}
+
+ /**
+ * @return
+ * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+ public List<BaseWarehouse> getByAgencyId(Long agencyId) {
+ StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
+ HashMap<String, Object> paramts = new HashMap<>();
+
+ //鏈烘瀯id
+ if (agencyId != null) {
+ sql.append(" and AGENCY_ID =:AGENCY_ID ");
+ paramts.put("AGENCY_ID", agencyId);
+ }
+ return select(sql.toString(), paramts, new BaseWarehouse());
+ }
+
+
+ /**
+ * 鏍规嵁鏈烘瀯id鏌ヨ榛樿浠撳簱
+ *
+ * @param agencyId
+ * @return
+ */
+ 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<>();
+ param.put("agencyId", agencyId);
+ List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse());
+ Optional<BaseWarehouse> optional = select.stream().findFirst();
+ if (optional.isPresent()) {
+ return optional.get();
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1