产线看板 品

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

@@ -3,10 +3,10 @@
 <mapper namespace="org.jeecg.modules.fbsDispatchList.mapper.FbsDispatchListMapper">
     <select id="getWatingSendList" resultType="java.util.HashMap">
 
-         SELECT top 6 <!--c.cWhName '仓库',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
+         SELECT <!--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.cItemName cItemName
+                a.iQuantity - a.fOutQuantity sendSum,CONVERT(varchar(30),b.dDate,23) planSendDate,a.cItemName cItemName,a.cItemCode cItemCode
         FROM
              DispatchLists a
              left join DispatchList b on a.DLID  = b.DLID

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

@@ -2,35 +2,43 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.fbsDispatchLists.mapper.FbsDispatchListsMapper">
     <select id="getProjectDelivery" resultType="org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists">
-        SELECT  top 1000 SUM ( iQuantity ) AS iQuantity,
+        SELECT
+            SUM( ps.iQuantity ) AS iQuantity,
             cItemName
         FROM
-            DispatchLists
+            DispatchLists ps
+            LEFT JOIN DispatchList d ON ps.DLID = d.DLID
+        WHERE
+            ps.cWhCode = '01'
+            AND datediff( MONTH, d.dDate, getdate ( ) ) = 0
         GROUP BY
-            cItemName
+            ps.cItemName
+
     </select>
 
     <select id="getMonthSendByProject" resultType="org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists">
         SELECT
-            DispatchList.months as months,
-            count( DispatchList.cDLCode ) as itemCount
+            DispatchList.months AS months,
+            count( DispatchList.cItemCode ) AS itemCount
         FROM
             (
         SELECT
-            d.cDLCode,
+            count( ds.cItemCode ) cItemCode,
             substring( d.cDLCode, 5, 2 ) months
         FROM
             DispatchLists ds
             LEFT JOIN DispatchList d ON ds.DLID = d.DLID
         WHERE
             substring( d.cDLCode, 3, 2 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 2 )
+            AND d.cSTCode='01'
+            AND ds.cItemCode <![CDATA[ <> ]]>  '0002'
         GROUP BY
-            d.cDLCode,
+            ds.cItemCode,
             substring( d.cDLCode, 5, 2 )
             ) AS DispatchList
         GROUP BY
             DispatchList.months
-
-        ORDER BY months
+        ORDER BY
+            months
     </select>
 </mapper>

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

@@ -105,4 +105,13 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     * @return java.lang.Integer
     */
     Integer getApplyCompleteSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 仓库看板：齐套数据
+    * @Date 2020/11/9 19:45
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getListByOrderSheetEnough();
 }

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

@@ -123,8 +123,33 @@
             i.cinvname,
             i.cinvcode,
             i.cinvstd
+       <!-- HAVING
+            SUM( mm.Qty )-SUM(mm.IssQty)>0 -->
+    </select>
+
+    <select id="getListByOrderSheetEnough" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT SUM
+            ( mm.Qty ) AS Qtys,
+            sum(mm.IssQty) as IssQty,
+            mo.InvCode,
+            m.MoCode,
+            i.cinvname,
+            i.cinvcode,
+            i.cinvstd
+        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.Qty )-SUM(mm.IssQty)>0
+            SUM( mm.Qty )-SUM(mm.IssQty) <![CDATA[ <=]]>  0
     </select>
 
     <select id="getListByOrderSheetNotEnough" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">

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

@@ -93,4 +93,13 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     * @return java.lang.Integer
     */
     Integer getApplyCompleteSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 仓库看板：齐套数据
+    * @Date 2020/11/9 19:46
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getListByOrderSheetEnough();
 }

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

@@ -70,7 +70,7 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
                 boolean ismomMoallocateCode=false;
                 for(FbsMomOrderdetail currentStock:fbsMomOrderdetailListCurrentStock){
                     if(momMoallocate.getCinvcode().equals(currentStock.getCinvcode())){
-                        if(type.equals("1")){//备料
+                        if(type.equals("1")){//备料/齐套
                             getMaterialPreparation(currentStock,momMoallocate,fbsMomOrderdetailList);
                         }else if(type.equals("2")){//缺料
                             getLackOfMaterial(currentStock,momMoallocate,fbsMomOrderdetailList);
@@ -82,8 +82,16 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
                 }
                 //没仓仓库找到
                 if(ismomMoallocateCode==false){
-                    momMoallocate.setShortageQuantity(momMoallocate.getQtys()-momMoallocate.getIssQty());
-                    fbsMomOrderdetailList.add(momMoallocate);
+                    if(type.equals("3")){
+                        momMoallocate.setShortageQuantity(momMoallocate.getQtys()-momMoallocate.getIssQty());
+                        fbsMomOrderdetailList.add(momMoallocate);
+                    }
+                    //齐套
+                    if(type.equals("1")){
+                        if(momMoallocate.getQtys()-momMoallocate.getIssQty()<=0){
+                            fbsMomOrderdetailList.add(momMoallocate);
+                        }
+                    }
                 }
             }
         }
@@ -91,6 +99,16 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
     }
 
     @Override
+    public List<FbsMomOrderdetail> getListByOrderSheetEnough() {
+        List<FbsMomOrderdetail> fbsMomOrderdetailListCurrentStock=fbsMomOrderdetailMapper.getListByOrderSheetCurrentStock();
+        List<FbsMomOrderdetail> fbsMomOrderdetailListMomMoallocate=fbsMomOrderdetailMapper.getListByOrderSheetMomMoallocate();
+        List<FbsMomOrderdetail> fbsListByOrderSheetEnough=fbsMomOrderdetailMapper.getListByOrderSheetEnough();
+        return null;
+    }
+
+
+
+        @Override
     public List<FbsMomOrderdetail> getApplyList() {
         return fbsMomOrderdetailMapper.getApplyList();
     }
@@ -99,9 +117,10 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
 
     //备料
     public void getMaterialPreparation(FbsMomOrderdetail currentStock,FbsMomOrderdetail momMoallocate,List<FbsMomOrderdetail> fbsMomOrderdetailList){
-        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getQtys()>0){
+        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getQtys()>=0){
             fbsMomOrderdetailList.add(momMoallocate);
         }
+
     }
 
     //缺料
@@ -115,11 +134,10 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
 
     //备料缺料
     public void getMaterialPreparationAndLackOfMaterial(FbsMomOrderdetail currentStock,FbsMomOrderdetail momMoallocate,List<FbsMomOrderdetail> fbsMomOrderdetailList){
-        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getQtys()>0){
+        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

@@ -16,22 +16,31 @@
         where  (a.iQuantity - a.fInspectQuantity) > 0
         order by b.dDate desc-->
         SELECT
-            pp.cVenCode vendorName,
-            pps.cInvCode materialCode,
-            i.cInvName materialName,
-            CONVERT(varchar(30),pps.dArriveDate,23) arriveDate,
-			CONVERT(varchar(30),pp.dPODate,23) 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
+        pp.cVenCode vendorName,
+        pps.cInvCode materialCode,
+        i.cInvName materialName,
+        CONVERT ( VARCHAR ( 30 ), pps.dArriveDate, 23 ) arriveDate,
+        CONVERT ( VARCHAR ( 30 ), pp.dPODate, 23 ) dPODate,
+        pps.iArrQTY arriveSum,
+        sum( puas.fInspectQuantity ) AS fInspectQuantity,
+        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
+        LEFT JOIN PU_ArrivalVouchs puas ON pps.ID = puas.iPOsID
         WHERE
-            pps.iArrQTY- pps.freceivedqty > 0
+        pps.iArrQTY - pps.freceivedqty > 0
+        GROUP BY
+        pp.cVenCode,
+        pps.cInvCode,
+        i.cInvName,
+        pps.dArriveDate,
+        pp.dPODate,
+        pps.iArrQTY,
+        pps.freceivedqty
         ORDER BY
-            pp.dPODate DESC
+        pp.dPODate DESC
 
     </select>
 
@@ -195,11 +204,11 @@
     </select>
 
     <select id="getQualityUnpassList" resultType="java.util.HashMap">
-        SELECT
+        <!--SELECT
             pp.cPOID cPOID,
             iArrQTY iArrQTY,
             qq.CPOCODE cpocode,
-             CONVERT(varchar(30),qq.DDATE,23) ddate,
+            CONVERT ( VARCHAR ( 30 ), qq.DDATE, 23 ) ddate,
             qq.CVENCODE cvencode,
             qq.CINVCODE cinvcode,
             qq.cInvName cinvName,
@@ -235,7 +244,26 @@
             q.CVENCODE,
             q.CINVCODE,
             i.cInvName
-            ) qq ON pp.cPOID = qq.CPOCODE
+            ) qq ON pp.cPOID = qq.CPOCODE-->
+
+
+        SELECT CONVERT
+        ( VARCHAR ( 30 ), q.DDATE, 23 ) ddate,
+        q.CVENCODE cvencode,
+        q.CINVCODE cinvcode,
+        i.cInvName cinvName,
+        sum( q.FDTQUANTITY ) fdtquantity,
+        sum( q.FDISQUANTITY ) fdisquantity,
+        sum( q.FQUANTITY ) fquantity
+        FROM
+        QMCHECKVOUCHER q
+        LEFT JOIN QMCHECKVOUCHERS qs ON qs.ID = q.ID
+        LEFT JOIN Inventory i ON q.CINVCODE = i.cInvCode
+        GROUP BY
+        CONVERT ( VARCHAR ( 30 ), q.DDATE, 23 ),
+        q.CVENCODE,
+        q.CINVCODE,
+        i.cInvName
             </select>
 
 </mapper>