From a7a6b5d7ed7b6e5b96866b24fd1cb7ba3dcc19d1 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 22 十一月 2023 14:24:47 +0800
Subject: [PATCH] feat: 物品统计前后端

---
 consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java |   80 ++++++++++++++++++++++++++++------------
 1 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
index d353518..5331d39 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
@@ -1,14 +1,13 @@
 package com.consum.base.service;
 
-import com.consum.base.util.IdUtil;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.pojo.response.FormInventoryGoodsVO;
 import com.consum.model.po.LWhFormInventoryGoods;
 import com.walker.jdbc.service.BaseServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
 
 /**
  * @Description 鐩樼偣鍗曠墿鍝�
@@ -20,10 +19,10 @@
 public class LWhFormInventoryGoodsServiceImpl extends BaseServiceImpl {
 
     /**
-     * @Description  鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗曠墿鍝�
+     * @return
+     * @Description 鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗曠墿鍝�
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/31
-     * @return
      */
     public List<LWhFormInventoryGoods> getByInventoryId(Long id) {
         LWhFormInventoryGoods inventoryGoods = new LWhFormInventoryGoods();
@@ -32,26 +31,59 @@
     }
 
     /**
-     * @Description  鏂板鐩樼偣鍗曠墿鍝佽褰�
+     * @return
+     * @Description 鏂板鐩樼偣鍗曠墿鍝佽褰�
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/31
-     * @return
      */
-    public int add(List<Map<String, Object>> list, Long warehouseId) {
-        List<LWhFormInventoryGoods> inventoryGoodsList = new ArrayList<>();
-        for (Map<String, Object> map : list) {
-            LWhFormInventoryGoods inventoryGoods = new LWhFormInventoryGoods();
-            inventoryGoods.setId(IdUtil.generateId());
-            inventoryGoods.setWhFormInventoryId(warehouseId);
-            inventoryGoods.setBaseGoodsTemplateId((Long) map.get("id"));
-            inventoryGoods.setGoodsTemplateName((String) map.get("goodsname"));
-            inventoryGoods.setUnit((String) map.get("unit"));
-            inventoryGoods.setBaseGoodsModelsId((Long) map.get("modelsid"));
-            inventoryGoods.setBaseGoodsModelsName((String) map.get("goodsTemplateId"));
-            inventoryGoods.setInitCounts((Integer) map.get("endcount"));
-
-            inventoryGoodsList.add(inventoryGoods);
+//    public int add(List<Map<String, Object>> list, Long warehouseId) {
+//        List<LWhFormInventoryGoods> inventoryGoodsList = new ArrayList<>();
+//        for (Map<String, Object> map : list) {
+//            LWhFormInventoryGoods inventoryGoods = new LWhFormInventoryGoods();
+//            inventoryGoods.setId(IdUtil.generateId());
+//            inventoryGoods.setWhFormInventoryId(warehouseId);
+//            inventoryGoods.setBaseGoodsTemplateId((Long) map.get("id"));
+//            inventoryGoods.setGoodsTemplateName((String) map.get("goodsname"));
+//            inventoryGoods.setUnit((String) map.get("unit"));
+//            inventoryGoods.setBaseGoodsModelsId((Long) map.get("modelsid"));
+//            inventoryGoods.setBaseGoodsModelsName((String) map.get("goodsTemplateId"));
+//            inventoryGoods.setInitCounts((Integer) map.get("endcount"));
+//
+//            inventoryGoodsList.add(inventoryGoods);
+//        }
+//        return this.insert(inventoryGoodsList);
+//    }
+    public int add(List<FormInventoryGoodsVO> inventoryGoodsList, Long warehouseId) {
+        List<LWhFormInventoryGoods> goodsList = new ArrayList<>();
+        for (FormInventoryGoodsVO inventoryGoods : inventoryGoodsList) {
+            LWhFormInventoryGoods lWhFormInventoryGoods = new LWhFormInventoryGoods();
+            lWhFormInventoryGoods.setId(IdUtil.generateId());
+            lWhFormInventoryGoods.setWhFormInventoryId(warehouseId);
+            lWhFormInventoryGoods.setBaseGoodsTemplateId(inventoryGoods.getBaseGoodsTemplateId());
+            lWhFormInventoryGoods.setGoodsTemplateName(inventoryGoods.getGoodsTemplateName());
+            lWhFormInventoryGoods.setUnit(inventoryGoods.getUnit());
+            lWhFormInventoryGoods.setBaseGoodsModelsId(inventoryGoods.getId());
+            lWhFormInventoryGoods.setBaseGoodsModelsName(inventoryGoods.getBaseGoodsModelsName());
+            Integer inventoryCount = inventoryGoods.getInventoryCount();
+            Integer realNum = inventoryGoods.getRealNum();
+            int errorCount = inventoryCount - realNum;
+            lWhFormInventoryGoods.setInventoryCounts(realNum);
+            lWhFormInventoryGoods.setErrorCounts(errorCount);
+            //鐩樼偣缁撴灉锛�1=姝e父锛�2=鐩樼泩锛�3=鐩樹簭锛�
+            lWhFormInventoryGoods.setInventoryResult((errorCount > 0) ? 2 : (errorCount < 0) ? 3 : 1);
+            goodsList.add(lWhFormInventoryGoods);
         }
-        return this.insert(inventoryGoodsList);
+        return this.insert(goodsList);
     }
+
+    /**
+     * @Description 鏍规嵁鐩樼偣鍗昳d鍒犻櫎鐩樼偣鍗曠墿鍝�
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/31
+     */
+    public void delByFormInventoryId(Long id) {
+
+    }
+
+
 }

--
Gitblit v1.9.1