看板接口 后台接口

src/main/java/org/jeecg/modules/appInterface/mapper/xml/FbsWorkingStatisticsMapper.xml

@@ -38,7 +38,7 @@
         WHERE
         del_flag = '0'
         AND date_format(
-        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) AS '其他（5S、会议、培训）',
+        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) AS '其他（5S、会议、培训、研发）',
         (
         SELECT
         IFNULL(sum( quality ),0) + IFNULL(sum( design ),0) + IFNULL(sum( rework ),0) + IFNULL(sum( materiel ),0) + IFNULL(sum( energy ),0) + IFNULL(sum( other ),0)+IFNULL(sum(equipment),0) + IFNULL(sum( plan ),0)

src/main/java/org/jeecg/modules/fbsDispatchList/mapper/xml/FbsDispatchListMapper.xml

@@ -3,10 +3,9 @@
 <mapper namespace="org.jeecg.modules.fbsDispatchList.mapper.FbsDispatchListMapper">
     <select id="getWatingSendList" resultType="java.util.HashMap">
 
-         SELECT <!--c.cWhName '仓库',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
-                a.iQuantity - a.fOutQuantity '已做发货单未出库数据',b.dDate '到货日期'-->
+       <!--  SELECT
                 c.cWhName warehouseName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-                <!--a.iQuantity - a.fOutQuantity sendSum-->
+
                 a.iQuantity sendSum
                 ,CONVERT(varchar(30),b.dDate,23) planSendDate,a.cItemName cItemName,a.cItemCode cItemCode
         FROM
@@ -15,11 +14,35 @@
              left join Warehouse c on a.cWhCode = c.cWhCode
              left join Inventory d on a.cInvCode = d.cInvCode
           where
-        <!--(a.iQuantity - a.fOutQuantity) &gt; 0-->
               a.fOutQuantity =0
               and a.iQuantity>0
               AND datediff( MONTH, b.dDate, getdate ( ) ) = 0
-					order by b.dDate desc
+					order by b.dDate desc -->
+        SELECT
+        c.cWhName warehouseName,
+        sum(a.iQuantity) sendSum,
+        CONVERT ( VARCHAR ( 30 ), b.dDate, 23 ) planSendDate,
+        a.cItemName cItemName,
+        a.cItemCode cItemCode ,
+        a.cWhCode
+        FROM
+        DispatchLists a
+        LEFT JOIN DispatchList b ON a.DLID  = b.DLID
+        LEFT JOIN Warehouse c ON a.cWhCode = c.cWhCode
+        WHERE
+        a.fOutQuantity = 0
+        AND a.iQuantity> 0
+        AND a.cWhCode is NOT null
+        AND datediff( MONTH, b.dDate, getdate( ) ) = 0
+        GROUP BY
+        b.DLID,
+        b.dDate,
+        a.cItemName ,
+        a.cItemCode  ,
+        a.cWhCode,
+        c.cWhName
+        ORDER BY
+        b.dDate DESC
 
     </select>
 

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

@@ -38,13 +38,14 @@
             i.cInvName-->
         SELECT
             i.cInvName,
-            sum( iQuantity) as QualifiedInQty
+            sum( iQuantity ) AS QualifiedInQty
         FROM
-            RdRecords01 mo
-            LEFT JOIN Inventory i ON mo.cInvCode = i.cInvCode
-            left join RdRecord01 mm on mo.id=mm.id
+          rdrecords10 mo
+        LEFT JOIN Inventory i ON mo.cInvCode = i.cInvCode
+        LEFT JOIN rdrecord10 mm ON mo.ID = mm.ID
         WHERE
-            datediff( WEEK, mm.dDate , getdate ( ) ) = 0
+            mm.cWhCode = '01'
+            AND datediff( WEEK, mm.dDate, getdate ( ) ) = 0
         GROUP BY
             i.cInvName
     </select>

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsPuArrivalvouchMapper.xml

@@ -15,6 +15,9 @@
         left join Inventory d on a.cInvCode = d.cInvCode
         where  (a.iQuantity - a.fInspectQuantity) > 0
         order by b.dDate desc-->
+
+        <!--
+
         SELECT
         pp.cVenCode vendorName,
         pps.cInvCode materialCode,
@@ -41,6 +44,24 @@
         pps.freceivedqty
         ORDER BY
         pp.dPODate DESC
+        -->
+        SELECT
+        pp.cVenCode vendorName,
+        pps.cInvCode materialCode,
+        i.cInvName materialName,
+        CONVERT ( VARCHAR ( 30 ), pps.dArriveDate, 112 ) arriveDate,
+        CONVERT ( VARCHAR ( 30 ), pp.dPODate, 112 ) dPODate,
+        pps.iQuantity iuantity,
+        pps.iArrQTY iarrQTY,
+        pps.freceivedqty
+        FROM
+        PO_Podetails pps
+        LEFT JOIN PO_Pomain pp ON pps.POID = pp.POID
+        LEFT JOIN Inventory i ON pps.cInvCode = i.cInvCode
+        WHERE
+        pps.iQuantity - pps.freceivedqty > 0
+        ORDER BY
+        pp.dPODate DESC
 
     </select>
 
@@ -60,7 +81,7 @@
         LEFT JOIN PO_Pomain pp ON pps.POID= pp.POID
         LEFT JOIN Inventory i ON pps.cInvCode= i.cInvCode
         WHERE
-        pps.iArrQTY- pps.freceivedqty <![CDATA[ <= ]]> 0
+        pps.iQuantity- pps.freceivedqty <![CDATA[ <= ]]> 0
         AND DateDiff(year, GetDate(), pp.dPODate ) = 0
     </select>
 

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsWorkshopDispatchList.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -55,7 +56,7 @@ public class FbsWorkshopDispatchList implements Serializable {
 	private String productId;
 	/**任务数量*/
 	@Excel(name = "任务数量", width = 15)
-	private Integer numberOfTasks;
+	private BigDecimal numberOfTasks;
 	/**标准工时*/
 	@Excel(name = "标准工时", width = 15)
 	private String standardWorkingHours;
@@ -206,4 +207,5 @@ public class FbsWorkshopDispatchList implements Serializable {
 	//结束时间
 	@TableField(exist = false)
 	private String end;
+
 }

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

@@ -347,10 +347,16 @@
     </select>
 
     <select id="getListWhereStartEnd" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
-        select * from fbs_workshop_dispatch_list
-        WHERE del_flag='0' AND state='0'
-        and DATE_FORMAT(now( ),'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(planned_start_time,'%Y-%m-%d')
-        and DATE_FORMAT(now( ),'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(planned_end_time,'%Y-%m-%d')
+        SELECT
+        *,
+        CONVERT ( IFNULL( ( man_hours_completed ), 0 ) / IFNULL( ( standard_working_hours ), 0 ), DECIMAL ( 15, 2 ) ) * 100 as productionEfficiency
+        FROM
+        fbs_workshop_dispatch_list
+        WHERE
+        del_flag = '0'
+        AND state = '0'
+        AND DATE_FORMAT( now( ), '%Y-%m-%d' ) <![CDATA[ >= ]]> DATE_FORMAT( planned_start_time, '%Y-%m-%d' )
+        AND DATE_FORMAT( now( ), '%Y-%m-%d' ) <![CDATA[ <= ]]> DATE_FORMAT( planned_end_time, '%Y-%m-%d' )
     </select>
     
 </mapper>

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

@@ -245,7 +245,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         //循环时间段
         for(Date date:dateList){
             String dateN=fmt.format(date);
-            Integer numberOfTasks=0;//当日计算数量
+            BigDecimal numberOfTasks=new BigDecimal("0.0");//当日计算数量
             Integer qualifiedNumber=0;//当日完成数量;
             BigDecimal standardWorkingHours=new BigDecimal(0.00);//当日标准工时;
             BigDecimal manHoursCompleted=new BigDecimal(0.00);//当日标准工时;
@@ -257,7 +257,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                         //找到对应时间的数据
                         if(dateN.equals(endDate)){//累加
                             if(workshopDispatchListC.getNumberOfTasks()!=null){
-                                numberOfTasks+=workshopDispatchListC.getNumberOfTasks();
+                                numberOfTasks=numberOfTasks.add(workshopDispatchListC.getNumberOfTasks());
                             }
                             if(workshopDispatchListC.getQualifiedNumber()!=null){
                                 qualifiedNumber+=workshopDispatchListC.getQualifiedNumber();
@@ -279,8 +279,8 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
             fbsWorkshopDispatchList.setStandardWorkingHours(standardWorkingHours.doubleValue()+"");
             fbsWorkshopDispatchList.setManHoursCompleted(manHoursCompleted.doubleValue()+"");
             String achievement="0";
-            if(qualifiedNumber!=0||numberOfTasks!=0){
-                achievement=formatDouble5((double)qualifiedNumber/numberOfTasks);
+            if(qualifiedNumber!=0||numberOfTasks.doubleValue()!=0){
+                achievement=formatDouble5((double)qualifiedNumber/numberOfTasks.doubleValue());
             }
             fbsWorkshopDispatchList.setAchievementRate((Double.parseDouble(achievement)*100)+"");
             Double production=0.0;