首页 派工 仓库 看板接口

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

@@ -246,7 +246,7 @@ public class FbsWorkingStatisticsController {
 			 fbsWorkshopDispatchList.setFbsTechnologicalProcessItemName(entity.getFbsTechnologicalProcessItemName());
 		 }else {
 		 	//是否有同个流程  没有则累加到后面
-		 	if(list.get(0).getFbsTechnologicalProcessItemName().indexOf("entity.getFbsTechnologicalProcessItemName()")==-1){
+		 	if(list.get(0).getFbsTechnologicalProcessItemName().indexOf(entity.getFbsTechnologicalProcessItemName())==-1){
 				fbsWorkshopDispatchList.setFbsTechnologicalProcessItemName(list.get(0).getFbsTechnologicalProcessItemName()+"=>"+entity.getFbsTechnologicalProcessItemName());
 			}
 		 }

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

@@ -33,7 +33,7 @@
         (sum( fwdl.man_hours_completed ), DECIMAL ( 15, 2 ) ) AS '生产',
         (
         SELECT
-        IFNULL(sum( train ),0) + IFNULL(sum( meeting ),0) + IFNULL(sum( five_s ),0) + IFNULL(sum( research_and_development ),0)
+        IFNULL(sum( train ),0) + IFNULL(sum( meeting ),0) + IFNULL(sum( five_s ),0) + IFNULL(sum( research_and_development ),0)+ IFNULL(sum( pack ),0)+ IFNULL(sum( other ),0)
         FROM
         fbs_abnormal_working_hours
         WHERE
@@ -47,7 +47,24 @@
             date, #{dateString} ) = DATE_FORMAT( now(),  #{dateString} )
         </if>
 
-        ) AS '其他',
+        ) +(
+        SELECT
+        IFNULL(sum( train ),0) + IFNULL(sum( meeting ),0) + IFNULL(sum( five_s ),0) + IFNULL(sum( other ),0)
+        FROM
+        fbs_warehouse
+        WHERE
+        del_flag = '0'
+        <if test="dateString=='%Y-%m-%d'">
+            AND date_format(
+            date, #{dateString} ) = DATE_FORMAT( date_sub(curdate(),interval 1 day),  #{dateString} )
+        </if>
+        <if test="dateString=='%Y-%m'">
+            AND date_format(
+            date, #{dateString} ) = DATE_FORMAT( now(),  #{dateString} )
+        </if>
+        )
+
+        AS '其他',
         (
         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)
@@ -66,9 +83,9 @@
         ) as '异常',
         (
         SELECT
-        IFNULL(sum( mixed_ingredients ),0) + IFNULL(sum( warehousing ),0) + IFNULL(sum( pack ),0) + IFNULL(sum( warehouse_others ),0)
+        IFNULL(sum( work_order_batching ),0) + IFNULL(sum( storage_finished_products ),0) + IFNULL(sum( storage_raw_materials ),0) + IFNULL(sum( research_and_development ),0)+ IFNULL(sum( project_ingredients ),0)+ IFNULL(sum( project_delivery ),0)+ IFNULL(sum( pack_project ),0)+ IFNULL(sum( loading ),0)+ IFNULL(sum( inventory ),0)
         FROM
-        fbs_abnormal_working_hours
+        fbs_warehouse
         WHERE
         del_flag = '0'
         <if test="dateString=='%Y-%m-%d'">

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursController.java

@@ -534,4 +534,25 @@ public class FbsAbnormalWorkingHoursController {
 		 }
 		 return result;
 	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 报表工时的总工时统计
+	 * @Date 2021/1/26 15:58
+	 * @Param [yearMonth]
+	 * @return org.jeecg.common.api.vo.Result<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
+	 */
+	 @GetMapping(value = "/getTotal")
+	 public Result<FbsAbnormalWorkingHours> getTotal(String yearMonth){
+		 Result<FbsAbnormalWorkingHours> result=new Result<>();
+		 try {
+			 FbsAbnormalWorkingHours fbsAbnormalWorkingHours=fbsAbnormalWorkingHoursService.getTotal(yearMonth);
+			 result.setResult(fbsAbnormalWorkingHours);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		return result;
+	 }
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/FbsAbnormalWorkingHoursMapper.java

@@ -50,4 +50,13 @@ public interface FbsAbnormalWorkingHoursMapper extends BaseMapper<FbsAbnormalWor
     * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
     */
     List<FbsAbnormalWorkingHours> getMonthAttendance();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 报表工时的总工时统计
+    * @Date 2021/1/26 15:51
+    * @Param [yearMonth]
+    * @return org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours
+    */
+    FbsAbnormalWorkingHours getTotal(@Param("yearMonth")String yearMonth);
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/xml/FbsAbnormalWorkingHoursMapper.xml

@@ -65,7 +65,7 @@
     </select>
 
     <select id="getMonthAttendance" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours">
-        SELECT
+        <!--SELECT
             DATE_FORMAT( date, '%m' ) months,
             IfNULL( sum( number_of_people_to_arrive ), 0 ) number_of_people_to_arrive,
             IfNULL( sum( actual_number_of_people ), 0 ) actual_number_of_people
@@ -75,6 +75,71 @@
             del_flag = '0'
             AND DATE_FORMAT( date, '%Y' ) = DATE_FORMAT( now( ), '%Y' )
         GROUP BY
-            DATE_FORMAT( date, '%m' )
+            DATE_FORMAT( date, '%m' )-->
+        SELECT
+        months,
+        sum( number_of_people_to_arrive ) number_of_people_to_arrive,
+        sum( actual_number_of_people ) actual_number_of_people
+        FROM
+        (
+        SELECT
+        DATE_FORMAT( date, '%m' ) months,
+        IfNULL( sum( number_of_people_to_arrive ), 0 ) number_of_people_to_arrive,
+        IfNULL( sum( actual_number_of_people ), 0 ) actual_number_of_people
+        FROM
+        fbs_abnormal_working_hours
+        WHERE
+        del_flag = '0'
+        AND DATE_FORMAT( date, '%Y' ) = DATE_FORMAT( now( ), '%Y' )
+        GROUP BY
+        DATE_FORMAT( date, '%m' )
+        UNION
+        SELECT
+        DATE_FORMAT( date, '%m' ) months,
+        IfNULL( sum( number_of_people_to_arrive ), 0 ) number_of_people_to_arrive,
+        IfNULL( sum( actual_number_of_people ), 0 ) actual_number_of_people
+        FROM
+        fbs_warehouse
+        WHERE
+        del_flag = '0'
+        AND DATE_FORMAT( date, '%Y' ) = DATE_FORMAT( now( ), '%Y' )
+        GROUP BY
+        DATE_FORMAT( date, '%m' )
+        ) aa
+        GROUP BY
+        aa.months
+    </select>
+
+    <select id="getTotal" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours">
+        SELECT
+            sum( attendance_hours ) AS attendance_hours,
+            sum( overtime_hours ) AS overtime_hours,
+            sum( other ) AS other,
+            sum( quality ) AS quality,
+            sum( plan ) AS plan
+        FROM
+            (
+        SELECT
+            sum( attendance_hours ) AS attendance_hours,
+            sum( overtime_hours ) AS overtime_hours,
+            IFNULL( sum( train ), 0 ) + IFNULL( sum( meeting ), 0 ) + IFNULL( sum( research_and_development ), 0 ) + IFNULL( sum( five_s ), 0 ) + IFNULL( sum( pack ), 0 ) + IFNULL( sum( other ), 0 ) AS other,
+            IFNULL( sum( quality ), 0 ) + IFNULL( sum( materiel ), 0 ) + IFNULL( sum( equipment ), 0 ) + IFNULL( sum( design ), 0 ) + IFNULL( sum( energy ), 0 ) + IFNULL( sum( plan ), 0 ) quality,
+            0 AS plan
+        FROM
+            fbs_abnormal_working_hours fawh
+        WHERE
+            del_flag = '0' AND date_format( date,'%Y-%m' )=#{yearMonth}
+             UNION
+        SELECT
+            sum( attendance_hours ) AS attendance_hours,
+            sum( overtime_hours ) AS overtime_hours,
+            IFNULL( sum( train ), 0 ) + IFNULL( sum( meeting ), 0 ) + IFNULL( sum( five_s ), 0 ) + IFNULL( sum( other ), 0 ) AS other,
+            0 AS quality,
+            IFNULL( sum( work_order_batching ), 0 ) + IFNULL( sum( storage_finished_products ), 0 ) + IFNULL( sum( storage_raw_materials ), 0 ) + IFNULL( sum( research_and_development ), 0 ) + IFNULL( sum( project_ingredients ), 0 ) + IFNULL( sum( research_and_development ), 0 ) + IFNULL( sum( project_delivery ), 0 ) + IFNULL( sum( loading ), 0 ) + IFNULL( sum( inventory ), 0 ) AS plan
+        FROM
+            fbs_warehouse
+        WHERE
+            del_flag = '0' AND date_format( date,'%Y-%m' )=#{yearMonth}
+            ) aa
     </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/IFbsAbnormalWorkingHoursService.java

@@ -86,4 +86,13 @@ public interface IFbsAbnormalWorkingHoursService extends IService<FbsAbnormalWor
     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
     */
     List<Map<String,Object>> getMonthAttendance();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 报表工时的总工时统计
+    * @Date 2021/1/26 15:52
+    * @Param [yearMonth]
+    * @return org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours
+    */
+    FbsAbnormalWorkingHours getTotal(String yearMonth);
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursServiceImpl.java

@@ -340,4 +340,9 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
         return mapList;
     }
 
+    @Override
+    public FbsAbnormalWorkingHours getTotal(String yearMonth) {
+        return fbsAbnormalWorkingHoursMapper.getTotal(yearMonth);
+    }
+
 }

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

@@ -34,6 +34,7 @@
         AND a.iQuantity> 0
         AND a.cWhCode is NOT null
         AND datediff( MONTH, b.dDate, getdate( ) ) = 0
+        and b.cVerifier is not null
         GROUP BY
         b.DLID,
         b.dDate,

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

@@ -457,4 +457,8 @@ public class FbsMomOrderdetail implements Serializable {
 	//产品名称
 	@TableField(exist = false)
 	private String mocinvname;
+
+	//子件物料编码
+	@TableField(exist = false)
+	private String mInvCode;
 }

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

@@ -170,4 +170,13 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     * @return org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail
     */
     FbsMomOrderdetail getMomOrderDetailByMoCode(@Param("moCode")String moCode);
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 当月订单子件明细
+    * @Date 2021/1/25 16:01
+    * @Param []
+    * @return org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail
+    */
+    FbsMomOrderdetail getMomMoallocate();
 }

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

@@ -233,6 +233,29 @@
             cInvCode
     </select>
 
+    <select id="getMomMoallocate" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+            mm.Qty AS Qtys,
+            mm.IssQty AS IssQty,
+            mm.InvCode as mInvCode,
+            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
+        WHERE
+            mo.RelsUser IS NOT NULL
+          AND SUBSTRING ( m.MoCode, 3, 4 ) = SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )
+    </select>
+
+    <select id="">
+
+    </select>
 
     <select id="getListByOrderSheetMomMoallocate" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         <!--
@@ -251,27 +274,27 @@
         GROUP BY
             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
+        ( mm.Qty ) AS Qtys,
+        sum(mm.IssQty) as IssQty,
+        mo.InvCode,
+        m.MoCode,
+        i.cinvname,
+        i.cinvcode,
+        i.cinvstd
         FROM
-          mom_moallocate mm
+        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
         WHERE mo.RelsUser is NOT NULL
         AND SUBSTRING ( m.MoCode, 3, 4 ) = SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )
         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
        <!-- HAVING
             SUM( mm.Qty )-SUM(mm.IssQty)>0 -->
     </select>

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

@@ -136,4 +136,14 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     * @return org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail
     */
     FbsMomOrderdetail getMomOrderDetailByMoCode(String moCode);
+
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 最新缺料信息单
+    * @Date 2021/1/25 16:04
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getListByOrderSheetNow();
 }

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

@@ -137,6 +137,11 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         return fbsMomOrderdetailMapper.getMomOrderDetailByMoCode(moCode);
     }
 
+    @Override
+    public List<FbsMomOrderdetail> getListByOrderSheetNow() {
+        return null;
+    }
+
 
     @Override
     public List<FbsMomOrderdetail> getApplyList() {

src/main/java/org/jeecg/modules/fbsWarehouse/controller/FbsWarehouseController.java

@@ -8,6 +8,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -60,8 +62,23 @@ public class FbsWarehouseController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<FbsWarehouse>> result = new Result<IPage<FbsWarehouse>>();
+		String start=fbsWarehouse.getStart();
+		String end=fbsWarehouse.getEnd();
+		if(StringUtils.isNotBlank(start)){
+			fbsWarehouse.setStart(null);
+		}
+		if(StringUtils.isNotBlank(end)){
+			fbsWarehouse.setEnd(null);
+		}
 		QueryWrapper<FbsWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(fbsWarehouse, req.getParameterMap());
 		queryWrapper.lambda().eq(FbsWarehouse::getDelFlag,"0");
+		queryWrapper.lambda().orderByDesc(FbsWarehouse::getCreateTime);
+		if(StringUtils.isNotBlank(start)&&StringUtils.isNotBlank(end)&&!start.equals("null")&&!end.equals("null")){
+			queryWrapper.ge("DATE_FORMAT(date,'%Y-%m-%d')",start);
+			queryWrapper.le("DATE_FORMAT(date,'%Y-%m-%d')",end);
+		}else{
+			queryWrapper.apply("DATE_FORMAT( date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )");
+		}
 		Page<FbsWarehouse> page = new Page<FbsWarehouse>(pageNo, pageSize);
 		IPage<FbsWarehouse> pageList = fbsWarehouseService.page(page, queryWrapper);
 		result.setSuccess(true);

src/main/java/org/jeecg/modules/fbsWarehouse/entity/FbsWarehouse.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.fbsWarehouse.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;
@@ -171,4 +172,10 @@ public class FbsWarehouse implements Serializable {
 	/**自定义字段5*/
 	@Excel(name = "自定义字段5", width = 15)
 	private String def5;
+	//开始时间
+	@TableField(exist = false)
+	private String start;
+	//结束时间
+	@TableField(exist = false)
+	private String end;
 }

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

@@ -183,9 +183,11 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
 
                     }
                 }
+                //订单完成数量
                 if(quantityCompletedTotal!=0){
                     dispatchListSum.setQuantityCompletedTotal(quantityCompletedTotal);
                 }
+                //订单完成工时
                 if(manHoursCompletedTotal.doubleValue()!=0){
                     dispatchListSum.setManHoursCompletedTotal(formatDouble5(manHoursCompletedTotal.doubleValue()));
                 }
@@ -199,6 +201,31 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                     dispatchListSum.setStandardWorkingHoursActualTotal(working);
                 }
                 dispatchListSum.setFbsWorkshopDispatchListList(dispatchListAdd);
+                //计划达成率
+                //计划数量
+                BigDecimal numberOfTasksTotal=new BigDecimal("0.0");
+                if(StringUtils.isNotBlank(dispatchListSum.getNumberOfTasksTotal())){
+                    numberOfTasksTotal=getDecimalNew(dispatchListSum.getNumberOfTasksTotal());
+                }
+                //完成数量
+//                BigDecimal quantityCompletedTotal=new BigDecimal("0.0");
+//                if(dispatchListSum.getQuantityCompletedTotal()!=null){
+//                    quantityCompletedTotal=getDecimalNew(dispatchListSum.getQuantityCompletedTotal()+"");
+//                }
+                if(numberOfTasksTotal.doubleValue()>0.0){
+                    dispatchListSum.setAchievementRate(getDecimalNew(quantityCompletedTotal+"").divide(numberOfTasksTotal,2,BigDecimal.ROUND_HALF_UP).multiply(getDecimalNew("100.0")).doubleValue()+"");
+                }
+                //生产效率
+                //完成标准工时
+                BigDecimal standardWorkingHoursActualTotal=new BigDecimal("0.0");
+                if(StringUtils.isNotBlank(dispatchListSum.getStandardWorkingHoursActualTotal())){
+                    standardWorkingHoursActualTotal=getDecimalNew(dispatchListSum.getStandardWorkingHoursActualTotal());
+                }
+                if(manHoursCompletedTotal.doubleValue()>0.0){
+                    dispatchListSum.setProductionEfficiency(standardWorkingHoursActualTotal.divide(manHoursCompletedTotal,2,BigDecimal.ROUND_HALF_UP).multiply(getDecimalNew("100.0")).doubleValue()+"");
+                }
+
+
             }
         }