修改BUG

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

@@ -175,7 +175,7 @@ public interface GpfkDao extends BaseDao {
    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/impl/GpfkDaoImpl.java

@@ -1846,7 +1846,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         sqlMap.append(" select sum(gpfkjg_fksl) as GPFK_FKSL, sum(GPFKJG_BHGSL) as GPFK_BHGSL, sum(GPFKJG_HGSL) as GPFK_HGSL  from gpfkjg  ");
         sqlMap.append(" left join bzgx on bzgx_id = gpfkjg_bzgxid ");
         sqlMap.append(" where 1 = 1");
-        sqlMap.append(" and (bzgx_gxlx ='ZP' or bzgx_gxlx ='JG') ");
+        //sqlMap.append(" and (bzgx_gxlx ='ZP' or bzgx_gxlx ='JG') ");
         if (StringUtils.isNotEmpty(condition.getBxid())){
             sqlMap.append("  and GPFKJG_FKBX = :pBXID ");
             sqlMap.setParamValue("pBXID",condition.getBxid());

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

@@ -121,6 +121,5 @@ public interface GpfkService extends BaseEditService {
   
   public GpfkVO queryDailyFkInfoUpgrade(GpfkCondition condition);
   
-
     /** 科威尔mes工票反馈重写--end    */
 }