袁少华 4 年 前
コミット
44a1be60ee

+ 23 - 1
src/main/java/org/jeecg/modules/fbsInventory/controller/FbsInventoryController.java

@@ -68,11 +68,33 @@ public class FbsInventoryController {
 	 }
 
 
+	 /**
+	  * 安全库存(仓库管理看板)
+	  * @return
+	  */
+	 @RequestMapping(value = "/getAllStockList")
+	 public Result<Map<String,Object>> getAllStockList(){
+		 Result<Map<String,Object>> result=new Result<>();
 
+		 try {
+			 Map<String,Object> map=fbsInventoryService.getAllStockList();
+			 result.setResult(map);
+			 result.success("操作成功");
 
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败:"+e.getMessage());
+		 }
 
+		 return result;
+	 }
 
-	/**
+
+
+
+
+
+	 /**
 	  * 分页列表查询
 	 * @param fbsInventory
 	 * @param pageNo

+ 6 - 0
src/main/java/org/jeecg/modules/fbsInventory/mapper/FbsInventoryMapper.java

@@ -28,4 +28,10 @@ public interface FbsInventoryMapper extends BaseMapper<FbsInventory> {
      * @return
      */
     List<Map<String,Object>> getStockList();
+
+    /**
+     * 成品库存
+     * @return
+     */
+    List<Map<String,Object>> getAllStockList();
 }

+ 8 - 0
src/main/java/org/jeecg/modules/fbsInventory/mapper/xml/FbsInventoryMapper.xml

@@ -21,4 +21,12 @@
         where b.iSafeNum is not null
 
     </select>
+
+    <select id="getAllStockList" resultType="java.util.HashMap">
+
+        select top 5 a.iQuantity realStockSum,b.cInvName materialName from
+        (select cInvCode,sum(iQuantity) as iQuantity  from CurrentStock group by cInvCode) a
+        left join Inventory b on a.cInvCode = b.cInvCode
+
+    </select>
 </mapper>

+ 6 - 0
src/main/java/org/jeecg/modules/fbsInventory/service/IFbsInventoryService.java

@@ -29,4 +29,10 @@ public interface IFbsInventoryService extends IService<FbsInventory> {
      */
     List<Map<String,Object>> getStockList();
 
+    /**
+     * 成品库存
+     * @return
+     */
+    Map<String,Object> getAllStockList();
+
 }

+ 13 - 0
src/main/java/org/jeecg/modules/fbsInventory/service/impl/FbsInventoryServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -35,4 +36,16 @@ public class FbsInventoryServiceImpl extends ServiceImpl<FbsInventoryMapper, Fbs
     public List<Map<String,Object>> getStockList(){
         return fbsInventoryMapper.getStockList();
     }
+
+    @Override
+    public Map<String,Object> getAllStockList(){
+        List<Map<String,Object>> mapList = fbsInventoryMapper.getAllStockList();
+        Map<String,Object> map = new HashMap<>();
+        if(mapList.size() > 0){
+            for (Map<String,Object> m:mapList){
+                map.put(m.get("materialName").toString(),m.get("realStockSum"));
+            }
+        }
+        return map;
+    }
 }

+ 35 - 1
src/main/java/org/jeecg/modules/fbsRdrecord32/controller/FbsRdrecords32Controller.java

@@ -45,7 +45,41 @@ import com.alibaba.fastjson.JSON;
 public class FbsRdrecords32Controller {
 	@Autowired
 	private IFbsRdrecords32Service fbsRdrecords32Service;
-	
+
+	 /**
+	  * 月成品出货统计(仓库管理看板)
+	  * @return
+	  */
+
+	@RequestMapping(value = "getMonthSend")
+	public Result<List<Map<String,Object>>> getMonthSend(){
+		Result<List<Map<String,Object>>> result = new Result<>();
+
+		try {
+			List<Map<String,Object>> map = fbsRdrecords32Service.getMonthSend();
+			result.setResult(map);
+			result.success("成功");
+
+		}catch (Exception e){
+			e.getMessage();
+			result.error500("操作失败:"+e.getMessage());
+		}
+
+		return result;
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
 	/**
 	  * 分页列表查询
 	 * @param fbsRdrecords32

+ 8 - 0
src/main/java/org/jeecg/modules/fbsRdrecord32/mapper/FbsRdrecords32Mapper.java

@@ -1,7 +1,9 @@
 package org.jeecg.modules.fbsRdrecord32.mapper;
 
 import java.util.List;
+import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsRdrecord32.entity.FbsRdrecords32;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FbsRdrecords32Mapper extends BaseMapper<FbsRdrecords32> {
 
+    /**
+     * 月成品出货统计
+     * @return
+     */
+    List<Map<String, Object>> getMonthSend();
+
 }

+ 6 - 0
src/main/java/org/jeecg/modules/fbsRdrecord32/mapper/xml/FbsRdrecords32Mapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.fbsRdrecord32.mapper.FbsRdrecords32Mapper">
 
+    <select id="getMonthSend" resultType="java.util.HashMap">
+
+
+
+    </select>
+
 </mapper>

+ 4 - 0
src/main/java/org/jeecg/modules/fbsRdrecord32/service/IFbsRdrecords32Service.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.fbsRdrecord32.service;
 import org.jeecg.modules.fbsRdrecord32.entity.FbsRdrecords32;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 销售出库单主表(表体)
  * @author: jeecg-boot
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IFbsRdrecords32Service extends IService<FbsRdrecords32> {
 
+    public List<Map<String,Object>> getMonthSend();
 }

+ 10 - 0
src/main/java/org/jeecg/modules/fbsRdrecord32/service/impl/FbsRdrecords32ServiceImpl.java

@@ -7,6 +7,10 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 销售出库单主表(表体)
  * @author: jeecg-boot
@@ -15,5 +19,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class FbsRdrecords32ServiceImpl extends ServiceImpl<FbsRdrecords32Mapper, FbsRdrecords32> implements IFbsRdrecords32Service {
+    @Resource
+    private FbsRdrecords32Mapper fbsRdrecords32Mapper;
 
+    @Override
+    public List<Map<String, Object>> getMonthSend() {
+        return fbsRdrecords32Mapper.getMonthSend();
+    }
 }