From 85ad0a996a588d87f4ff589ae9a83b714d8b2c7f Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期四, 02 十一月 2023 09:56:21 +0800
Subject: [PATCH] fix：代码调整
---
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
index 6e44892..cddee81 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
@@ -7,6 +7,7 @@
import com.consum.model.po.BaseCategory;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.S_dict_data;
import com.consum.model.vo.BaseGoodsTemplateVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -72,6 +73,7 @@
//鏍规嵁鍒嗙被id鏌ヨ鍒嗙被
BaseCategory baseCategory = this.baseCategoryService.get(new BaseCategory(param.getCategoryId()));
if (baseCategory != null) {
+ baseGoodsTemplate.setCategoryName(baseCategory.getCategoryName());
String classification = baseCategory.getClassification();
//鐗╁搧缂栫爜
String goodsCode = codeGeneratorService.createGoodsTemplateCode(classification);
@@ -190,6 +192,10 @@
//1.淇敼鐗╁搧妯℃澘
BaseGoodsTemplate baseGoodsTemplate = new BaseGoodsTemplate();
BeanUtils.copyProperties(param, baseGoodsTemplate);
+ BaseCategory baseCategory = this.baseCategoryService.get(new BaseCategory(param.getCategoryId()));
+ if (baseCategory != null) {
+ baseGoodsTemplate.setCategoryName(baseCategory.getCategoryName());
+ }
int flag1 = this.update(baseGoodsTemplate);
//2.淇敼瑙勬牸鍨嬪彿鐨勫崟浣�
List<BaseGoodsModels> modelsList = param.getModels();
@@ -227,7 +233,7 @@
* @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 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 ";
public Map<String, Object> queryGoodsInfoByModelId(Long modelId) {
StringBuilder sqlStr = new StringBuilder(QUERY_GOODSINFO_BY_MODELID);
@@ -266,4 +272,26 @@
goodsTemplate.setDUserName(currentUser.getUser_name());
return this.update(goodsTemplate);
}
+
+ /**
+ * @Description 鏌ヨ浠撳簱绫诲瀷(鏁版嵁瀛楀吀)
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ * @return
+ */
+ public List<S_dict_data> 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 S_dict_data());
+ }
+
+ /**
+ * @Description 鏍规嵁鍒嗙被id鏌ヨ鐗╁搧妯℃澘
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ public List<BaseGoodsTemplate> queryByCategoryId(Long categoryId) {
+ BaseGoodsTemplate goodsTemplate = new BaseGoodsTemplate();
+ goodsTemplate.setCategoryId(categoryId);
+ return this.select(goodsTemplate);
+ }
}
--
Gitblit v1.9.1