修改BUG

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

@@ -1212,13 +1212,14 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	public FkVO queryKwellWoBySnid(String snid, String bzgx) {
 		 	SqlMap sqlMap = new SqlMap();
 	        sqlMap.append("select WO_ID,BZGX_CODE,WO_ZT,WLXX_CODE,WLXX_GG,WLXX_ID,WOSN_CODE,WOSN_ID,BZGX_ID,WOGYLX_ID,");
-	        sqlMap.append(" BZGX_NAME,WLXX_GG,WO_DJID,BZGX_GXLX,WOSN_CODE ");
+	        sqlMap.append(" BZGX_NAME,WLXX_GG,WO_DJID,BZGX_GXLX,WOSN_CODE,GPFK_ID ");
 	        sqlMap.append("from WOSN ");
 	        sqlMap.append("  left join  WO on WO_ID=WOSN_WOID");
 	        sqlMap.append("  left join WOGYLX on WOGYLX_WOID =WO_ID");
 	        sqlMap.append("  left join GYLX on GYLX_ID = WOGYLX_GYLXID");
 	        sqlMap.append("  left join BZGX on BZGX_ID =GYLX_BZGXID");
 	        sqlMap.append("  left join WLXX on wlxx_id = wo_wlid");
+	        sqlMap.append("  left join GPFK on GPFK_WOSNID = WOSN_CODE");
 	        sqlMap.append("where 1 = 1 ");
 	        sqlMap.append("  and WOSN_CODE = :pSNID ");
 	        sqlMap.setParamValue("pSNID",snid);

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

@@ -153,7 +153,7 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao {
 		@Override
 		public int queryIfZpwc(GphyCondition condition) {
 			SqlMap sqlMap = new SqlMap();
-	        sqlMap.append("select a.sl-b.sl FROM( select sum(wobom_dwyl) as sl ,GPFK_ID as fkid ");
+	        sqlMap.append("select ISNULL(a.sl,0)-ISNULL(b.sl,0) FROM( select sum(wobom_dwyl) as sl ,GPFK_ID as fkid ");
 	        sqlMap.append("  from GPFK  ");
 	        sqlMap.append("  left join WOBOM  on  WOBOM_FFGX =GPFK_fkgx   ");
 	        sqlMap.append("   left join WLXX on WLXX_ID = WOBOM_WLID ");

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

@@ -959,6 +959,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 				GphyCondition hyCondition =new GphyCondition();
 				hyCondition.setMid(curFkVo.getId());
 				curFkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
+				System.out.println(gphyDao.queryIfZpwc(hyCondition));
 				if(gphyDao.queryIfZpwc(hyCondition)==0) {
 					curFkVo.setZpbz(SmCodeEnum.OKBZ.getPrefix());
 				}