看板数据接口调整

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

@@ -6,7 +6,7 @@
          SELECT top 6 <!--c.cWhName '仓库',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
                 a.iQuantity - a.fOutQuantity '已做发货单未出库数据',b.dDate '到货日期'-->
                 c.cWhName warehouseName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-                a.iQuantity - a.fOutQuantity sendSum,CONVERT(varchar(30),b.dDate,23) planSendDate
+                a.iQuantity - a.fOutQuantity sendSum,CONVERT(varchar(30),b.dDate,23) planSendDate,a.cItemName cItemName
         FROM
              DispatchLists a
              left join DispatchList b on a.DLID  = b.DLID

src/main/java/org/jeecg/modules/fbsDispatchLists/mapper/xml/FbsDispatchListsMapper.xml

@@ -3,7 +3,7 @@
 <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,
+            6 SUM ( iQuantity ) AS iQuantity,
             cItemName
         FROM
             DispatchLists

src/main/java/org/jeecg/modules/fbsInventory/mapper/xml/FbsInventoryMapper.xml

@@ -24,7 +24,7 @@
 
     <select id="getAllStockList" resultType="java.util.HashMap">
 
-        select top 5 a.iQuantity realStockSum,b.cInvName materialName from
+        select top 5 a.iQuantity realStockSum,b.cInvName materialName,b.cInvCode cInvCode from
         (select cInvCode,sum(iQuantity) as iQuantity  from CurrentStock group by cInvCode) a
         left join Inventory b on a.cInvCode = b.cInvCode
 

src/main/java/org/jeecg/modules/fbsInventory/service/impl/FbsInventoryServiceImpl.java

@@ -45,7 +45,7 @@ public class FbsInventoryServiceImpl extends ServiceImpl<FbsInventoryMapper, Fbs
         Map<String,Object> map = new HashMap<>();
         if(mapList.size() > 0){
             for (Map<String,Object> m:mapList){
-                map.put(m.get("materialName").toString(),m.get("realStockSum"));
+                map.put(m.get("cInvCode").toString(),m.get("realStockSum"));
             }
         }
         return map;

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

@@ -2,7 +2,6 @@
 <!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.FbsMomOrderMapper">
     <select id="getEsopTaskList" resultType="java.util.HashMap">
-
         SELECT  b.MoCode orderSheetCode,a.InvCode materialCode,c.cInvName materialName,QualifiedInQty ,Qty qty,
          c.cInvStd specs from mom_orderdetail a
         left join mom_order b on a.MoId = b.MoId

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

@@ -73,7 +73,10 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
                             getMaterialPreparation(currentStock,momMoallocate,fbsMomOrderdetailList);
                         }else if(type.equals("2")){//缺料
                             getLackOfMaterial(currentStock,momMoallocate,fbsMomOrderdetailList);
+                        }else if(type.equals("3")){
+                            getMaterialPreparationAndLackOfMaterial(currentStock,momMoallocate,fbsMomOrderdetailList);
                         }
+
                     }
                 }
             }
@@ -101,4 +104,17 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
             fbsMomOrderdetailList.add(momMoallocate);
         }
     }
+
+    //备料缺料
+    public void getMaterialPreparationAndLackOfMaterial(FbsMomOrderdetail currentStock,FbsMomOrderdetail momMoallocate,List<FbsMomOrderdetail> fbsMomOrderdetailList){
+        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getQtys()>0){
+            fbsMomOrderdetailList.add(momMoallocate);
+        }
+        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getQtys()<0){
+
+            momMoallocate.setShortageQuantity(momMoallocate.getQtys()-momMoallocate.getIssQty()-currentStock.getMaterialPreparationTotal());
+            fbsMomOrderdetailList.add(momMoallocate);
+        }
+    }
+
 }

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

@@ -6,7 +6,7 @@
 
         <!-- 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,
+       <!-- 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
@@ -14,19 +14,44 @@
         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
+        order by b.dDate desc-->
+        SELECT
+            pp.cVenCode vendorName,
+            pps.cInvCode materialCode,
+            i.cInvName materialName,
+            pps.dArriveDate arriveDate,
+            pp.dPODate,
+            pps.iArrQTY arriveSum,
+            1 AS bj,
+            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.iArrQTY- pps.freceivedqty > 0
+        ORDER BY
+            pp.dPODate DESC
 
     </select>
 
     <select id="getCheckSum" resultType="int">
 
-        SELECT count(1)
+       <!-- 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.iQuantity - a.fInspectQuantity) &lt;= 0
+        where  (a.iQuantity - a.fInspectQuantity) &lt;= 0 -->
+        SELECT
+        count(pps.POID)
+        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.iArrQTY- pps.freceivedqty <![CDATA[ <= ]]> 0
 
     </select>
 
@@ -48,19 +73,22 @@
     </select>
 
     <select id="getInSum" resultType="int">
-        SELECT count(1)
+       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
-            v.cVenCode,round( CAST (( SUM ( pa.fValidQuantity ) * 1.0 / SUM ( pa.iQuantity )) AS FLOAT ), 0 ) * 100 AS passRate
+        <!--v.cVenName,-->
+            p.cVenCode,
+            round( CAST (( SUM ( pa.fValidQuantity ) * 1.0 / SUM ( pa.iQuantity )) AS FLOAT ), 0 ) * 100 AS passRate
         FROM
             PU_ArrivalVouchs pa
             LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
@@ -71,13 +99,16 @@
             p.dDate,
             getdate()) = 0
         GROUP BY
-            p.cVenCode,v.cVenCode
+            p.cVenCode
+        <!--,v.cVenName-->
     </select>
 
     <select id="getCheckRateByBatchno" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch">
         SELECT
             top 10
-            v.cVenName,round( CAST (( SUM ( pa.fValidQuantity ) * 1.0 / SUM ( pa.iQuantity )) AS FLOAT ), 0 ) * 100 AS passRate
+            <!--v.cVenName,-->
+            p.cVenCode,
+            round( CAST (( SUM ( pa.fValidQuantity ) * 1.0 / SUM ( pa.iQuantity )) AS FLOAT ), 0 ) * 100 AS passRate
         FROM
             PU_ArrivalVouchs pa
             LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
@@ -90,7 +121,8 @@
             p.dDate,
             getdate()) = 0
         GROUP BY
-            p.cVenCode,v.cVenName
+            p.cVenCode
+            <!--,v.cVenName-->
     </select>
 
     <select id="getTodayArriveSum" resultType="java.lang.Integer">

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/impl/FbsPuArrivalvouchServiceImpl.java

@@ -84,7 +84,7 @@ public class FbsPuArrivalvouchServiceImpl extends ServiceImpl<FbsPuArrivalvouchM
         Map<String,Object> map=new HashMap<>();
         if(fbsPuArrivalvouchList!=null){
             for(FbsPuArrivalvouch fbsPuArrivalvouch:fbsPuArrivalvouchList){
-                map.put(fbsPuArrivalvouch.getCVenName(),fbsPuArrivalvouch.getPassRate());
+                map.put(fbsPuArrivalvouch.getCvencode(),fbsPuArrivalvouch.getPassRate());
             }
         }
         return map;