From ceecebe477faf5a45b19f3b258f7add8f93b4583 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 10:00:24 +0800
Subject: [PATCH] 代码优化 结构调整

---
 consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 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 f0eb6f9..e0c1238 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
@@ -41,12 +41,12 @@
  */
 @Slf4j
 @Service
-public class LWhFormInventoryServiceImpl extends BaseServiceImpl {
+public class LWhFormInventoryServiceImpl extends BaseServiceImpl implements LWhFormInventoryService {
 
     @Autowired
     private CodeGeneratorService codeGeneratorService;
     @Autowired
-    private BaseWarehouseServiceImpl baseWarehouseService;
+    private BaseWarehouseService baseWarehouseService;
     @Autowired
     private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;
     @Autowired
@@ -83,6 +83,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/31
      */
+    @Override
     public int add(FormInventoryParam param, FinSysTenantUser currentUser, FinSysTenantUser operatorUser, FinSysTenantUser monitorUser) {
         //鏂板鐩樼偣鍗�
         LWhFormInventory lWhFormInventory = new LWhFormInventory();
@@ -121,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<>();
@@ -158,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) {
@@ -177,8 +180,8 @@
             log.error("鐩樼偣鍗曠墿鍝佷负绌�");
         }
         List<FormInventoryGoodsVO> result = inventoryGoodsService.add(formInventoryGoodsList, id);
-
-        return result;
+        dto.setFormInventoryGoodsList(result);
+        return dto;
     }
 
 
@@ -189,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()));
@@ -233,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<>();
@@ -303,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,"
@@ -319,6 +325,7 @@
         return result;
     }
 
+    @Override
     public FormInventoryVO queryInventBaseGoodTemplate(Long id) {
         FormInventoryVO formInventoryVO = new FormInventoryVO();
 
@@ -354,6 +361,7 @@
         return formInventoryVO;
     }
 
+    @Override
     public List<InventoryExcelTemplate> getExportList(Long id) {
         String sql = "SELECT\n"
             + "\tfi.INVENTORY_DATE createTime,\n"
@@ -381,6 +389,9 @@
         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