git-svn-id: https://192.168.57.71/svn/jsgkj@1853 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java

@@ -645,7 +645,6 @@ public class XkzxxCtl extends BaseWebCtl {
 					if (xkzlist != null && xkzlist.size() > 0) {
 						xkzxx = xkzlist.get(0);
 					}
-
 					if ((xkzlist == null || xkzlist.size() < 1)) {
 
 						List<LhsqEntity> lhsqlist = lhsqService.findByJyrid(gkjyr.getId());
@@ -688,7 +687,6 @@ public class XkzxxCtl extends BaseWebCtl {
 						}
 					}
 					if (StringUtils.isEmpty(xkzxx.getStype())) {
-
 						if ("1".equals(flag)) {// 申请
 							if (xkzlist != null && xkzlist.size() > 0) {
 								wr.setSuccess(false);
@@ -696,14 +694,34 @@ public class XkzxxCtl extends BaseWebCtl {
 								return wr;
 							}
 						} else if ("2".equals(flag)) {
+							List<LhyxEntity> lhyxlist = lhyxService.findByJyrid(gkjyr.getId());
+							if (lhyxlist != null && lhyxlist.size() > 0) {
+								for (LhyxEntity lhyx : lhyxlist) {
+									if ("0".equals(lhyx.getFlowstatus()) || "6".equals(lhyx.getFlowstatus())) {
+										wr.setSuccess(false);
+										wr.setMessage("该经营人正在理货延续中，请勿再申请");
+										return wr;
+									}
+								}
+							}
 							xkzlist = xkzxxService.findByJyrid(gkjyr.getId(), Constants.XKZ_WSX);
 							if (xkzlist != null && xkzlist.size() > 0) {
 								wr.setSuccess(false);
 								wr.setMessage("该经营人已经延续过许可证，请勿再申请");
 								return wr;
 							}
+						}else if(flag == null){
+							List<LhbgEntity> lhbglist = lhbgService.findByJyrid(gkjyr.getId());
+							if (lhbglist != null && lhbglist.size() > 0) {
+								for (LhbgEntity lhbg : lhbglist) {
+									if ("0".equals(lhbg.getFlowstatus()) || "6".equals(lhbg.getFlowstatus())) {
+										wr.setSuccess(false);
+										wr.setMessage("该经营人正在理货变更中，请勿再申请");
+										return wr;
+									}
+								}
+							}
 						}
-
 					} else if ("1".equals(xkzxx.getStype())) {
 
 						if ("1".equals(flag)) {// 申请