产线看板 品质

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -61,9 +61,9 @@ public class FbsWorkingStatisticsController {
 	 private IFbsWorkshopDispatchListService fbsWorkshopDispatchListService;
 	 @Autowired
 	 private IFbsPersonService fbsPersonService;
-	 @Value("${jeecg.path.upload}")
+//	 @Value("${jeecg.path.upload}")
 	 private String upLoadPath;
-	 @Value("${jeecg.path.upvedio}")
+//	 @Value("${jeecg.path.upvedio}")
 	 private String upVedio;
 
 	 public static void main1(String[] srg) {

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

@@ -14,7 +14,7 @@
         order by b.dDate
     </select>
 
-   <!-- <select id="getWillArriveList" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs">
+    <select id="getWillArriveList" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs">
 
        select top 5 CONVERT(varchar(100), b.dDate, 23) arriveDate,c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,
           a.fValidQuantity arriveSum,d.cInvStd specs,b.cMemo memo
@@ -24,7 +24,7 @@
             left join Inventory d on d.cInvCode = a.cInvCode
            where fValidQuantity - fValidInQuan > 0
         order by b.dDate
-    </select>-->
+    </select>
 
     <select id="getLastSixMonthQualityTargetCompare" resultType="java.util.HashMap">
 

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

@@ -1,124 +1,153 @@
 <?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
+<mapper namespace="org.jeecg.modules.fbsPuArrivalvouch.mapper.FbsPuArrivalvouchMapper">
+
+    <select id="getWatingCheckList" resultType="java.util.HashMap">
+
+        <!-- SELECT b.cVenCode '供应商编码',c.cVenName '供应商名称',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
+                 iQuantity - fInspectQuantity '待检数量',b.dDate '到货日期'-->
+        SELECT b.cVenCode '供应商编码',c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
+        a.iQuantity - a.fInspectQuantity arriveSum,CONVERT(varchar(30),b.dDate,23) arriveDate
+        FROM
+        PU_ArrivalVouchs a
+        left join PU_ArrivalVouch b on a.id = b.id
+        left join Vendor c on b.cVenCode = c.cVenCode
+        left join Inventory d on a.cInvCode = d.cInvCode
+        where  (a.iQuantity - a.fInspectQuantity) &gt; 0
+        order by b.dDate desc
+
     </select>
 
-    <select id="getQualifiedInQty" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
-        SELECT
-        i.cInvName ,
-        sum(mo.QualifiedInQty) as qualifiedinqty
+    <select id="getCheckSum" resultType="int">
+
+        SELECT count(1)
         FROM
-        mom_orderdetail mo
-        LEFT JOIN Inventory i ON mo.InvCode = i.cInvCode
-        GROUP BY
-        i.cInvName
+        PU_ArrivalVouchs a
+        left join PU_ArrivalVouch b on a.id = b.id
+        left join Vendor c on b.cVenCode = c.cVenCode
+        left join Inventory d on a.cInvCode = d.cInvCode
+        where  (a.iQuantity - a.fInspectQuantity) &lt;= 0
+
+    </select>
+
+
+    <select id="getWatingInList" resultType="java.util.HashMap">
+
+        <!-- SELECT b.cVenCode '供应商编码',c.cVenName '供应商名称',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
+                 fValidQuantity - fRealQuantity '已到货未入库数据',b.dportdate '到货日期'-->
+        SELECT b.cVenCode '供应商编码',c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
+        a.fValidQuantity - a.fValidInQuan arriveSum,CONVERT(varchar(30),b.dDate ,23) arriveDate
+        FROM
+        PU_ArrivalVouchs a
+        left join PU_ArrivalVouch b on a.id = b.id
+        left join Vendor c on b.cVenCode = c.cVenCode
+        left join Inventory d on a.cInvCode = d.cInvCode
+        where  (a.fValidQuantity - a.fValidInQuan) &gt; 0
+        order by b.dportdate desc
+
     </select>
 
-    <select id="getQualifiedInQtyWeek" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+    <select id="getInSum" resultType="int">
+        SELECT count(1)
+        FROM
+        PU_ArrivalVouchs a
+        left join PU_ArrivalVouch b on a.id = b.id
+        left join Vendor c on b.cVenCode = c.cVenCode
+        left join Inventory d on a.cInvCode = d.cInvCode
+        where  (a.fValidQuantity - a.fValidInQuan) &lt;= 0
+    </select>
+
+    <select id="getPassRateByVendor" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch">
         SELECT
-        top 10
-        i.cInvName,
-        sum( QualifiedInQty ) as QualifiedInQty
+            top 10
+            v.cVenName,round( CAST (( SUM ( pa.fValidQuantity ) * 1.0 / SUM ( pa.iQuantity )) AS FLOAT ), 0 ) * 100 AS passRate
         FROM
-        mom_orderdetail mo
-        LEFT JOIN Inventory i ON mo.InvCode = i.cInvCode
-        left join mom_morder mm on mo.modid=mm.modid
+            PU_ArrivalVouchs pa
+            LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+            LEFT JOIN Vendor v ON p.cVenCode= v.cVenCode
         WHERE
-        datediff( WEEK, mm.DueDate, getdate ( ) ) = 0
+            datediff(
+            MONTH,
+            p.dDate,
+            getdate()) = 0
         GROUP BY
-        i.cInvName
+            p.cVenCode,v.cVenName
     </select>
 
-    <select id="getMonthList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+    <select id="getCheckRateByBatchno" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch">
         SELECT
-        m.MoCode,
-        i.cInvCode,
-        i.cInvStd,
-        i.cInvName,
-        mo.Qty,
-        mo.QualifiedInQty
+            top 10
+            v.cVenName,round( CAST (( SUM ( pa.fValidQuantity ) * 1.0 / SUM ( pa.iQuantity )) AS FLOAT ), 0 ) * 100 AS passRate
         FROM
-        mom_orderdetail mo
-        LEFT JOIN mom_order m ON mo.MoId= m.MoId
-        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
-        left join mom_morder mm on mo.MoDId=mm.MoDId
+            PU_ArrivalVouchs pa
+            LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+            LEFT JOIN Vendor v ON p.cVenCode= v.cVenCode
         WHERE
-        datediff(
-        MONTH,
-        mm.StartDate,
-        getdate()) =0
+            pa.bInspect=1
+            and
+            datediff(
+            MONTH,
+            p.dDate,
+            getdate()) = 0
+        GROUP BY
+            p.cVenCode,v.cVenName
     </select>
 
-    <select id="getDayList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+    <select id="getTodayArriveSum" resultType="java.lang.Integer">
         SELECT
-        m.MoCode,
-        i.cInvCode,
-        i.cInvStd,
-        i.cInvName,
-        mo.Qty,
-        mo.QualifiedInQty
+            count(pa.Autoid)
         FROM
-        mom_orderdetail mo
-        LEFT JOIN mom_order m ON mo.MoId= m.MoId
-        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
-        left join mom_morder mm on mo.MoDId=mm.MoDId
+        PU_ArrivalVouchs pa
+        LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
         WHERE
         DateDiff(
         dd,
-        mm.StartDate,
+        p.dDate,
         getdate()) =0
     </select>
 
-    <select id="getListByOrderSheetCurrentStock" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
-        SELECT SUM
-        ( iQuantity ) as materialPreparationTotal,
-        cInvCode
+    <select id="getWillArriveSum" resultType="java.lang.Integer">
+        SELECT
+        count(pa.Autoid)
         FROM
-        CurrentStock
-        GROUP BY
-        cInvCode
+        PU_ArrivalVouchs pa
+        LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+        WHERE
+        p.dDate <![CDATA[ >= ]]> getdate()
+        AND p.dDate <![CDATA[ <= ]]> dateadd(
+        DAY,
+        3,
+        getdate())
     </select>
 
-    <select id="getListByOrderSheetMomMoallocate" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+    <select id="getThisMonthArriveSum" resultType="java.lang.Integer">
         SELECT
-        SUM ( mm.Qty ) as materialPreparationNumber,
-        mo.InvCode,
-        m.MoCode,
-        i.cinvname,
-        i.cinvcode,
-        i.cinvstd
+                count(pa.Autoid)
         FROM
-        mom_moallocate mm
-        LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
-        left join mom_order m on mo.MoId=m.MoId
-        left join Inventory i on mo.InvCode=i.cInvCode
-        GROUP BY
-        mo.MoId,mo.InvCode,m.MoCode,i.cinvname,i.cinvcode,i.cinvstd
+        PU_ArrivalVouchs pa
+        LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+        WHERE
+            datediff(
+            MONTH,
+            p.dDate,
+            getdate()) =0
     </select>
 
-    <select id="getApplyList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
-        SELECT SUM
-        ( mm.RequisitionQty ) - SUM ( RequisitionIssQty ) AS unfinishedQuantity,
-        mo.InvCode,
-        m.MoCode,
-        i.cinvname,
-        i.cinvcode,
-        i.cinvstd
+    <select id="getNotInSum" resultType="java.lang.Integer">
+        SELECT
+        count(pa.Autoid)
         FROM
-        mom_moallocate mm
-        LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
-        LEFT JOIN mom_order m ON mo.MoId= m.MoId
-        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
-        GROUP BY
-        mo.MoId,
-        mo.InvCode,
-        m.MoCode,
-        i.cinvname,
-        i.cinvcode,
-        i.cinvstd
-        HAVING
-        SUM ( mm.RequisitionQty )-sum(RequisitionIssQty)>0
+        PU_ArrivalVouchs pa
+        LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+        WHERE
+        (pa.iQuantity-pa.fRealQuantity)>0
+	    and
+        datediff(
+        MONTH,
+        p.dDate,
+        getdate()) =0
     </select>
+
+
+
 </mapper>