1

ypff/ypff/classes/.gitkeep

@@ -0,0 +1,8 @@
+# .gitignore 
+
+# ignore all files in lib/
+
+# except for .gitkeep
+!.gitkeep
+# ignore TODO file in root directory,not subdir/TODO
+/TODO

ypff/ypff/src/private/nc/bs/yp/impl/OprepAddImpl.java

@@ -248,7 +248,7 @@ public class OprepAddImpl extends BaseServlet implements IHttpServletAdaptor {
 	 */
 	private String SqlexecuteQuery(String out,String table,String key,String value) throws DAOException {
 		
-		String sql = "select "+out+" from "+table+" where "+key+" = '"+value+"'";
+		String sql = "select "+out+" from "+table+" where "+key+" = '"+value+"' and nvl(dr,0)=0";
 		
 		Object object = dao.executeQuery(sql, new ColumnProcessor());
 		

ypff/ypff/src/private/nc/bs/yp/impl/PomUpdateStatusImpl.java

@@ -24,6 +24,7 @@ import nc.log.NcLog;
 import nc.md.persist.framework.IMDPersistenceQueryService;
 import nc.vo.mmpac.pickm.entity.AggPickmVO;
 import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
+import nc.yp.dao.PomStatusMaintain;
 import net.sf.json.JSONObject;
 
 /**
@@ -162,11 +163,11 @@ public class PomUpdateStatusImpl extends BaseServlet implements IHttpServletAdap
 			
 		}else if (statusName.equals("取消审批")) {
 			
-//			NCLocator.getInstance().lookup(PomStatusMaintain.class).PomStatus_RequiresNew(aggPickmVO, pmoAggVO);
-			
 			AggPickmVO aggPickmVO = getPickmVO(p_data.getString("vbillcode"));
 			AggPickmVO[] aggPickmVOs = new AggPickmVO[] {aggPickmVO};
 			
+//			NCLocator.getInstance().lookup(PomStatusMaintain.class).PomStatus_RequiresNew(aggPickmVO, pmoAggVO);
+			
 			if (aggPickmVO.getParentVO().getFbillstatus()==1) {
 				NCLocator.getInstance().lookup(IPpickmMaintainService.class).unAuditPickm(aggPickmVOs);
 			}
@@ -198,7 +199,7 @@ public class PomUpdateStatusImpl extends BaseServlet implements IHttpServletAdap
 			
 		}
 		else {
-			throw new Exception("status 只允许填写 '审批 '、 '未审批' 、'订单投放'、'取消投放'、'强制完工'、'取消完工'、'强制关闭'、''取消关闭',请检查数据'"+p_data.getString("statusName")+"'的合法性或编码格式是否正确！");
+			throw new Exception("status 只允许填写 '审批 '、 '取消审批' 、'订单投放'、'取消投放'、'强制完工'、'取消完工'、'强制关闭'、''取消关闭',请检查数据'"+p_data.getString("statusName")+"'的合法性或编码格式是否正确！");
 		}
 		
 	}
@@ -218,7 +219,7 @@ public class PomUpdateStatusImpl extends BaseServlet implements IHttpServletAdap
 	 */
 	private String SqlexecuteQuery(String out,String table,String key,String value) throws DAOException {
 		
-		String sql = "select "+out+" from "+table+" where "+key+" = '"+value+"'";
+		String sql = "select "+out+" from "+table+" where "+key+" = '"+value+"' and nvl(dr,0)=0";
 		
 		Object object = dao.executeQuery(sql, new ColumnProcessor());