看板接口2

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderdetailController.java

@@ -255,4 +255,25 @@ public class FbsMomOrderdetailController {
 	  return result;
   }
 
+  /***
+  * @Author chenchuang
+  * @Description //TODO 周成品入库数量
+  * @Date 2020/10/21 22:03
+  * @Param []
+  * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+  */
+  @GetMapping(value = "/getQualifiedInQtyWeek")
+  public Result<Map<String,Object>> getQualifiedInQtyWeek(){
+	  Result<Map<String,Object>> result=new Result<>();
+	  try {
+		  Map<String,Object> map=fbsMomOrderdetailService.getQualifiedInQtyWeek();
+		  result.setResult(map);
+		  result.success("操作成功");
+	  } catch (Exception e) {
+		  e.printStackTrace();
+		  result.error500("操作失败："+e.getMessage());
+	  }
+	  return result;
+  }
+
 }

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/FbsMomOrderdetailMapper.java

@@ -32,4 +32,13 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
     List<FbsMomOrderdetail> getQualifiedInQty();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 周成品入库数量
+    * @Date 2020/10/21 21:42
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getQualifiedInQtyWeek();
 }

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -15,4 +15,17 @@
         GROUP BY
         i.cInvName
     </select>
+
+    <select id="getQualifiedInQtyWeek" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+            i.cInvName,
+            sum( QualifiedInQty ) as QualifiedInQty
+        FROM
+            mom_orderdetail mo
+            LEFT JOIN Inventory i ON mo.InvCode = i.cInvCode
+        WHERE
+            datediff( WEEK, RelsDate, getdate ( ) ) = 0
+        GROUP BY
+            i.cInvName
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsMomOrder/service/IFbsMomOrderdetailService.java

@@ -30,4 +30,13 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
     List<FbsMomOrderdetail> getQualifiedInQty();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 周成品入库数量
+    * @Date 2020/10/21 21:44
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    Map<String,Object> getQualifiedInQtyWeek();
 }

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderdetailServiceImpl.java

@@ -9,6 +9,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;
 
@@ -34,4 +35,16 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
     public List<FbsMomOrderdetail> getQualifiedInQty() {
         return fbsMomOrderdetailMapper.getQualifiedInQty();
     }
+
+    @Override
+    public Map<String,Object> getQualifiedInQtyWeek() {
+        Map<String,Object> map=new HashMap<>();
+        List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailMapper.getQualifiedInQtyWeek();
+        if(fbsMomOrderdetailList!=null){
+            for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
+                map.put(fbsMomOrderdetail.getCinvname(),fbsMomOrderdetail.getQualifiedinqty());
+            }
+        }
+        return map;
+    }
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -423,4 +423,25 @@ public class FbsWorkshopDispatchListController {
 		 }
 		 return result;
 	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 标准工时与实际工时对比
+	 * @Date 2020/10/21 23:07
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>>
+	 */
+	 @GetMapping(value = "/getWorkingHoursContrast")
+	 public Result<List<FbsWorkshopDispatchList>> getWorkingHoursContrast(){
+		 Result<List<FbsWorkshopDispatchList>> result=new Result<>();
+		 try {
+			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getWorkingHoursContrast();
+			 result.setResult(fbsWorkshopDispatchListList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/FbsWorkshopDispatchListMapper.java

@@ -67,4 +67,13 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     List<FbsWorkshopDispatchList> getDispatchListByDate(@Param("date")String date);
 
     List<FbsWorkshopDispatchList> getDispatchClose(@Param("startDate")String startDate,@Param("endDate")String endDate );
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO  标准工时与实际工时对比
+    * @Date 2020/10/21 23:01
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+    */
+    List<FbsWorkshopDispatchList> getWorkingHoursContrast();
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -114,6 +114,21 @@
             date_format( planned_start_time, '-%m' )
     </select>
 
-
+    <select id="getWorkingHoursContrast" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
+        SELECT
+            sum( fwdl.man_hours_completed ) AS manHoursCompleted,
+            sum( fwdl.standard_working_hours ) AS standardWorkingHours,
+            fwdl.product
+        FROM
+            fbs_workshop_dispatch_list fwdl
+            LEFT JOIN fbs_working_statistics fws ON fwdl.id = fws.pk_workshop_dispatch_list
+        WHERE
+            fwdl.del_flag = '0'
+            AND fws.del_flag = '0'
+            AND fws.final_state = '3'
+            AND date_format( fws.end_date, '%m' ) = date_format( now( ), '%m' )
+        GROUP BY
+            fwdl.product
+    </select>
     
 </mapper>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/IFbsWorkshopDispatchListService.java

@@ -64,4 +64,13 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @return boolean
     */
     boolean writeBackManHoursCompleted(String manHoursCompleted,String fbsWorkshopDispatchListId);
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 标准工时与实际工时对比
+    * @Date 2020/10/21 23:02
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+    */
+    List<FbsWorkshopDispatchList> getWorkingHoursContrast();
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -344,5 +344,10 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         return isReults;
     }
 
+    @Override
+    public List<FbsWorkshopDispatchList> getWorkingHoursContrast() {
+        return fbsWorkshopDispatchListMapper.getWorkingHoursContrast();
+    }
+
 
 }

src/main/resources/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql 
-diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://103.40.192.17:3306/fbs_dev?useUnicode=true&characterEncoding=UTF-8
-username=root
-password=CuiDian1234
-database_name=fbs_dev
+#diver_name=com.mysql.jdbc.Driver
+#url=jdbc:mysql://103.40.192.17:3306/fbs_dev?useUnicode=true&characterEncoding=UTF-8
+#username=root
+#password=CuiDian1234
+#database_name=fbs_dev
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver
@@ -20,8 +20,8 @@ database_name=fbs_dev
 #database_name=jeecg
 
 #SQLServer2005\u4ee5\u4e0a
-#diver_name=org.hibernate.dialect.SQLServerDialect
-#url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg
-#username=sa
-#password=SA
-#database_name=jeecg
+diver_name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+url=jdbc:sqlserver://103.40.192.17:43110;DatabaseName=UFDATA_006_2019
+username=sa
+password=admin
+database_name=UFDATA_006_2019