From c1ac6d13630b04b4e11d6f383858e4f8fa64f924 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 17:24:34 +0800
Subject: [PATCH] 盘点查询返回结果修改
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index bb7ee4f..9cebb1c 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -6,6 +6,7 @@
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.excel.InventoryExcelTemplate;
import com.consum.base.pojo.query.LWhFormInventoryQry;
import com.consum.base.pojo.request.FormInventoryParam;
import com.consum.base.pojo.request.LWhFormInventoryParam;
@@ -40,7 +41,7 @@
*/
@Slf4j
@Service
-public class LWhFormInventoryServiceImpl extends BaseServiceImpl {
+public class LWhFormInventoryServiceImpl extends BaseServiceImpl implements LWhFormInventoryService {
@Autowired
private CodeGeneratorService codeGeneratorService;
@@ -82,6 +83,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @Override
public int add(FormInventoryParam param, FinSysTenantUser currentUser, FinSysTenantUser operatorUser, FinSysTenantUser monitorUser) {
//鏂板鐩樼偣鍗�
LWhFormInventory lWhFormInventory = new LWhFormInventory();
@@ -120,6 +122,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @Override
public GenericPager<LWhFormInventory> queryList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) {
StringBuilder sql = new StringBuilder(QUERY_LIST);
HashMap<String, Object> paramts = new HashMap<>();
@@ -157,7 +160,8 @@
}
- public List<FormInventoryGoodsVO> saveInventory(FormInventoryVO dto, Long id) {
+ @Override
+ public FormInventoryVO saveInventory(FormInventoryVO dto, Long id) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(id));
if (lWhFormInventory == null) {
@@ -176,8 +180,8 @@
log.error("鐩樼偣鍗曠墿鍝佷负绌�");
}
List<FormInventoryGoodsVO> result = inventoryGoodsService.add(formInventoryGoodsList, id);
-
- return result;
+ dto.setFormInventoryGoodsList(result);
+ return dto;
}
@@ -188,6 +192,7 @@
* @date 2023/10/31
*/
@Transactional(rollbackFor = Exception.class)
+ @Override
public int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
@@ -232,6 +237,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/11/1
*/
+ @Override
public PageUtil<FormInventoryDetailVO> queryPdDetailList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) {
StringBuilder sql = new StringBuilder(QUERY_PD_DETAIL_LIST);
HashMap<String, Object> paramts = new HashMap<>();
@@ -302,6 +308,7 @@
return pageUtil;
}
+ @Override
public List<FormInventoryGoodsVO> selectDetailById(Long id) {
String sql = "select fig.id, fig.BASE_GOODS_TEMPLATE_ID,fig.GOODS_TEMPLATE_NAME,fig.BASE_GOODS_MODELS_NAME,"
@@ -318,6 +325,7 @@
return result;
}
+ @Override
public FormInventoryVO queryInventBaseGoodTemplate(Long id) {
FormInventoryVO formInventoryVO = new FormInventoryVO();
@@ -352,4 +360,41 @@
formInventoryVO.setFormInventoryGoodsList(goodsVOList);
return formInventoryVO;
}
+
+ @Override
+ public List<InventoryExcelTemplate> getExportList(Long id) {
+ String sql = "SELECT\n"
+ + "\tfi.INVENTORY_DATE createTime,\n"
+ + "\tfi.STOP_TIME endTime,\n"
+ + "\tfi.OPERATOR_NAME,\n"
+ + "\tfi.OPERATOR_NAME2 monitorName,\n"
+ + "\tfi.AGENCY_NAME tenantName,\n"
+ + "\tfig.GOODS_TEMPLATE_NAME templateName,\n"
+ + "\tfig.BASE_GOODS_MODELS_NAME baseModelName,\n"
+ + "\tfig.INVENTORY_COUNTS num,\n"
+ + "\tfig.INIT_COUNTS stockNum,\n"
+ + "\tfig.INVENTORY_RESULT,\n"
+ + "\tBEIZ1 remark\n"
+ + "FROM\n"
+ + "\tl_wh_form_inventory fi\n"
+ + "\tLEFT JOIN l_wh_form_inventory_goods fig ON fi.ID = fig.WH_FORM_INVENTORY_ID\n"
+ + "WHERE\n"
+ + "\tfi.ID = :id";
+ HashMap<String, Object> param = new HashMap<>();
+ param.put("id", id);
+ List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());
+ if (CollectionUtils.isEmpty(select)) {
+ return null;
+ }
+ List<InventoryExcelTemplate> list = Lists.newArrayList();
+ select.forEach(item -> {
+ InventoryExcelTemplate inventoryExcelTemplate = MapUtils.convertMapToObj(item, InventoryExcelTemplate.class);
+ inventoryExcelTemplate.setInventoryDeception(inventoryExcelTemplate.getInventoryResult() == 1 ? "鏄�" : "鍚�");
+ inventoryExcelTemplate.setDeception(
+ inventoryExcelTemplate.getInventoryResult() == 1 ? "姝ｅ父" : (inventoryExcelTemplate.getInventoryResult() == 2 ? "鐩樼泩" : "鐩樹簭"));
+ list.add(inventoryExcelTemplate);
+ });
+ return list;
+
+ }
}
--
Gitblit v1.9.1