后台 看板问题修改

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

@@ -169,15 +169,16 @@ public class FbsWorkingStatisticsController {
 			 res.setMsg("该订单还没有派工"+entity.getOrderNumber());
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-		 if(list.get(0).getNumberOfTasks().doubleValue()==Double.valueOf(list.get(0).getLatestCompletedQuantity())){
-			 res.setCode("1");
-			 res.setMsg("该订单计划数量已经全部入库"+entity.getOrderNumber());
-			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
-		 }
+//		 if(list.get(0).getPlannedQuantity().doubleValue()==Double.valueOf(list.get(0).getLatestCompletedQuantity())){
+//			 res.setCode("1");
+//			 res.setMsg("该订单计划数量已经全部入库"+entity.getOrderNumber());
+//			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+//		 }
 		 FbsWorkshopDispatchList workshopDispatchList = list.get(0);
 		 //0初始，1接单,2暂停，3完成
 		 if(StringUtils.isNotBlank(workshopDispatchList.getState()) && !workshopDispatchList.getState().equals("0") &&
-                 !workshopDispatchList.getState().equals("2")){
+                 !workshopDispatchList.getState().equals("2")&&
+				 !workshopDispatchList.getState().equals("3")){
              res.setCode("1");
              res.setMsg("该订单已开工，请勿再次操作"+entity.getOrderNumber());
              return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
@@ -405,6 +406,9 @@ public class FbsWorkingStatisticsController {
 				// 计算差多少分钟
 				long min = diff / nm;
 				BigDecimal aa = new BigDecimal(min).divide(new BigDecimal("60"), 2, BigDecimal.ROUND_HALF_UP);
+				if(aa.doubleValue()>8.0){//超过八小时按照8小时计算
+					aa=new BigDecimal("8.0");
+				 }
 				entity.setWorkingHours(aa);
 				entity.setFinalTime(new Date());//获取当前时间
 
@@ -467,9 +471,9 @@ public class FbsWorkingStatisticsController {
 				 allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
 			 }
 		 }
-		 if(allHors.doubleValue()>8.0){//超过八小时按照8小时计算
-			 allHors=new BigDecimal("8.0");
-		 }
+//		 if(allHors.doubleValue()>8.0){//超过八小时按照8小时计算
+//			 allHors=new BigDecimal("8.0");
+//		 }
 
          if(entity.getState().equals("1")){
 			 //把数据传入u8数据库

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

@@ -47,7 +47,7 @@
             date, #{dateString} ) = DATE_FORMAT( now(),  #{dateString} )
         </if>
 
-        ) AS '其他（5S、会议、培训、研发）',
+        ) 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)

src/main/java/org/jeecg/modules/appInterface/service/impl/FbsWorkingStatisticsServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,7 +37,25 @@ public class FbsWorkingStatisticsServiceImpl extends ServiceImpl<FbsWorkingStati
 //                map.put(fbsWorkingStatistics.getProduct(),fbsWorkingStatistics.getWorkingHours());
 //            }
 //        }
-        return fbsWorkingStatisticsMapper.getByMaterial(dateString);
+        Map<String,Object> map=fbsWorkingStatisticsMapper.getByMaterial(dateString);
+        Map<String,Object> mapR=new LinkedHashMap<>();
+        if(Double.valueOf(String.valueOf(map.get("生产")))>0){
+            mapR.put("生产",map.get("生产"));
+        }
+        if(Double.valueOf(String.valueOf(map.get("其他")))>0){
+            mapR.put("其他（5S、会议、培训、研发）",map.get("其他"));
+
+        }
+        if(Double.valueOf(String.valueOf(map.get("异常")))>0){
+            mapR.put("异常",map.get("异常"));
+
+        }
+        if(Double.valueOf(String.valueOf(map.get("仓库")))>0){
+            mapR.put("仓库",map.get("仓库"));
+
+        }
+
+        return mapR;
     }
 
     @Override

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

@@ -4,7 +4,7 @@
     <select id="getMonthExceptionByCategory" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe">
         SELECT
             count( fawh.id ) AS total,
-            fawhd.type_name
+            fawhd.product
         FROM
             fbs_abnormal_working_hours_describe fawhd
             LEFT JOIN fbs_abnormal_working_hours fawh ON fawhd.abnormal_working_hours_id = fawh.id
@@ -14,7 +14,7 @@
             AND type='物料'
             AND date_format( fawh.date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
         GROUP BY
-            fawhd.type_name
+            fawhd.product
     </select>
 
     <select id="getListAndMain" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe">

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

@@ -30,7 +30,7 @@ public class FbsAbnormalWorkingHoursDescribeServiceImpl extends ServiceImpl<FbsA
         List<FbsAbnormalWorkingHoursDescribe> fbsAbnormalWorkingHoursDescribeMapperList=fbsAbnormalWorkingHoursDescribeMapper.getMonthExceptionByCategory();
         if(fbsAbnormalWorkingHoursDescribeMapperList!=null){
             for(FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe:fbsAbnormalWorkingHoursDescribeMapperList){
-                map.put(fbsAbnormalWorkingHoursDescribe.getTypeName(),fbsAbnormalWorkingHoursDescribe.getTotal());
+                map.put(fbsAbnormalWorkingHoursDescribe.getProduct(),fbsAbnormalWorkingHoursDescribe.getTotal());
             }
         }
         return map;

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

@@ -34,6 +34,7 @@
             DAY,
             3,
             getdate())
+        AND d.bPropertyCheck=1
         ORDER BY
             a.dArriveDate
     </select>

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

@@ -100,6 +100,7 @@
         where
         <!--(a.fValidQuantity - a.fValidInQuan) &gt; 0-->
         (a.fRealQuantity - a.fValidInQuan) &gt; 0
+        and d.bPropertyCheck=1
         order by b.dDate desc
 
     </select>
@@ -166,11 +167,13 @@
         FROM
         PU_ArrivalVouchs pa
         LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+        left join Inventory d on pa.cInvCode = d.cInvCode
         WHERE
         DateDiff(
         dd,
         p.dDate,
         getdate()) =0
+        and d.bPropertyCheck=1
     </select>
 
     <select id="getWillArriveSum" resultType="java.lang.Integer">
@@ -186,16 +189,18 @@
         3,
         getdate()) -->
         SELECT
-        count(ID)
+        count(a.ID)
         FROM
-        PO_Podetails
+        PO_Podetails a
+        LEFT JOIN Inventory d ON d.cInvCode = a.cInvCode
         WHERE
-        iQuantity - isnull( iReceivedQTY, 0 ) > 0
-        AND dArriveDate <![CDATA[ >= ]]>getdate()
-        AND dArriveDate <![CDATA[ <= ]]> dateadd(
+        a.iQuantity - isnull( a.iReceivedQTY, 0 ) > 0
+        AND a.dArriveDate <![CDATA[ >= ]]>getdate()
+        AND a.dArriveDate <![CDATA[ <= ]]> dateadd(
         DAY,
         3,
         getdate())
+        AND d.bPropertyCheck=1
     </select>
 
     <select id="getThisMonthArriveSum" resultType="java.lang.Integer">
@@ -204,11 +209,13 @@
         FROM
         PU_ArrivalVouchs pa
         LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+        left join Inventory d on pa.cInvCode = d.cInvCode
         WHERE
             datediff(
             MONTH,
             p.dDate,
             getdate()) =0
+            AND d.bPropertyCheck=1
     </select>
 
     <select id="getNotInSum" resultType="java.lang.Integer">
@@ -217,8 +224,10 @@
         FROM
         PU_ArrivalVouchs pa
         LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+        left join Inventory d on pa.cInvCode = d.cInvCode
         WHERE
         (pa.fRealQuantity - pa.fValidInQuan) &gt; 0
+        AND d.bPropertyCheck=1
         <!--(pa.iQuantity-pa.fRealQuantity)>0 -->
 	    <!--and
         datediff(
@@ -306,7 +315,7 @@
 
         where datediff(m,CONVERT ( VARCHAR ( 30 ), q.DDATE, 23 ),getdate()) <![CDATA[< ]]>3
         and q.FDISQUANTITY is not null
-
+        AND q.FDISBREAKQUANTITY >0
         ORDER BY q.DDATE desc
 
             </select>