导出

git-svn-id: https://192.168.57.71/svn/hbghj@92 201dd7a2-ec1b-f84b-8b06-88221118ff88

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/check/DcModel.as

@@ -448,6 +448,7 @@ package com.jtgh.yjpt.model.check
 			queryVo.szd=dcLayout.szd.selectedVO as CodeVo;
 			if(null==queryVo.szd||"NaN"==queryVo.szd.id.toString()){queryVo.szd=null;}
 			queryVo.szgq=dcLayout.szgq.selectedVO as GqVo;
+			queryVo.yhjb=dcLayout.yhjb.selectedVO as CodeVo;
 			queryVo.bdcdw=dcLayout.dwmc.selectedVO as JyrVo;
 			if(dcLayout.merge_comb.selectedItem!=undefined){
 				queryVo.mqzt = dcLayout.merge_comb.selectedItem.id;
@@ -467,6 +468,7 @@ package com.jtgh.yjpt.model.check
 			queryVo.szd=dcLayout.szd.selectedVO as CodeVo;
 			if(null==queryVo.szd||"NaN"==queryVo.szd.id.toString()){queryVo.szd=null;}
 			queryVo.szgq=dcLayout.szgq.selectedVO as GqVo;
+			queryVo.yhjb=dcLayout.yhjb.selectedVO as CodeVo;
 			queryVo.bdcdw=dcLayout.dwmc.selectedVO as JyrVo;
 			if(dcLayout.merge_comb.selectedItem!=undefined){
 				queryVo.mqzt = dcLayout.merge_comb.selectedItem.id;
@@ -492,7 +494,8 @@ package com.jtgh.yjpt.model.check
 				null==jcsjZ?"":fomaterDate.format(jcsjZ),
 				null==queryVo.bdcdwfzr?"":queryVo.bdcdwfzr,
 				Utils.getFunctionId(dcLayout)+"",
-				null==queryVo.mqzt?"":queryVo.mqzt
+				null==queryVo.mqzt?"":queryVo.mqzt,
+				queryVo.yhjb==null?"":queryVo.yhjb.id+""
 				);
 			var params:URLVariables = new URLVariables();
 			params.title=title;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/Check/JdjcglLayout.mxml

@@ -222,44 +222,47 @@
 		</s:HGroup>
 		<s:VGroup id="searchGroup" width="100%"  visible="false" includeInLayout="false">
 		<s:HGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle"  visible="{!sfJyrFlag}" includeInLayout="{!sfJyrFlag}">
-			<s:HGroup width="33%" horizontalAlign="left" verticalAlign="middle"  >
+			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle"  >
 				<cus:QLabel width="130" text="{resourceManager.getString('check','jdjcgl.szd')}"/>
 				<cus:QComboBox width="180" id="szd" comboxClass="SzdSelect" parentId="{Global.szd.id}"  requireSelection="true" change="getSzgq(event)" />
 			</s:HGroup>
-			<s:HGroup width="33%" horizontalAlign="left" verticalAlign="middle">
+			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 				<cus:QLabel width="130" text="{resourceManager.getString('check','jdjcgl.szgq')}"/>
 				<cus:QComboBox width="180" id="szgq" comboxClass="GqBySzdSelect" hasBlank="true" parentId="{Global.szd}"/>
 			</s:HGroup>
-			<s:HGroup width="33%" horizontalAlign="left" verticalAlign="middle">
+			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 				<cus:QLabel width="130" text="{resourceManager.getString('check','jdjcgl.bdcdw')}"/>
 				<cus:QComboBox id="dwmc" comboxClass="JyrSelect" hasBlank="true"  parentId="{Global.szd}"  width="180"/>
 			</s:HGroup>
 		</s:HGroup>
 		<s:HGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle">
-			<s:HGroup width="33%" horizontalAlign="left" verticalAlign="middle">
+			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 				<cus:QLabel width="130" text="{resourceManager.getString('check','jdjcgl.dcdw')}"/>
 				<cus:QTextInput width="180" text="@{dcModel.queryVo.dcdw}" />
 			</s:HGroup>
-			<s:HGroup width="33%" horizontalAlign="left" verticalAlign="middle">
+			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 				<cus:QLabel width="130" text="{resourceManager.getString('check','jdjcgl.bdcdwfzr')}"/>
 				<cus:QTextInput width="180" text="@{dcModel.queryVo.bdcdwfzr}"/>
 			</s:HGroup>
-			<s:HGroup width="33%" horizontalAlign="left" verticalAlign="middle">
+			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 			    <cus:QLabel width="130" text="{resourceManager.getString('check','jdjcgl.zgzt')}"/>
 			    <ui:PsComboBox id="merge_comb" dataProvider="{zgztList}" labelField="text" width="180" selectedIndex="0"/>
 		</s:HGroup>
 		</s:HGroup>
 			<s:HGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle">
-				<s:HGroup width="33%" horizontalAlign="left" verticalAlign="middle">
+				<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 					<cus:QLabel width="130" text="{resourceManager.getString('check','jdjcgl.jcrq')}"/>
 					<ui:DateTime id="sj1"  width="180"/>
 				</s:HGroup>
-				<s:HGroup width="33%"  verticalAlign="middle" horizontalAlign="left">
+				<s:HGroup width="31%"  verticalAlign="middle" horizontalAlign="left">
 					<cus:QLabel width="130" text="到"/>
 					<ui:DateTime id="sj2"  width="180"/>
 				</s:HGroup>
-				<s:HGroup   verticalAlign="middle" textAlign="left" width="33%">
-					<cus:QLabel   width="130"/>
+				<s:HGroup   verticalAlign="middle" textAlign="left" width="30%">
+					<cus:QLabel text="{resourceManager.getString('check','yhjb')}" width="130" />
+					<cus:QComboBox id="yhjb"  width="180" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_YHJB}" hasBlank="true" />
+				</s:HGroup>
+				<s:HGroup   verticalAlign="middle" textAlign="left">
 					<button:QueryButton click="dcModel.doQuery()"/>
 				</s:HGroup>
 			</s:HGroup>
@@ -273,6 +276,7 @@
 						<ui:DataGridColumn dataField="dcdw" headerText="{resourceManager.getString('check','jdjcgl.dcdw')}"/>
 						<ui:DataGridColumn dataField="jlr" headerText="{resourceManager.getString('check','jdjcgl.jlr')}"/>
 						<ui:DataGridColumn dataField="jdjcnr" headerText="{resourceManager.getString('check','jdjcgl.jdjcnr')}" showDataTips="true" dataTipField="jdjcnr" width="150"/>
+						<ui:DataGridColumn dataField="yhjbName" headerText="{resourceManager.getString('check','jdjcgl.yhjb')}" showDataTips="true" dataTipField="yhjbName" />
 						<ui:DataGridColumn dataField="lxdh" headerText="{resourceManager.getString('check','jdjcgl.lxdh')}"/>
 						<ui:DataGridColumn dataField="sj" dateFormatString="{TypeBase.DT_FMT_1}" headerText="{resourceManager.getString('check','jdjcgl.jcrq')}"/>
 						<ui:DataGridColumn dataField="bdcdwfzr" headerText="{resourceManager.getString('check','jdjcgl.bdcdwfzr')}"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/JyrView.mxml

@@ -76,40 +76,22 @@
 					rs.text="";
 				if(model.vo.zzagrysl.toString()=="NaN")
 					zzagrysl.text="";
-				if(model.vo.bayxq!=null){
-					var tempDate1:Date = new Date();
-					tempDate1["date"]+=Constants.YXQ;
-					if(ObjectUtil.dateCompare(model.vo.bayxq,tempDate1)<=0){
-							bayxq.setStyle("disabledColor","#FF0033");
-						    bayxq.setStyle("fontWeight","bold");
-							bayxq.toolTip="即将到期";
-					}
-				}
-				if(model.vo.fzyxq!=null){
-					var tempDate2:Date = new Date();
-					tempDate2["date"]+=Constants.YXQ;
-					if(ObjectUtil.dateCompare(model.vo.fzyxq,tempDate2)<=0){
-						fzyxq.setStyle("disabledColor","#FF0033");
-						fzyxq.setStyle("fontWeight","bold");
-						fzyxq.toolTip="即将到期";
-					}
-				}
 				var i:Number;
 				if(null!==model.vo.qyxz&&model.vo.qyxz.length>6){
-				for(i=0;i<7;i++){
-					var name:String="bw"+i;
-					this[name].selected=model.vo.qyxz.charAt(i)=='Y';
-				}
-				if(bw0.selected){
-					mtqy.visible=true;
-					mtqy.includeInLayout=true;
-				}
-				if(bw1.selected){
-					ccqy.visible=true;
-					ccqy.includeInLayout=true;
-				}
-				
-			}
+					for(i=0;i<7;i++){
+						var name:String="bw"+i;
+						this[name].selected=model.vo.qyxz.charAt(i)=='Y';
+					}
+					if(bw0.selected){
+						mtqy.visible=true;
+						mtqy.includeInLayout=true;
+					}
+					if(bw1.selected){
+						ccqy.visible=true;
+						ccqy.includeInLayout=true;
+					}
+					
+				}	
 				//设置 投资 泊位 仓库 堆场表单的初始值
 				model.fjList=new GlzdFileList();
 				model.fjList.entityId=model.vo.id;
@@ -176,6 +158,30 @@
 						}
 					}
 				}
+				if(model.vo.bayxq!=null){
+					var tempDate1:Date = new Date();
+					tempDate1["date"]+=Constants.YXQ;
+					if(ObjectUtil.dateCompare(model.vo.bayxq,tempDate1)<=0){
+						bayxq.setStyle("disabledColor","#FF0033");
+						bayxq.setStyle("fontWeight","bold");
+						bayxq.toolTip="即将到期";
+					}
+					if(ObjectUtil.dateCompare(model.vo.bayxq,new Date())<0){
+						bayxq.toolTip="已经过期";
+					}
+				}
+				if(model.vo.fzyxq!=null){
+					var tempDate2:Date = new Date();
+					tempDate2["date"]+=Constants.YXQ;
+					if(ObjectUtil.dateCompare(model.vo.fzyxq,tempDate2)<=0){
+						fzyxq.setStyle("disabledColor","#FF0033");
+						fzyxq.setStyle("fontWeight","bold");
+						fzyxq.toolTip="即将到期";
+					}
+					if(ObjectUtil.dateCompare(model.vo.fzyxq,new Date())<0){
+						fzyxq.toolTip="已经过期";
+					}
+				}
 			}				
 
 			protected function vboxClick(event:Event):void

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/check/DcController.java

@@ -107,6 +107,7 @@ public class DcController extends BaseController {
 			addNotEmptyModel(filterList, "pkj", "0", Operator.NEQ);
 		}
 		addNotEmptyModel(filterList, "szgq", entity.getSzgq(), Operator.EQ);
+		addNotEmptyModel(filterList,"yhjb", entity.getYhjb(),Operator.EQ);
 		addNotEmptyModel(filterList, "bdcdw", entity.getBdcdw(), Operator.EQ);
 		addNotEmptyModel(filterList, "dcdw", entity.getDcdw(), Operator.LIKE);
 		addNotEmptyModel(filterList, "mqzt", entity.getMqzt(), Operator.EQ);
@@ -358,6 +359,7 @@ public class DcController extends BaseController {
 		}
 		addNotEmptyModel(filterList, "bdcdwfzr", param.get(6), Operator.LIKE);
 		addNotEmptyModel(filterList, "mqzt", param.get(8), Operator.EQ);
+		addNotEmptyModel(filterList, "yhjb.id", param.get(9), Operator.EQ);
 		addNotEmptyModel(filterList, "recordStatus",
 				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 		Specification<DcEntity> spec = SpecificationCreater
@@ -413,12 +415,14 @@ public class DcController extends BaseController {
 					dc.getDcdw(),
 					dc.getJlr(),
 					dc.getJdjcnr(),
+					null == dc.getYhjb() ? "" : resource.getString(dc.getYhjb()
+							.getName()),
 					dc.getLxdh(),
 					null == dc.getSj() ? "" : sdf.format(dc.getSj()),
 					dc.getBdcdwfzr(),
 					mqzt,
-					null == dc.getSzd() ? "" : resource.getString(dc.getSzd()
-							.getName()),
+					null == dc.getSzd() ? "" : dc.getSzd()
+							.getName(),
 					null == dc.getSzgq() ? "" : dc.getSzgq().getGqmc(),
 					taskCurrName };
 			strings.add(ss);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/check/ZcController.java

@@ -607,7 +607,7 @@ public class ZcController extends BaseController {
 			ZcDcCountEntity e = list.get(i);
 			if (Constants.SZD_ID_PROVINCE.equals(szd))
 				PoiUtils.setCellValue(st0, i + 5, 1,
-						resource.getString(e.getSzd()));
+						e.getSzd());
 			else
 				PoiUtils.setCellValue(st0, i + 5, 1, e.getQymc());
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/common/JsfxxwhController.java

@@ -226,8 +226,8 @@ public class JsfxxwhController extends BaseController {
 					entity.getPc(),
 					entity.getFax(),
 					entity.getEmail(),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()), entity.getSzgq().getGqmc(),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(), entity.getSzgq().getGqmc(),
 					entity.getBrief() };
 			strings.add(ss);
 			i++;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jlrxxgl/GlzdxxController.java

@@ -268,8 +268,8 @@ public class GlzdxxController extends BaseController {
 					e.getXdrq() == null ? "" : sdf.format(e.getXdrq()),
 					e.getLxr(),
 					e.getLxdh(),
-					e.getSzd() == null ? "" : resource.getString(e.getSzd()
-							.getName()),
+					e.getSzd() == null ? "" : e.getSzd()
+							.getName(),
 					e.getSzgq() == null ? "" : e.getSzgq().getGqmc() };
 
 			List<String> ssList = Arrays.asList(ss);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jyr/JyrController.java

@@ -1383,7 +1383,7 @@ public class JyrController extends BaseController {
 						i + 5,
 						1,
 						Utils.getResource("select",
-								resource.getString(e.getSzd())));
+								e.getSzd()));
 				PoiUtils.setCellValue(st0, i + 5, 2, e.getQysl());
 				PoiUtils.setCellValue(st0, i + 5, 3, e.getYh());
 				PoiUtils.setCellValue(st0, i + 5, 4, e.getYj());

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jyrxxgl/GksssbController.java

@@ -205,8 +205,8 @@ public class GksssbController extends BaseController {
 					entity.getLxdh(),
 					entity.getCfcs(),
 					entity.getBz(),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					null == entity.getSzgq() ? "" : entity.getSzgq().getGqmc() };
 			strings.add(ss);
 			i++;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jyrxxgl/RyjbxxController.java

@@ -212,8 +212,8 @@ public class RyjbxxController extends BaseController {
 					zsEntity.getZsbh(),
 					zsEntity.getYxq() == null ? "" : sdf.format(zsEntity
 							.getYxq()),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					null == entity.getSsgq() ? "" : entity.getSsgq().getGqmc(),
 					entity.getBz() };
 			strings.add(ss);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/sgalgl/SgalglController.java

@@ -219,8 +219,8 @@ public class SgalglController extends BaseController {
 					null == entity.getSglx() ? "" : resource.getString(entity
 							.getSglx().getName()),
 					entity.getSgyy(),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					null == entity.getGq() ? "" : entity.getGq().getGqmc() };
 			strings.add(ss);
 			i++;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjgl/YjpxController.java

@@ -208,8 +208,8 @@ public class YjpxController extends BaseController {
 							.getPxxs().getName()),
 					entity.getPxdd(),
 					entity.getPxcjrs()==null?"": entity.getPxcjrs()+ "",
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					null == entity.getGq() ? "" : entity.getGq().getGqmc() };
 			strings.add(ss);
 			i++;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjgl/YjyaController.java

@@ -215,8 +215,8 @@ public class YjyaController extends BaseController {
 							.getYajb().getName()),
 					null == entity.getXdsj() ? "" : sdf
 							.format(entity.getXdsj()),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					null == entity.getGq() ? "" : entity.getGq().getGqmc() };
 			strings.add(ss);
 			i++;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjgl/YjylController.java

@@ -165,8 +165,8 @@ public class YjylController extends BaseController {
 					null == entity.getYlxs() ? "" : resource.getString(entity
 							.getYlxs().getName()),
 					entity.getYlcjrs() == null ? "" : entity.getYlcjrs() + "",
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" :entity
+							.getSzd().getName(),
 					null == entity.getGq() ? "" : entity.getGq().getGqmc() };
 			strings.add(ss);
 			i++;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjgl/YjyxController.java

@@ -198,8 +198,8 @@ public class YjyxController extends BaseController {
 					null == entity.getYxxs() ? "" : resource.getString(entity
 							.getYxxs().getName()),
 					entity.getYxcjrs()==null?"":entity.getYxcjrs()+ "",
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					null == entity.getGq() ? "" : entity.getGq().getGqmc() };
 			strings.add(ss);
 			i++;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjgl/zdwxyfb/CgController.java

@@ -202,8 +202,8 @@ public class CgController extends BaseController {
 					entity.getQyccbh(),
 					null == entity.getHxpsl() ? "" : entity.getHxpsl() + "",
 					entity.getGkzdwxybh(),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					null == entity.getGq() ? "" : entity.getGq().getGqmc(),
 					null == entity.getTcsj() ? "" : sdf
 							.format(entity.getTcsj()) };

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjzyxxgl/YjjynljbqkController.java

@@ -166,8 +166,8 @@ public class YjjynljbqkController extends BaseController {
 					hmxs,
 					entity.getWxhz(),
 					entity.getYjjyzjk_zylx(),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					null == entity.getGq() ? "" : entity.getGq().getGqmc() };
 			strings.add(ss);
 			i++;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjzyxxgl/YjwzxxController.java

@@ -185,8 +185,8 @@ public class YjwzxxController extends BaseController {
 					"应急物资库名称:",
 					entity.getBz(),
 					"所在地:",
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					"所在港区:",
 					null == entity.getGq() ? "" : entity.getGq().getGqmc(),
 					"所属经营人:",

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjzyxxgl/YjzjkController.java

@@ -209,8 +209,8 @@ public class YjzjkController extends BaseController {
 					entity.getXcszy(),
 					dh,
 					entity.getXjzd(),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()) };
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName() };
 			strings.add(ss);
 			i++;
 		}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjzyxxgl/ZyyjjydwController.java

@@ -189,8 +189,8 @@ public class ZyyjjydwController extends BaseController {
 					entity.getJz_fzr(),
 					entity.getJz_sj(),
 					entity.getJyxz(),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
+					null == entity.getSzd() ? "" : entity
+							.getSzd().getName(),
 					null == entity.getGq() ? "" : entity.getGq().getGqmc() };
 			strings.add(ss);
 			i++;