From 5e6c61b8753870ef2f8cde60eef47e3eeefe89e6 Mon Sep 17 00:00:00 2001 From: luqingyang <lqy5492@163.com> Date: 星期四, 02 十一月 2023 17:35:48 +0800 Subject: [PATCH] 报废单 相关代码 --- consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 17 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..04840be 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 @@ -4,12 +4,8 @@ import com.consum.base.core.CodeGeneratorService; 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.*; 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 org.springframework.beans.BeanUtils; @@ -37,6 +33,8 @@ private FinSysTenantDepartmentServiceImpl departmentService; @Autowired private FinSysTenantUserServiceImpl userService; + @Autowired + private SDictDataServiceImpl sDictDataService; /** * @Description 鏂板 @@ -49,11 +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()); } baseWarehouse.setIsDefault(Constants.IS_DEFAULT_YES); @@ -65,7 +68,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 +84,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,6 +108,10 @@ * @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()); + } return this.update(baseWarehouse); } @@ -148,4 +156,22 @@ } + + /** + * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱 + * @Author 鍗㈠簡闃� + * @Date 2023/10/27 + * @return + */ + 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()); + } } -- Gitblit v1.9.1