admin-web/src/api/foudation/material.js
@@ -63,7 +63,7 @@ * */ export function addSpecs(data) { return request({ url: '/pc/base/goods/template/add', url: '/pc/base/goods/models/add', method: 'post', data: data }) @@ -74,7 +74,7 @@ * */ export function delSpecs(data) { return request({ url: '/pc/base/goods/template/del', url: '/pc/base/goods/models/del', method: 'delete', data: data }) admin-web/src/views/foundation/material/specs/list.vue
@@ -39,7 +39,8 @@ table: { showIndex: true, // 是否显示序号 expand: false, // 是否显示详情数据 url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/list', // 请求地址 dataIndex: 'goodsTemplatesId', url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel', // 请求地址 // 工具条 tools: { columnsCtrl: {// 列控制按钮 admin-web/src/views/foundation/material/specs/specsAdd.vue
@@ -44,6 +44,7 @@ return { loading: false, formData: { goodsTemplatesId: '', modelName: '', unit: '', states: 1, consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -1,5 +1,14 @@ package com.consum.base.controller; 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; import com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.service.BaseGoodsModelsService; @@ -8,14 +17,8 @@ import com.walker.db.page.GenericPager; import com.walker.infrastructure.utils.StringUtils; import com.walker.web.ResponseValue; import io.swagger.annotations.Api; 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 规格型号 @@ -60,22 +63,25 @@ CommonUtil.copyProperties(models, param2); models = param2; if (models.getGoodsTemplatesId() == null || StringUtils.isEmpty(models.getModelName()) || StringUtils.isEmpty(models.getUnit()) || models.getStates() == null) { if (models.getGoodsTemplatesId() == null || StringUtils.isEmpty(models.getModelName()) || StringUtils.isEmpty(models.getUnit()) || models.getStates() == null) { return ResponseValue.error("参数错误"); } //判断同一物品模板id下的 规格型号名称是否重复 // 判断同一物品模板id下的 规格型号名称是否重复 BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.getByModelNameAndGoodsTemplatesId(models); if (baseGoodsModels != null) { return ResponseValue.error("规格型号名称已存在"); } int result = this.baseGoodsModelsService.add(models); if (result > 0) return ResponseValue.success(1); if (result > 0) return ResponseValue.success(); return ResponseValue.error("新增失败！"); } /** * 修改状态 * * @author 卢庆阳 * @date 2023/10/25 */ @@ -114,31 +120,19 @@ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("删除失败！"); } /** * @Description 根据物品id查询规格型号 * @Author 卢庆阳 * @Date 2023/10/30 */ @GetMapping("/selectByGoodsTemplatesId") public ResponseValue queryByGoodsTemplatesId(Long goodsTemplatesId) { List<BaseGoodsModels> list = this.baseGoodsModelsService.queryByGoodsTemplatesId(goodsTemplatesId); return ResponseValue.success(list); } @GetMapping("query/goodsModel") public ResponseValue queryGoodsModelByGoodsTemplatesId(Long goodsTemplatesId) { BaseGoodsModels baseGoodsModels = new BaseGoodsModels(); baseGoodsModels.setGoodsTemplatesId(goodsTemplatesId); List<BaseGoodsModels> result = this.baseGoodsModelsService.select(baseGoodsModels); List<BaseGoodsModels> result = baseGoodsModelsService.select(baseGoodsModels); return ResponseValue.success(result); } @GetMapping("queryGoodsModelInfo") public ResponseValue queryGoodsModelInfo(Long baseGoodsModelsId) { if (baseGoodsModelsId== null){ if (baseGoodsModelsId == null) { return ResponseValue.error("参数不能为空！"); } return ResponseValue.success(baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId)); } }
@@ -1,10 +1,11 @@ package com.consum.base.service; import java.util.List; import java.util.Map; 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 { @@ -46,13 +47,6 @@ * @Date 2023/11/2 */ List<BaseGoodsModels> selectByModelsIdList(List<Long> idList); /** * @Description 根据物品id查询规格型号 * @Author 卢庆阳 * @Date 2023/10/30 */ List<BaseGoodsModels> queryByGoodsTemplatesId(Long goodsTemplatesId); /** * 根据物品型号id 查询物品信息 consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
@@ -1,5 +1,12 @@ package com.consum.base.service.impl; import java.util.HashMap; import java.util.List; import java.util.Map; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import com.consum.base.Constants; import com.consum.base.core.utils.IdUtil; import com.consum.base.core.utils.MapperUtil; @@ -8,11 +15,6 @@ import com.walker.db.page.GenericPager; import com.walker.infrastructure.utils.DateUtils; import com.walker.jdbc.service.BaseServiceImpl; import java.util.HashMap; import java.util.List; import java.util.Map; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; /** * @Description 物品模板 @@ -32,7 +34,7 @@ StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 "); HashMap<String, Object> paramts = new HashMap<>(); //物品模板id // 物品模板id sql.append(" and goods_templates_id =:goods_templates_id "); paramts.put("goods_templates_id", goodsTemplatesId); @@ -50,10 +52,10 @@ StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 "); HashMap<String, Object> paramts = new HashMap<>(); //规格型号名称 // 规格型号名称 sql.append(" and MODEL_NAME =:MODEL_NAME "); paramts.put("MODEL_NAME", models.getModelName()); //物品模板id // 物品模板id sql.append(" and GOODS_TEMPLATES_ID =:GOODS_TEMPLATES_ID "); paramts.put("GOODS_TEMPLATES_ID", models.getGoodsTemplatesId()); if (models.getStates() != null) { @@ -125,20 +127,8 @@ return this.select(sql.toString(), paramts, new BaseGoodsModels()); } /** * @Description 根据物品id查询规格型号 * @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"; 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 查询物品信息 consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
@@ -236,7 +236,7 @@ */ @Override public BaseGoodsTemplate getByGoodsNameAndCategoryId(String goodsName, Long categoryId) { StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 "); StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE STATES != 3 "); HashMap<String, Object> paramts = new HashMap<>(); // 物品名称 consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java
@@ -1,6 +1,5 @@ package com.consum.base.service.impl; import com.consum.base.service.FinSysTenantUserService; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -9,6 +8,7 @@ import org.springframework.stereotype.Service; import com.consum.base.pojo.FinSysTenantUserSearchParam; import com.consum.base.service.FinSysTenantUserService; import com.consum.model.po.FinSysTenantUser; import com.iplatform.base.util.PlatformRSAUtils; import com.iplatform.core.util.AESUtils; @@ -36,13 +36,7 @@ private static final String SQL_DELETE_ROLE_USER = "DELETE FROM S_ROLE_USER WHERE USER_ID =?"; /** * 根据用户id和角色id删除角色 */ private static final String SQL_DELETE_ROLE_BY_USER_ID_AND_ROLE_ID = "DELETE FROM S_ROLE_USER WHERE USER_ID =? AND role_id =?"; private static final String SQL_SELECT_USER_CODE = "SELECT * FROM FIN_SYS_TENANT_USER where 1 = 1 "; private static final String SQL_SELECT_USER_CODE = "SELECT * FROM FIN_SYS_TENANT_USER where STATUS =1 "; private static final String SQL_SELECT_USER_ID = "SELECT * FROM S_ROLE where 1=1 "; private static final String SQL_DEPT_ROLES = "select * from s_dept where status=0 and del_flag=0"; @@ -200,8 +194,6 @@ parameters.add(one); this.execBatchUpdate(SQL_DELETE_ROLE_USER, parameters); } /** * 根据userCode查询重复。
