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/BaseGoodsTemplateServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 4db2cf8..81a2cde 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
@@ -3,11 +3,11 @@
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.pojo.BaseGoodsTemplateParam;
-import com.consum.base.util.IdUtil;
+import com.consum.base.core.utils.IdUtil;
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.po.SDictData;
import com.consum.model.vo.BaseGoodsTemplateVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -197,7 +197,12 @@
}
int flag1 = this.update(baseGoodsTemplate);
//2.淇敼瑙勬牸鍨嬪彿鐨勫崟浣�
+ // TODO id 鐗╁搧鍨嬪彿淇敼寰呮暣鐞�
List<BaseGoodsModels> modelsList = param.getModels();
+ for (BaseGoodsModels baseGoodsModel : modelsList) {
+ BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
+ BeanUtils.copyProperties(baseGoodsModel, baseGoodsModels);
+ }
int flag2 = this.update(modelsList);
if (flag1 > 0 && flag2 > 0) {
@@ -279,9 +284,9 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public List<S_dict_data> queryClassificationCode() {
+ public List<SDictData> 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());
+ return this.select(sql.toString(), new Object[]{}, new SDictData());
}
/**
@@ -295,13 +300,17 @@
return this.select(goodsTemplate);
}
- public List<BaseGoodsTemplate> queryByAgencyId(Long agencyId) {
+ public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1=1 ");
Map<String, Object> params = new HashMap<>();
if (agencyId != null) {
- sql.append(" AND model.id=:modelId");
+ sql.append("AND AGENCY_ID=:agencyId ");
params.put("agencyId", agencyId);
}
+ if (categoryId != null) {
+ sql.append("AND CATEGORY_ID=:categoryId ");
+ params.put("categoryId", categoryId);
+ }
return this.select(sql.toString(), params, new BaseGoodsTemplate());
}
}
--
Gitblit v1.9.1