chenc 4 سال پیش
والد
کامیت
987ba142e7

+ 21 - 0
src/main/java/org/jeecg/modules/fbsDispatchLists/controller/FbsDispatchListsController.java

@@ -234,4 +234,25 @@ public class FbsDispatchListsController {
       return Result.ok("文件导入失败!");
   }
 
+  /**
+  * @Author chenchuang
+  * @Description //TODO 月度项目发货统计
+  * @Date 2020/10/22 13:14
+  * @Param []
+  * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+  */
+  @GetMapping(value = "/getProjectDelivery")
+  public Result<Map<String,Object>> getProjectDelivery(){
+	  Result<Map<String,Object>>  result=new Result<>();
+	  try {
+		  Map<String,Object> map=fbsDispatchListsService.getProjectDelivery();
+		  result.setResult(map);
+		  result.success("操作成功");
+	  } catch (Exception e) {
+		  e.printStackTrace();
+		  result.error500("操作失败:"+e.getMessage());
+	  }
+	  return result;
+  }
+
 }

+ 8 - 0
src/main/java/org/jeecg/modules/fbsDispatchLists/mapper/FbsDispatchListsMapper.java

@@ -14,4 +14,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FbsDispatchListsMapper extends BaseMapper<FbsDispatchLists> {
 
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询
+    * @Date 2020/10/22 12:53
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists>
+    */
+    List<FbsDispatchLists> getProjectDelivery();
 }

+ 9 - 1
src/main/java/org/jeecg/modules/fbsDispatchLists/mapper/xml/FbsDispatchListsMapper.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.fbsDispatchLists.mapper.FbsDispatchListsMapper">
-
+    <select id="getProjectDelivery" resultType="org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists">
+        SELECT TOP
+            5 SUM ( iQuantity ) AS iQuantity,
+            cItemName
+        FROM
+            DispatchLists
+        GROUP BY
+            cItemName
+    </select>
 </mapper>

+ 12 - 0
src/main/java/org/jeecg/modules/fbsDispatchLists/service/IFbsDispatchListsService.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.fbsDispatchLists.service;
 import org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 销售发货退货单主表(表题)
  * @author: jeecg-boot
@@ -11,4 +14,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IFbsDispatchListsService extends IService<FbsDispatchLists> {
 
+    /**
+    * @Author chenchuang
+    * @Description //TODO 月度项目发货统计
+    * @Date 2020/10/22 13:06
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+
+    Map<String,Object> getProjectDelivery();
 }

+ 19 - 0
src/main/java/org/jeecg/modules/fbsDispatchLists/service/impl/FbsDispatchListsServiceImpl.java

@@ -8,6 +8,11 @@ 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;
+
 /**
  * @Description: 销售发货退货单主表(表题)
  * @author: jeecg-boot
@@ -18,4 +23,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @DS("multi-datasource1")
 public class FbsDispatchListsServiceImpl extends ServiceImpl<FbsDispatchListsMapper, FbsDispatchLists> implements IFbsDispatchListsService {
 
+    @Resource
+    FbsDispatchListsMapper fbsDispatchListsMapper;
+
+    @Override
+    public Map<String, Object> getProjectDelivery() {
+        List<FbsDispatchLists> fbsDispatchListsList=fbsDispatchListsMapper.getProjectDelivery();
+        Map<String, Object> map=new HashMap<>();
+        if(fbsDispatchListsList!=null){
+            for(FbsDispatchLists fbsDispatchLists:fbsDispatchListsList){
+                map.put(fbsDispatchLists.getCitemname(),fbsDispatchLists.getIquantity());
+            }
+        }
+        return map;
+    }
 }

+ 27 - 0
src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -8,6 +8,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -444,4 +446,29 @@ public class FbsWorkshopDispatchListController {
 		 }
 		 return result;
 	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO
+	 * @Date 2020/10/22 14:09
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.lang.String>
+	 */
+	 @GetMapping(value = "/getProductionEfficiency")
+	 public Result<String> getProductionEfficiency(){
+		 Result<String> result=new Result<>();
+		 try {
+			 String str=fbsWorkshopDispatchListService.getProductionEfficiency();
+			 if(StringUtils.isNotBlank(str)){
+			 	result.setResult(str);
+			 }else{
+			 	result.setResult("0");
+			 }
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败:"+e.getMessage());
+		 }
+		 return result;
+	 }
 }

+ 9 - 0
src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/FbsWorkshopDispatchListMapper.java

@@ -76,4 +76,13 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
     List<FbsWorkshopDispatchList> getWorkingHoursContrast();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 生产效率
+    * @Date 2020/10/22 14:01
+    * @Param []
+    * @return java.lang.String
+    */
+    String getProductionEfficiency();
 }

+ 10 - 0
src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -130,5 +130,15 @@
         GROUP BY
             fwdl.product
     </select>
+
+    <select id="getProductionEfficiency" resultType="java.lang.String">
+        SELECT CONVERT
+            ( count( fws.pk_workshop_dispatch_list ) / count( fwdl.id ), DECIMAL ( 15, 2 ) ) * 100
+        FROM
+            fbs_workshop_dispatch_list fwdl
+            LEFT JOIN ( SELECT pk_workshop_dispatch_list FROM fbs_working_statistics WHERE del_flag = '0' GROUP BY pk_workshop_dispatch_list ) fws ON fwdl.id = fws.pk_workshop_dispatch_list
+        WHERE
+            fwdl.del_flag = '0'
+    </select>
     
 </mapper>

+ 9 - 0
src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/IFbsWorkshopDispatchListService.java

@@ -73,4 +73,13 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
     List<FbsWorkshopDispatchList> getWorkingHoursContrast();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 生产效率
+    * @Date 2020/10/22 14:02
+    * @Param []
+    * @return java.lang.String
+    */
+    String getProductionEfficiency();
 }

+ 5 - 0
src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -349,5 +349,10 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         return fbsWorkshopDispatchListMapper.getWorkingHoursContrast();
     }
 
+    @Override
+    public String getProductionEfficiency() {
+        return fbsWorkshopDispatchListMapper.getProductionEfficiency();
+    }
+
 
 }