产线看板 品质

src/main/java/org/jeecg/modules/fbsDispatchLists/controller/FbsDispatchListsController.java

@@ -245,7 +245,8 @@ public class FbsDispatchListsController {
   public Result<Map<String,Object>> getProjectDelivery(){
 	  Result<Map<String,Object>>  result=new Result<>();
 	  try {
-		  Map<String,Object> map=fbsDispatchListsService.getProjectDelivery();
+//		  Map<String,Object> map=fbsDispatchListsService.getProjectDelivery();
+		  Map<String,Object> map=fbsDispatchListsService.getMonthSendByProject();
 		  result.setResult(map);
 		  result.success("操作成功");
 	  } catch (Exception e) {

src/main/java/org/jeecg/modules/fbsDispatchLists/entity/FbsDispatchLists.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.fbsDispatchLists.entity;
 import java.io.Serializable;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -629,4 +630,11 @@ public class FbsDispatchLists implements Serializable {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date dconfirmdate;
+
+	/** 月份*/
+	@TableField(exist = false)
+	private String months;
+	/** 数量*/
+	@TableField(exist = false)
+	private String itemCount;
 }

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

@@ -22,4 +22,13 @@ public interface FbsDispatchListsMapper extends BaseMapper<FbsDispatchLists> {
     * @return java.util.List<org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists>
     */
     List<FbsDispatchLists> getProjectDelivery();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板：月度项目发货统计
+    * @Date 2020/10/30 17:08
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists>
+    */
+    List<FbsDispatchLists> getMonthSendByProject();
 }

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

@@ -10,4 +10,28 @@
         GROUP BY
             cItemName
     </select>
+
+    <select id="getMonthSendByProject" resultType="org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists">
+        SELECT
+            DispatchList.months as months,
+            count( DispatchList.cDLCode ) as itemCount
+        FROM
+            (
+        SELECT
+            d.cDLCode,
+            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 )
+        GROUP BY
+            d.cDLCode,
+            substring( d.cDLCode, 5, 2 )
+            ) AS DispatchList
+        GROUP BY
+            DispatchList.months
+
+        ORDER BY months
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsDispatchLists/service/IFbsDispatchListsService.java

@@ -23,4 +23,14 @@ public interface IFbsDispatchListsService extends IService<FbsDispatchLists> {
     */
 
     Map<String,Object> getProjectDelivery();
+
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板：月度项目发货统计
+    * @Date 2020/10/30 17:10
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getMonthSendByProject();
 }

src/main/java/org/jeecg/modules/fbsDispatchLists/service/impl/FbsDispatchListsServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsDispatchLists.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists;
 import org.jeecg.modules.fbsDispatchLists.mapper.FbsDispatchListsMapper;
 import org.jeecg.modules.fbsDispatchLists.service.IFbsDispatchListsService;
@@ -37,4 +38,26 @@ public class FbsDispatchListsServiceImpl extends ServiceImpl<FbsDispatchListsMap
         }
         return map;
     }
+
+    @Override
+    public Map<String, Object> getMonthSendByProject() {
+
+        List<FbsDispatchLists> fbsDispatchListsList=fbsDispatchListsMapper.getMonthSendByProject();
+        Map<String,Object> map=new HashMap<>();
+        String[] moths=new String[]{"01","02","03","04","05","06","07","08","09","10","11","12"};
+        //根据月份获取每个月数据
+        if(fbsDispatchListsList!=null){
+            for(String month:moths){
+                for(FbsDispatchLists fbsDispatchLists:fbsDispatchListsList){
+                    if(StringUtils.isNotBlank(fbsDispatchLists.getMonths())){
+                        if(month.equals(fbsDispatchLists.getMonths())){
+                            map.put(month,fbsDispatchLists.getItemCount());
+                        }
+                    }
+                }
+            }
+        }
+
+        return map;
+    }
 }

src/main/java/org/jeecg/modules/fbsMomOrder/entity/FbsMomOrderdetail.java

@@ -417,4 +417,13 @@ public class FbsMomOrderdetail implements Serializable {
 	//未完成数量
 	@TableField(exist = false)
 	private Integer unfinishedQuantity;
+	//应领数量
+	@TableField(exist = false)
+	private Integer qtys;
+	//已领数量
+	@TableField(exist = false)
+	private Integer issQty;
+	//缺料数量
+	@TableField(exist = false)
+	private Integer shortageQuantity;
 }

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

@@ -81,7 +81,9 @@
             cInvCode
     </select>
 
+
     <select id="getListByOrderSheetMomMoallocate" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        <!--
         SELECT
             SUM ( mm.Qty ) as materialPreparationNumber,
             mo.InvCode,
@@ -95,9 +97,34 @@
             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
+            mo.MoId,mo.InvCode,m.MoCode,i.cinvname,i.cinvcode,i.cinvstd -->
+        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
     </select>
 
+
+
+
     <select id="getApplyList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         SELECT SUM
             ( mm.RequisitionQty ) - SUM ( RequisitionIssQty ) AS unfinishedQuantity,

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

@@ -88,16 +88,16 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
 
     //备料
     public void getMaterialPreparation(FbsMomOrderdetail currentStock,FbsMomOrderdetail momMoallocate,List<FbsMomOrderdetail> fbsMomOrderdetailList){
-        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getMaterialPreparationNumber()>0){
-            momMoallocate.setMaterialPreparationTotal(currentStock.getMaterialPreparationTotal());
+        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getQtys()>0){
             fbsMomOrderdetailList.add(momMoallocate);
         }
     }
 
     //缺料
     public void getLackOfMaterial(FbsMomOrderdetail currentStock,FbsMomOrderdetail momMoallocate,List<FbsMomOrderdetail> fbsMomOrderdetailList){
-        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getMaterialPreparationNumber()<0){
-            momMoallocate.setMaterialPreparationTotal(currentStock.getMaterialPreparationTotal());
+        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/FbsArrivalVouchsMapper.xml

@@ -4,14 +4,36 @@
 
     <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,
+       <!-- select top 5 CONVERT(varchar(100), b.dDate, 23) arriveDate,c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,
           a.iQuantity arriveSum,d.cInvStd specs,b.cMemo memo
             from PU_ArrivalVouchs a
             left join PU_ArrivalVouch b on a.id = b.id
             left join Vendor c on c.cVenCode = b.cVenCode
             left join Inventory d on d.cInvCode = a.cInvCode
             where DATEDIFF(dd,getdate()+3,b.dDate) &gt; 0 and DATEDIFF(dd,getdate()+3,b.dDate) &lt; 4
-        order by b.dDate
+        order by b.dDate-->
+        SELECT  CONVERT
+            ( VARCHAR ( 100 ), a.dArriveDate, 23 ) arriveDate,
+            c.cVenName vendorName,
+            a.cInvCode materialCode,
+            d.cInvName materialName,
+            a.iQuantity arriveSum,
+            d.cInvStd specs,
+            b.cMemo memo
+        FROM
+          PO_Podetails a
+        LEFT JOIN PO_Pomain b ON a.POID = b.POID
+        LEFT JOIN Vendor c ON c.cVenCode = b.cVenCode
+        LEFT JOIN Inventory d ON d.cInvCode = a.cInvCode
+        WHERE
+            a.iQuantity - isnull( a.iReceivedQTY, 0 ) > 0
+            AND dArriveDate <![CDATA[ >= ]]>getdate()
+            AND dArriveDate <![CDATA[ <= ]]>dateadd(
+            DAY,
+            3,
+            getdate())
+        ORDER BY
+            a.dArriveDate
     </select>
 
    <!-- <select id="getWillArriveList" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs">

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

@@ -107,7 +107,7 @@
     </select>
 
     <select id="getWillArriveSum" resultType="java.lang.Integer">
-        SELECT
+       <!-- SELECT
         count(pa.Autoid)
         FROM
         PU_ArrivalVouchs pa
@@ -117,6 +117,17 @@
         AND p.dDate <![CDATA[ <= ]]> dateadd(
         DAY,
         3,
+        getdate()) -->
+        SELECT
+        count(ID)
+        FROM
+        PO_Podetails
+        WHERE
+        iQuantity - isnull( iReceivedQTY, 0 ) > 0
+        AND dArriveDate <![CDATA[ >= ]]>getdate()
+        AND dArriveDate <![CDATA[ <= ]]> dateadd(
+        DAY,
+        3,
         getdate())
     </select>
 
@@ -146,6 +157,7 @@
         MONTH,
         p.dDate,
         getdate()) =0
+
     </select>
 
 

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

@@ -1,16 +1,14 @@
 package org.jeecg.modules.fbsWorkshopDispatchList.controller;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -596,4 +594,28 @@ public class FbsWorkshopDispatchListController {
 		 }
 		 return result;
 	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 产线看板：生产计划
+	 * @Date 2020/10/30 11:08
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>>
+	 */
+	@GetMapping(value = "/getListNotStarted")
+	 public Result<List<FbsWorkshopDispatchList>> getListNotStarted(){
+		 Result<List<FbsWorkshopDispatchList>> result=new Result<>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		String format = sdf.format(new Date());
+		 QueryWrapper<FbsWorkshopDispatchList> queryWrapper=new QueryWrapper<>();
+		queryWrapper.lambda().eq(FbsWorkshopDispatchList::getDelFlag,"0");
+		queryWrapper.lambda().eq(FbsWorkshopDispatchList::getState,"0");
+		queryWrapper.eq("date_format( date, '%Y-%m-%d' )",format);
+		queryWrapper.lambda().orderByDesc(FbsWorkshopDispatchList::getDate);
+		 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.list(queryWrapper);
+		 result.setResult(fbsWorkshopDispatchListList);
+		 result.success("操作成功");
+		 return result;
+	 }
+
 }

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

@@ -157,9 +157,9 @@ public class FbsWorkshopDispatchList implements Serializable {
 
 	//完工时间
 	@TableField(exist = false)
-	@Excel(name = "日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "日期", width = 20, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private Date endDate;
 
 	//单日完成工时

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

@@ -116,19 +116,19 @@
         WHERE
             del_flag = '0'
             AND date_format( start_date, '%Y' ) = date_format( now( ), '%Y' )
-            AND date_format( fwdl.planned_start_time, '-%m' ) = date_format( start_date, '-%m' )
+            AND date_format( fwdl.planned_start_time, '%Y-%m' ) = date_format( start_date, '%Y-%m' )
         GROUP BY
             date_format( start_date, '%Y-%m' )
             ) as sum1,
             count( personnel_id_u8 ) as sum2,
-            date_format( fwdl.planned_start_time, '%m' ) as label
+            date_format( fwdl.planned_start_time, '%Y-%m' ) as label
         FROM
             fbs_workshop_dispatch_list fwdl
         WHERE
             del_flag = '0'
             AND date_format( planned_start_time, '%Y' ) = date_format( now( ), '%Y' )
         GROUP BY
-            date_format( planned_start_time, '-%m' )
+            date_format( planned_start_time, '%Y-%m' )
     </select>
 
     <select id="getWorkingHoursContrast" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
@@ -143,7 +143,7 @@
             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' )
+            AND date_format( fws.end_date, '%Y-%m' ) = date_format( now( ), '%Y-%m' )
         GROUP BY
             fwdl.product
     </select>
@@ -171,8 +171,9 @@
             AND fws.final_state = '3'
         WHERE
             fwd.del_flag = '0'
-
-          <!--   需要加入单日时间判断 派工单根据计划时间 现场单根据完工时间  -->
+            and DATE_FORMAT(now( ),'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(fwd.planned_start_time,'%Y-%m-%d')
+            and DATE_FORMAT(now( ),'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(fwd.planned_end_time,'%Y-%m-%d')
+        <!--   需要加入单日时间判断 派工单根据计划时间 现场单根据完工时间  -->
     </select>
 
     <select id="getAttendanceOfTheDay" resultType="java.util.HashMap">
@@ -192,16 +193,20 @@
             fwdl.production_order_number_name,
             fws.end_date,
             fwdl.product,
+            fwdl.product_id,
+            fwdl.planned_start_time,
+            fwdl.planned_end_time,
             fwdl.number_of_tasks,
             fws.qualified_number,
             fwdl.product_id
         FROM
-            fbs_workshop_dispatch_list fwdl
-            LEFT JOIN fbs_working_statistics fws ON fwdl.id = fws.pk_workshop_dispatch_list
-            AND fws.del_flag = '0'
-            AND fws.final_state = '3'
+          fbs_workshop_dispatch_list fwdl
+        LEFT JOIN fbs_working_statistics fws ON fwdl.id = fws.pk_workshop_dispatch_list
+          AND fws.del_flag = '0'
         WHERE
             fwdl.del_flag = '0'
+            and fwdl.state <![CDATA[ <> ]]> '0'
+            <!--and date_format( fwdl.date, '%Y-%m-%d' ) = date_format( now( ), '%Y-%m-%d' )-->
         ORDER BY
             fwdl.date DESC
             LIMIT 6