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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.jsp

@@ -123,7 +123,7 @@
 							            <i class="glyphicon glyphicon-search"></i> 
 							           </a>
 							           </authz:hasPermission>
-							 <c:if test="${lhbg.recordStatus == 1 && lhbg.sftb == 'N' }">     
+							 <c:if test="${lhbg.recordStatus == 1 && lhbg.sftb == 'N' && lhbg.flowstatus != 1}">     
 							      <c:if test="${ssFlag == 1 }"> 
 							  <%--    <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.submit('${lhbg.id}')" title="同步">
 						   <i class="glyphicon glyphicon-share"></i> --%>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.jsp

@@ -129,7 +129,7 @@
 									   <i class="glyphicon glyphicon-share"></i> 
 									          </a>
 						            </c:if>
-						         <c:if test="${ssFlag == 1 && lhsq.flowstatus != 2 }">   
+						         <c:if test="${ssFlag == 1 && lhsq.flowstatus != 2 && lhsq.flowstatus != 1}">   
 							     <authz:hasPermission name="${appName}:lhsq:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="lhsq.main.edit('${lhsq.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.jsp

@@ -125,7 +125,7 @@
 							            <i class="glyphicon glyphicon-search"></i> 
 							           </a>
 							           </authz:hasPermission>
-							 <c:if test="${lhyx.recordStatus == 1  && lhyx.sftb == 'N' }">     
+							 <c:if test="${lhyx.recordStatus == 1  && lhyx.sftb == 'N' && lhyx.flowstatus != 1}">     
 							      <c:if test="${ssFlag == 1  }"> 
 							    <%--  <a class="btn btn-default btn-xs" href="#"  onclick="lhyx.main.submit('${lhyx.id}')" title="同步">
 						  			 <i class="glyphicon glyphicon-share"></i>

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

@@ -651,7 +651,7 @@ public class XkzxxCtl extends BaseWebCtl {
 						List<LhsqEntity> lhsqlist = lhsqService.findByJyrid(gkjyr.getId());
 						if (lhsqlist != null && lhsqlist.size() > 0) {
 							for (LhsqEntity lhsq : lhsqlist) {
-								if ("0".equals(lhsq.getFlowstatus())) {
+								if ("0".equals(lhsq.getFlowstatus()) || "6".equals(lhsq.getFlowstatus())) {
 									wr.setSuccess(false);
 									wr.setMessage("该经营人正在理货申请中，请勿再申请");
 									return wr;
@@ -662,7 +662,7 @@ public class XkzxxCtl extends BaseWebCtl {
 						List<LhyxEntity> lhyxlist = lhyxService.findByJyrid(gkjyr.getId());
 						if (lhyxlist != null && lhyxlist.size() > 0) {
 							for (LhyxEntity lhyx : lhyxlist) {
-								if ("0".equals(lhyx.getFlowstatus())) {
+								if ("0".equals(lhyx.getFlowstatus()) || "6".equals(lhyx.getFlowstatus())) {
 									wr.setSuccess(false);
 									wr.setMessage("该经营人正在理货延续中，请勿再申请");
 									return wr;
@@ -673,7 +673,7 @@ public class XkzxxCtl extends BaseWebCtl {
 						List<LhbgEntity> lhbglist = lhbgService.findByJyrid(gkjyr.getId());
 						if (lhbglist != null && lhbglist.size() > 0) {
 							for (LhbgEntity lhbg : lhbglist) {
-								if ("0".equals(lhbg.getFlowstatus())) {
+								if ("0".equals(lhbg.getFlowstatus()) || "6".equals(lhbg.getFlowstatus())) {
 									wr.setSuccess(false);
 									wr.setMessage("该经营人正在理货变更中，请勿再申请");
 									return wr;

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -461,6 +461,7 @@ public class LhbgCtl extends BaseWebCtl {
 					code.setSzgq(jyr.getSzgq());
 					code.setSzd(jyr.getSzd());
 				}
+				code.setFlowstatus("6");
 				code.setSftb(Constants.NO);
 				lhbgEntity = lhbgService.save(code);
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -495,6 +495,7 @@ public class LhsqCtl extends BaseWebCtl {
 					code.setSzgq(jyr.getSzgq());
 					code.setSzd(jyr.getSzd());
 				}
+				code.setFlowstatus("6");
 				code.setSftb(Constants.NO);
 				lhsqEntity = lhsqService.save(code);
 			}
@@ -679,6 +680,7 @@ public class LhsqCtl extends BaseWebCtl {
 			fjid = fjid.substring(0, fjid.length() - 1);
 		}
 
+		entity.setFlowstatus(null);
 		entity.setSftb(Constants.YES);
 		lhsqService.save(entity);
 		String url = "GK_OPERATION_JSJY_LHSQ_ONE_CP?condition=ID=" + id + ";FJID=" + fjid;

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -458,6 +458,7 @@ public class LhyxCtl extends BaseWebCtl {
 					code.setSzd(jyr.getSzd());
 				}
 				code.setSftb(Constants.NO);
+				code.setFlowstatus("6");
 				lhyxEntity = lhyxService.save(code);
 			}
 			if (!StringUtils.isEmpty(accid)) {