修改BUG

gavel/src/main/java/com/gavel/kwell/controller/GpfkController.java

@@ -217,7 +217,7 @@ public class GpfkController extends BaseController {
                 condition.setEnd(nowDate);
             }
         }
-        GpfkVO gpfkVO = gpfkService.getDailyGpfkInfo(condition);
+        GpfkVO gpfkVO = gpfkService.queryDailyFkInfoUpgrade(condition);
         return buildReturnData(gpfkVO);
     }
 

gavel/src/main/java/com/gavel/kwell/dao/GpfkDao.java

@@ -173,8 +173,10 @@ public interface GpfkDao extends BaseDao {
    public double queryWobomZpslByDjidAndWlidUpgrade(String wosncode,String bzgxid,String wlid);
    /**查询当前订单序列号最新检验反馈记录 */
    public GpfkVO queryJyGpfkByWosnUptoDate(String wosnid);
-   
+   /**查询包含自己的下面几道工序**/
    public List<Wogylx> getNextGxContainSelf(Wogylx wogylx) ;
+   /**查询包含自己的下面几道工序**/
+   public GpfkVO queryDailyFkInfoUpgrade(GpfkCondition condition);
    
    /** ------------END工票反馈升级-----------------***/
    

gavel/src/main/java/com/gavel/kwell/dao/GpfkjgDao.java

@@ -16,5 +16,6 @@ public interface GpfkjgDao extends BaseDao {
    public int queryIfContainsmdfkgx(GpfkjgCondition condition);
    
    public void deleteByCondition(GpfkjgCondition condition);
+   
 
 }

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java

@@ -1838,5 +1838,28 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	}
 
 
+	@Override
+	public GpfkVO queryDailyFkInfoUpgrade(GpfkCondition condition) {
+		SqlMap sqlMap = new SqlMap();
+        sqlMap.append(" select sum(gpfkjg_fksl) from gpfkjg  ");
+        sqlMap.append(" left join bzgx on bzgx_id = gpfkjg_bzgxid ");
+        sqlMap.append(" where 1 = 1");
+        sqlMap.append(" and bzgx_gxlx ='ZP' ");
+        if (StringUtils.isNotEmpty(condition.getBxid())){
+            sqlMap.append("  and c.GPFKJG_FKBX = :pBXID ");
+            sqlMap.setParamValue("pBXID",condition.getBxid());
+        }
+        if (StringUtils.isNotEmpty(condition.getFkrid())){
+            sqlMap.append("  and c.GPFKJG_FKRID = :pFKRID ");
+            sqlMap.setParamValue("pFKRID",condition.getFkrid());
+        }
+        if (condition.getYwrq() != null) {
+            sqlMap.append("  and c.GPFKJG_YWRQ >= :pYWRQ ");
+            sqlMap.setParamValue("pYWRQ", condition.getYwrq());
+        }
+        return sqlMap.queryEntity(GpfkVO.class);
+	}
+
+
 }
 

gavel/src/main/java/com/gavel/kwell/service/GpfkService.java

@@ -119,6 +119,8 @@ public interface GpfkService extends BaseEditService {
   
   public List<WobomVO> queryWobomByWoUpgrade(String wosn,String bzgx);
   
+  public GpfkVO queryDailyFkInfoUpgrade(GpfkCondition condition);
+  
 
     /** 科威尔mes工票反馈重写--end    */
 }

gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java

@@ -1860,6 +1860,23 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		}
 		return null;
 	}
+	
+	/** 查询当天装配计数 **/
+	@Override
+	public GpfkVO queryDailyFkInfoUpgrade(GpfkCondition gpfkCondition) {
+			Date nowDate = DateUtils.getDateTime();
+	        gpfkCondition.setYwrq(getGpfkYwrqByFksj(nowDate,gpfkCondition.getBxid()));
+	        GpfkVO gpfkVO = gpfkDao.queryDailyFkInfoUpgrade(gpfkCondition);
+	        if(gpfkVO == null){
+	            gpfkVO = new GpfkVO();
+	            gpfkVO.setFksl(0d);
+	            gpfkVO.setBhgsl(0d);
+	        }
+	        return gpfkVO;
+	}
+	
+	
+	
 //	@Override
 //	public FkVO zpfkUpgrade(FkCondition fkCondition) {
 //		/*
@@ -1985,6 +2002,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 //		return null;
 //	}
 
+
+
 //	@Override
 //	public FkVO jyfkUpgrade(FkCondition fkCondition) {
 //		/*