From b7a353e571a503a3dfb970af069efc0a65208839 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 18:08:53 +0800
Subject: [PATCH] feat: 部门物品报废
---
consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
index 5fdda99..8c66969 100644
--- a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.convert.Convert;
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.DepFormScrappedCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.DepFormScrappedGoodsParam;
@@ -43,15 +44,18 @@
@Resource
private CodeGeneratorService codeGeneratorService;
@Resource
- private FinSysTenantDepartmentServiceImpl departmentService;
+ private FinSysTenantDepartmentService departmentService;
@Resource
- private LWhFormTransferServiceImpl lWhFormTransferService;
+ private LWhFormTransferService lWhFormTransferService;
@Resource
- private BaseCategoryServiceImpl baseCategoryService;
+ private BaseCategoryService baseCategoryService;
@Resource
private SDictDataServiceImpl sDictDataService;
@Resource
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+
+ @Resource
+ private DepFormScrappedCoreServiceImpl depFormScrappedCoreService;
@Transactional
public ResponseValue add(LDeptFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
@@ -85,7 +89,6 @@
lDeptFormScrapped.setDepartmentId(sysInfo.getSysDeptId());
lDeptFormScrapped.setDepartmentName(department.getName());
}
-
lDeptFormScrapped.setCreateTime(dealTime);
lDeptFormScrapped.setStates(1);
@@ -183,6 +186,7 @@
}
int i = insertBatch(scrappedGoodsArrayList);
int i2 = insertBatch(modelArrayList);
+ depFormScrappedCoreService.updateScrapped(lWhFormScrappedId,currentUser,dealTime);
return ResponseValue.success();
}
@@ -255,10 +259,10 @@
depFormScrappedModel.setDepFormScrappedGoodsId(scrappedGoodsId);
List<DepFormScrappedModel> scrappedModelList = select(depFormScrappedModel);
List<List<DepFormScrappedModel>> modelList = scrappedModelList.stream()
- .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))
- .values().stream()
- .map(list -> list.stream().collect(Collectors.toList()))
- .collect(Collectors.toList());
+ .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))
+ .values().stream()
+ .map(list -> list.stream().collect(Collectors.toList()))
+ .collect(Collectors.toList());
scrappedGoodsMap.put("models", modelList);
goodsList.add(scrappedGoodsMap);
@@ -267,7 +271,7 @@
return scrappedExtend;
}
- private static String EXPORT_SQL = "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,model.BASE_GOODS_TEMPLATE_NAME,model.BASE_GOODS_MODELS_NAME,model.COUNTS,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,scrap.OUT_WAREHOUSE_NAME,2 AS TOTAL_PRICE,model.SCRAPPED_NAME,NULL AS bz FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID WHERE 1=1 ";
+ private static String EXPORT_SQL = "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,model.BASE_GOODS_TEMPLATE_NAME,model.BASE_GOODS_MODELS_NAME,model.COUNTS,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,scrap.OUT_WAREHOUSE_NAME,ROUND( IFNULL( TOTAL_AMOUNT, 0 )/ 100, 2 ) AS TOTAL_PRICE,model.SCRAPPED_NAME,NULL AS bz FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID WHERE 1=1 ";
private static String EXPORT_SQL_END = "order by scrap.DEAL_TIME DESC";
public List<Map<String, Object>> export(Long id, String agencyId) {
@@ -285,6 +289,7 @@
}
return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
}
+
public List<Map<String, Object>> listByModel(LDeptFormScrappedQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(EXPORT_SQL);
@@ -299,7 +304,7 @@
paramts.put("businessFormCode", param.getBusinessFormCode());
}
//鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(param.getGoodsTemplateName())){
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");
paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
@@ -335,4 +340,26 @@
}
return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
}
+
+ private static String GET_BF_MODEL_LIST = "SELECT\n" +
+ "\tscrGoods.TRANS_BUSINESS_ID,\n" +
+ "\tscrGoods.BUSINESS_FORM_CODE,\n" +
+ "\tscrGoods.TRANS_OUT_WAREHOUSE_TYPE,\n" +
+ "\tscrGoods.TRANS_OUT_WAREHOUSE_ID,\n" +
+ "\tgoodsModel.BASE_GOODS_TEMPLATE_ID,\n" +
+ "\tgoodsModel.COUNTS,\n" +
+ "\tgoodsModel.PROCURE_MODEL_USER_ID,\n" +
+ "\tgoodsModel.GOODS_USER_NAME \n" +
+ "FROM\n" +
+ "\tDEP_FORM_SCRAPPED_GOODS scrGoods\n" +
+ "\tLEFT JOIN DEP_FORM_SCRAPPED_MODEL goodsModel ON scrgoods.id = goodsModel.DEP_FORM_SCRAPPED_GOODS_ID";
+
+ public List<Map<String, Object>> getBfModelList(Long lWhFormScrappedId) {
+ HashMap<String, Object> paramts = new HashMap<>();
+ StringBuilder sql = new StringBuilder(GET_BF_MODEL_LIST);
+ //鎶ュ簾鍗昳d
+ sql.append(" and scrGoods.DEP_FORM_SCRAPPED_ID = :lWhFormScrappedId");
+ paramts.put("lWhFormScrappedId", lWhFormScrappedId);
+ return select(sql.toString(), paramts, new MapperUtil());
+ }
}
--
Gitblit v1.9.1