ソースを参照

看板接口,首页报表接口a

chenc 4 年 前
コミット
27c84e0738

+ 1 - 1
src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursController.java

@@ -350,7 +350,7 @@ public class FbsAbnormalWorkingHoursController {
 
 	 /**
 	 * @Author chenchuang
-	 * @Description //TODO 根据时间查询派工单产品
+	 * @Description //TODO 根据时间查询派工单产品(月工时分布情况)
 	 * @Date 2020/10/20 11:00
 	 * @Param [date]
 	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>>

+ 4 - 0
src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHours.java

@@ -163,4 +163,8 @@ public class FbsAbnormalWorkingHours implements Serializable {
 	private String workshopDispatchListId;
 	@Excel(name = "不良品数量", width = 15)
 	private String rejectsNumber;
+	//类型id
+	private String typeId;
+	//类型名称
+	private String typeName;
 }

+ 21 - 0
src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderdetailController.java

@@ -234,4 +234,25 @@ public class FbsMomOrderdetailController {
       return Result.ok("文件导入失败!");
   }
 
+  /**
+  * @Author chenchuang
+  * @Description //TODO 查询生产计划完成率
+  * @Date 2020/10/21 12:49
+  * @Param []
+  * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+  */
+  @GetMapping(value = "/getFbsMomOrderdetailSum")
+  public Result<Map<String,Object>> getFbsMomOrderdetailSum(){
+	  Result<Map<String,Object>> result=new Result<>();
+	  try {
+		  Map<String,Object> map=fbsMomOrderdetailService.getFbsMomOrderdetailSum();
+		  result.setResult(map);
+		  result.success("操作成功");
+	  } catch (Exception e) {
+		  e.printStackTrace();
+		  result.error500("操作失败:"+e.getMessage());
+	  }
+	  return result;
+  }
+
 }

+ 9 - 1
src/main/java/org/jeecg/modules/fbsMomOrder/mapper/FbsMomOrderdetailMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsMomOrder.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
@@ -13,5 +14,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version: V1.0
  */
 public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
-
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询生产订单总数,入库总数
+    * @Date 2020/10/21 12:00
+    * @Param []
+    * @return org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail
+    */
+    Map<String,Object> getFbsMomOrderdetailSum();
 }

+ 3 - 1
src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -1,5 +1,7 @@
 <?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.fbsMomOrder.mapper.FbsMomOrderdetailMapper">
-
+    <select id="getFbsMomOrderdetailSum" resultType="java.util.HashMap">
+        select sum(QualifiedInQty) as '已完成',sum(Qty)-sum(QualifiedInQty) as '未完成' from mom_orderdetail
+    </select>
 </mapper>

+ 10 - 1
src/main/java/org/jeecg/modules/fbsMomOrder/service/IFbsMomOrderdetailService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.fbsMomOrder.service;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * @Description: 生产订单子表
  * @author: jeecg-boot
@@ -10,5 +12,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @version: V1.0
  */
 public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
-
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询生产订单总数,入库总数
+    * @Date 2020/10/21 12:00
+    * @Param []
+    * @return org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail
+    */
+    Map<String,Object> getFbsMomOrderdetailSum();
 }

+ 12 - 0
src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderdetailServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsMomOrder.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
 import org.jeecg.modules.fbsMomOrder.mapper.FbsMomOrderdetailMapper;
 import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderdetailService;
@@ -7,6 +8,9 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.Map;
+
 /**
  * @Description: 生产订单子表
  * @author: jeecg-boot
@@ -14,6 +18,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @version: V1.0
  */
 @Service
+@DS("multi-datasource1")
 public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailMapper, FbsMomOrderdetail> implements IFbsMomOrderdetailService {
 
+    @Resource
+    FbsMomOrderdetailMapper fbsMomOrderdetailMapper;
+
+    @Override
+    public Map<String,Object> getFbsMomOrderdetailSum() {
+        return fbsMomOrderdetailMapper.getFbsMomOrderdetailSum();
+    }
 }

+ 9 - 2
src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -363,7 +363,7 @@ public class FbsWorkshopDispatchListController {
 
 	 /**
 	 * @Author chenchuang
-	 * @Description //TODO 查询当月工时产品分布率
+	 * @Description //TODO 月工时分布情况
 	 * @Date 2020/10/19 14:12
 	 * @Param []
 	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>>
@@ -384,7 +384,7 @@ public class FbsWorkshopDispatchListController {
 
 	 /**
 	 * @Author chenchuang
-	 * @Description //TODO 查询单月按异常分类的工时
+	 * @Description //TODO 月质量异常分类
 	 * @Date 2020/10/19 16:34
 	 * @Param []
 	 * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
@@ -403,6 +403,13 @@ public class FbsWorkshopDispatchListController {
 		 return result;
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 人员出勤率
+	 * @Date 2020/10/21 14:20
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>
+	 */
 	 @GetMapping(value = "/getAttendance")
 	 public Result<List<Map<String,Object>>> getAttendance(){
 		 Result<List<Map<String,Object>>> result=new Result<>();