储罐增加状态显示

git-svn-id: https://192.168.57.71/svn/lyggkj@15 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-flex/trunk/locale/zh_CN/common.properties

@@ -58,6 +58,7 @@ btn.wharf=\u5371\u8d27\u4f01\u4e1a\u4fe1\u606f\u7edf\u8ba1
 btn.storage=\u5b58\u50a8\u8bbe\u65bd\u4fe1\u606f\u7edf\u8ba1
 btn.administrative=\u6cd5\u4eba\u884c\u653f\u8bb8\u53ef
 btn.message=\u6d88\u606f\u7ba1\u7406
+btn.status=\u72b6\u6001
 
 col.code=\u7f16\u7801
 col.id=ID

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/ClassRegistry.as

@@ -89,6 +89,7 @@ package com.jtgh.yjpt.common
 	import com.jtgh.yjpt.vo.yjgl.YjylVo;
 	import com.jtgh.yjpt.vo.yjgl.YjyxVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
+	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.QskVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.ZbhjjbqkVo;
 	import com.jtgh.yjpt.vo.yjzyxxgl.GkqyxxwhVo;
@@ -228,6 +229,7 @@ package com.jtgh.yjpt.common
 		GztxVo;
 		FrxzxkVo;
 		XksbVo;
+		CgztVo;
 		
 		// Select
 		CodeSelect;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/TypeBase.as

@@ -31,5 +31,6 @@ package com.jtgh.yjpt.common
 		public static var LINKBUTTON:String = "linkbutton";
 		public static var MULTIBUTTON:String = "multibutton";
 		public static var TEXTINPUT:String="textInput";
+		public static var GIFIMAGE:String="gifimage";
 	}
 }

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/component/renderer/GifImageRenderer.as

@@ -0,0 +1,68 @@
+package com.jtgh.yjpt.common.component.renderer
+{
+	import com.jtgh.yjpt.common.util.Utils;
+	import com.ldfsoft.flex.player.GIFPlayer;
+	
+	import flash.net.URLRequest;
+	
+	import mx.controls.Image;
+	import mx.events.FlexEvent;
+	
+	import spark.components.HGroup;
+	import spark.components.gridClasses.GridItemRenderer;
+	
+	
+	public class GifImageRenderer extends GridItemRenderer
+	{	
+		public function GifImageRenderer()
+		{
+			super();
+			this.addEventListener(FlexEvent.CREATION_COMPLETE,creation_complete);
+		}
+		
+		[Bindable]
+		public var group:HGroup = new HGroup();
+		
+		[Bindable]
+		private var gifPlay:GIFPlayer=new GIFPlayer();
+		
+		[Bindable]
+		public var zt:String; 
+		
+		[Bindable]
+		public var fieldName:String; 
+		
+		[Bindable]
+		public var image:Image = new Image();
+		
+		override public function set data(val:Object):void
+		{
+			super.data=val;
+			if(val!=null){
+				zt=val[fieldName]==null?"":val[fieldName].toString();
+			}
+		}
+		
+		private function creation_complete(e:FlexEvent):void{
+			var req:URLRequest=new URLRequest("resource/images/zt_gree.gif");
+			if(zt=="1")
+			{
+				req=new URLRequest("resource/images/zt_gree.gif");																										
+			} else if(zt=="2") {
+				req=new URLRequest("resource/images/zt_red.gif");	
+			} else if(zt=="3")  {
+				req=new URLRequest("resource/images/zt_yellow.gif");	
+			}
+			gifPlay.load(req);													
+			group.width=0;
+			group.height=0;
+			group.horizontalCenter=0;
+			group.verticalCenter=0;
+			group.addElement(image);
+			image.x=-12;
+			image.y=-12
+			image.addChild(gifPlay); 	
+			this.addElement(group);
+		}
+	}
+}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/component/ui/DataGridColumn.as

@@ -2,6 +2,7 @@ package com.jtgh.yjpt.common.component.ui
 {
 	import com.jtgh.yjpt.common.TypeBase;
 	import com.jtgh.yjpt.common.component.renderer.CheckBoxItemRenderer;
+	import com.jtgh.yjpt.common.component.renderer.GifImageRenderer;
 	import com.jtgh.yjpt.common.component.renderer.LinkButtonRenderer;
 	import com.jtgh.yjpt.common.component.renderer.MultiButtonItemRenderer;
 	import com.jtgh.yjpt.common.component.renderer.TextInputRenderer;
@@ -13,6 +14,7 @@ package com.jtgh.yjpt.common.component.ui
 	
 	public class DataGridColumn extends GridColumn
 	{
+		
 		private var _linkButtonFunc:Function;
 		private var _linkButtonLabel:String;
 		// 更换linkbutton标签
@@ -93,6 +95,10 @@ package com.jtgh.yjpt.common.component.ui
 				_myRenderer.properties = {textInputEditFunc:_textInputEditFunc,
 					fieldName:_fieldName	
 				};
+			} else if(TypeBase.GIFIMAGE==colType){
+				_myRenderer = new ClassFactory(GifImageRenderer );
+				_myRenderer.properties = {fieldName:_fieldName	
+				};
 			}
 			this.itemRenderer = _myRenderer;
 		}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/yjgl/zdwxyfb/xxlr/CgModel.as

@@ -7,12 +7,15 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.count.CgCount;
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgEdit;
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgView;
+	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgztEdit;
+	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgztLayout;
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.ZdwxyfbLayout;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
+	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.ZbhjjbqkVo;
 	
 	import flash.display.DisplayObject;
@@ -44,8 +47,10 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 		public var cgEdit:CgEdit;
 		public var cgView:CgView;
 		public var cgVo:CgVo;
+		public var cgztLayout:CgztLayout;
 		public var queryVo:CgVo=new CgVo;
 		public var thisDataList:ArrayCollection=new ArrayCollection;
+		public var  cgztList:ArrayCollection=new ArrayCollection;
 //		public var mapModel:MapModel;
 		public var resourceManager:IResourceManager=ResourceManager.getInstance();
 		public var jmqList:ArrayCollection;
@@ -451,6 +456,23 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			Utils.popupWindow(resourceManager.getString('common','btn.count'),view as DisplayObject,zdwxyView as DisplayObject);
 		}
 		
+		/** 储罐状态 */
+		public function doViewZt(event:MouseEvent):void
+		{
+			var records:ArrayCollection = zdwxyView.cg.getSelectedRecords();
+			if(records.length != 1){
+				Utils.showInfoMessage("msg.select.one");
+				return;
+			}
+			cgVo=zdwxyView.cg.dataGrid.selectedItem as CgVo;
+			this.functionId=Utils.getFunctionId(zdwxyView); 
+			cgztLayout= new CgztLayout();
+			cgztLayout.thisModel=this;
+			Utils.popupWindow(resourceManager.getString('common','btn.status'),cgztLayout as DisplayObject,zdwxyView as DisplayObject,function():void{
+				zdwxyView.cg.pager.doQuery();
+			});
+		}
+		
 		
 		/**
 		 * 复制记录
@@ -485,6 +507,74 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			},cgId)
 			
 		}
+		
+
+		/**
+		 * 分页查询 储罐状态信息
+		 */
+		public function pageQueryZt(pager:SinglePageRequestVo):void
+		{
+			
+			Utils.callRemote("cgController","listZt",function(r:ResultEvent):void{
+				var bc:BusinessContext = r.result as BusinessContext;
+				cgztList = bc.getAttribute("records") as ArrayCollection;
+				var pageVo:SinglePageRequestVo = cgztLayout.pager.pageVo;
+				pageVo.totalCount = bc.getAttribute("totalCount") as int;
+			},pager,Utils.getFunctionId(zdwxyView),cgVo,cgztLayout.query_hz.text,
+				cgztLayout.query_tbsj1.dateTime,cgztLayout.query_tbsj2.dateTime)	
+		}
+		
+		//新增
+		public function addZt(event:MouseEvent):void
+		{
+			var view:CgztEdit=new CgztEdit;
+			view.parentView = cgztLayout;
+			view.cgVo=cgVo;
+			view.vo = new CgztVo;
+			view.functionId=Utils.getFunctionId(zdwxyView);
+			Utils.popupWindow("新增", view,cgztLayout,function():void{
+				queryZt(null);
+			},550,250);
+		}
+		
+		//编辑
+		public function editZt(event:MouseEvent):void
+		{
+			 if(cgztLayout.dataGrid.selectedItems==null || cgztLayout.dataGrid.selectedIndex==-1){
+				 Utils.showInfoMessage("msg.select.one");
+				 return;
+			 }				 
+			var view:CgztEdit=new CgztEdit;
+			view.parentView = cgztLayout;
+			view.cgVo=cgVo;
+			view.vo = cgztLayout.dataGrid.selectedItem as CgztVo;
+			view.functionId=Utils.getFunctionId(zdwxyView);
+			Utils.popupWindow("编辑", view,cgztLayout,function():void{
+				queryZt(null);
+			},550,250);
+		}
+		
+		//删除
+		public function delZt(event:MouseEvent):void
+		{
+			if(cgztLayout.dataGrid.selectedItems==null || cgztLayout.dataGrid.selectedIndex==-1){
+				Utils.showInfoMessage("msg.select.one");
+				return;
+			}		
+			var vo:CgztVo=cgztLayout.dataGrid.selectedItem as CgztVo;
+			Utils.doDelConfirm(function():void{
+				Utils.callRemote("cgController","deleteZt",function():void{
+					queryZt(null);
+				},vo);
+			});
+		}
+		
+		//查询
+		public function queryZt(event:MouseEvent):void
+		{
+			cgztLayout.pager.doQuery();
+		}
+		
 
 	}
 }

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/zdwxyfb/xxlr/CgLayout.mxml

@@ -161,7 +161,8 @@
 						<s:GridColumn dataField="gkzdwxybh" headerText="{resourceManager.getString('yjgl','cg.gkzdwxybh')}" width="160"/>
 						<s:GridColumn dataField="szdName" headerText="{resourceManager.getString('yjgl','cg.szd')}" />
 						<s:GridColumn dataField="gqName" headerText="{resourceManager.getString('yjgl','cg.szgq')}" />
-						<s:GridColumn dataField="tcsj" labelFunction="sjFun" headerText="{resourceManager.getString('yjgl','cg.tcsj')}"/><!--
+						<ui:DataGridColumn headerText="状态" type="{TypeBase.GIFIMAGE}"  fieldName="zt"/>
+						<!--<s:GridColumn dataField="tcsj" labelFunction="sjFun" headerText="{resourceManager.getString('yjgl','cg.tcsj')}"/>
 						<s:GridColumn dataField="tbr" headerText="{resourceManager.getString('yjgl','cg.tbr')}"/>
 						<s:GridColumn dataField="tbsj" labelFunction="sjFun" headerText="{resourceManager.getString('yjgl','cg.tbsj')}"/>-->
 					</s:ArrayList>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/zdwxyfb/xxlr/CgztEdit.mxml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009" 
+		 xmlns:s="library://ns.adobe.com/flex/spark" 
+		 xmlns:mx="library://ns.adobe.com/flex/mx" width="100%" height="100%" 
+		 xmlns:ui="com.jtgh.yjpt.common.component.ui.*" creationComplete="creationCompleteHandler(event)" xmlns:cus="com.jtgh.yjpt.common.cus.*">
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.common.BusinessContext;
+			import com.jtgh.yjpt.common.util.Utils;
+			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
+			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
+			
+			import mx.controls.Alert;
+			import mx.events.CloseEvent;
+			import mx.events.FlexEvent;
+			import mx.rpc.events.ResultEvent;
+			
+			[Bindable]
+			public var vo:CgztVo;
+			[Bindable]
+			public var cgVo:CgVo;
+			[Bindable]
+			public var functionId:Number;
+			[Bindable]
+			public var  parentView:CgztLayout;
+			
+			protected function save(event:MouseEvent):void
+			{
+				var view:CgztEdit=this;
+				if(tbsj.dateTime==null){
+					Alert.show("填报时间为空","提示");
+					return;
+				}
+				vo.tbsj=tbsj.dateTime;
+				vo.cg=cgVo;
+				Utils.callRemote("cgController","saveZt",function(r:ResultEvent):void{
+					var bc:BusinessContext = r.result as BusinessContext;
+					if(bc!=null && bc.getAttribute("success")){
+						view.dispatchEvent(new CloseEvent(CloseEvent.CLOSE));
+						parentView.pager.doQuery();
+						Alert.show("保存成功","保存成功");
+					}
+				},functionId,vo);
+			
+			}
+			
+			protected function creationCompleteHandler(event:FlexEvent):void
+			{
+				if(vo.tbsj==null){
+					tbsj.dateTime=new Date();
+				}
+				
+			}
+			
+		]]>
+	</fx:Script>
+	<s:VGroup width="100%" height="100%" verticalAlign="middle" horizontalAlign="center" >
+		<s:HGroup width="100%" horizontalAlign="center">
+			<cus:QLabel  text="储罐名称" width="13%"  />
+			<ui:TextInput text="{cgVo.qyccbh}"  width="30%" enabled="false"/>
+			<cus:QLabel  text="货种"  width="13%" />
+			<ui:TextInput text="@{vo.hz}"  width="30%"/>
+		</s:HGroup>
+		<s:HGroup width="100%" horizontalAlign="center">
+			<cus:QLabel text="温度" width="13%"  />
+			<ui:TextInput text="@{vo.wd}"  width="30%"/>
+			<cus:QLabel  text="压力" width="13%"  />
+			<ui:TextInput text="@{vo.yl}"  width="30%"/>
+		</s:HGroup>
+		<s:HGroup width="100%" horizontalAlign="center">
+			<cus:QLabel  text="液位" width="13%"  />
+			<ui:TextInput text="@{vo.yw}"  width="30%"/>
+			<cus:QLabel text="填报时间" width="13%" notNull="true"/>
+			<ui:DateTime id="tbsj" dateTime="{vo.tbsj}"  width="30%" hasTime="true"/>
+		</s:HGroup>	
+		<s:HGroup width="100%" height="40" horizontalAlign="center">
+			<ui:Button label="保存" click="save(event)" />
+			<ui:Button label="取消"  click="this.dispatchEvent(new CloseEvent(CloseEvent.CLOSE))"/>
+		</s:HGroup>	
+	</s:VGroup>
+</s:Group>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/zdwxyfb/xxlr/CgztLayout.mxml

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ui:QueryLayout xmlns:fx="http://ns.adobe.com/mxml/2009"
+				xmlns:s="library://ns.adobe.com/flex/spark"
+				xmlns:mx="library://ns.adobe.com/flex/mx"
+				xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
+				xmlns:xxlr="com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.*"
+				width="100%" height="100%" creationComplete="creationComplete(event)" 
+				xmlns:cus="com.jtgh.yjpt.common.cus.*" xmlns:button="com.jtgh.yjpt.common.component.ui.button.*" >
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr.CgModel;
+			import com.jtgh.yjpt.common.TypeBase;
+			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
+			
+			import flashx.textLayout.tlf_internal;
+			
+			import mx.collections.ArrayCollection;
+			import mx.events.FlexEvent;
+			import mx.formatters.DateFormatter;
+			[Bindable]
+			public var thisModel:CgModel;
+			
+
+
+			/**
+			 *初始化
+			 */
+			protected function creationComplete(event:FlexEvent):void
+			{
+				this.pager.doQuery();				
+			}
+
+			public function sjFun(value:Object,column:GridColumn):String{
+				var fr:DateFormatter=new DateFormatter();
+				fr.formatString="YYYY-MM-DD HH:NN:SS"
+				if(column.dataField=="tbsj")
+				{
+					return fr.format(value.tbsj);
+				}
+				return null;
+			}
+			private function labelFun(item:Object, column:GridColumn):String
+			{
+				return (this.pager.pageVo.page*10+this.dataGrid.dataProvider.getItemIndex(item)+1).toString();
+			}
+
+		
+			
+		]]>
+	</fx:Script>
+	<s:VGroup width="100%">
+		<s:HGroup height="40" width="100%"  horizontalAlign="left">
+			<button:IconButton id="add" type="add" toolTip="{resourceManager.getString('common','btn.add')}" click="thisModel.addZt(event)" />
+			<button:IconButton id="edit" type="edit" toolTip="{resourceManager.getString('common','btn.edit')}" click="thisModel.editZt(event)" />
+			<button:IconButton id="del" type="delete" toolTip="{resourceManager.getString('common','btn.del')}" click="thisModel.delZt(event)"/>
+			<button:IconButton id="query" type="query" toolTip="{resourceManager.getString('common','btn.query')}" click="thisModel.queryZt(event)" />		
+		</s:HGroup>
+		<s:VGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle">
+			<s:HGroup width="100%" height="40" verticalAlign="middle" >
+				<s:HGroup verticalAlign="middle" width="30%">
+					<cus:QLabel width="130" text="填报时间起"/>
+					<ui:DateTime id="query_tbsj1" width="180"/>
+				</s:HGroup>
+				<s:HGroup width="30%" verticalAlign="middle">
+					<cus:QLabel width="130" text="填报时间止"/>
+					<ui:DateTime id="query_tbsj2" width="180"/>
+				</s:HGroup>
+				<s:HGroup verticalAlign="middle" width="30%">
+					<cus:QLabel width="130" text="货种"/>
+					<s:TextInput id="query_hz" width="180"/>
+				</s:HGroup>
+			</s:HGroup>
+		</s:VGroup>
+		<s:DataGrid id="dataGrid" width="100%" borderAlpha="1" minHeight="330" height="100%"
+					doubleClickEnabled="true"  verticalScrollPolicy="off" horizontalScrollPolicy="off"
+					rowHeight="30" selectionMode="singleRow" textAlign="center" dataProvider="{thisModel.cgztList}">
+			<s:columns>
+				<s:ArrayList>
+					<s:GridColumn  labelFunction="labelFun" 
+								   headerText="{resourceManager.getString('yjzyxxgl','yjzjk.xh')}" width="40"/>
+					<s:GridColumn dataField="cgName" headerText="{resourceManager.getString('yjgl','cg.cgmc')}" />
+					<s:GridColumn dataField="hz" width="150" showDataTips="true" dataTipField="hz" headerText="货种"/>
+					<s:GridColumn dataField="wd" headerText="温度"/>
+					<s:GridColumn dataField="yl" headerText="压力"/>
+					<s:GridColumn dataField="yw" headerText="液位" />
+					<s:GridColumn dataField="tbsj" labelFunction="sjFun" headerText="{resourceManager.getString('yjgl','cg.tbsj')}"/>	
+					<ui:DataGridColumn headerText="状态" type="{TypeBase.GIFIMAGE}"  fieldName="zt"/>
+					<!--<s:GridColumn id="zt" headerText="状态">
+						<s:itemRenderer>
+							<fx:Component>  
+								<s:GridItemRenderer >
+									<s:HGroup id="zt" width="0" height="0" verticalCenter="0" horizontalCenter="0" >
+										<mx:Image id="ztImage" x="-12" y="-12">
+											<fx:Script>
+												<![CDATA[
+													import com.ldfsoft.flex.player.GIFPlayer;
+													[Bindable]
+													private var gifPlay:GIFPlayer=new GIFPlayer();											
+													override public function set data(value:Object):void
+													{
+														if(value !=null){
+															super.data = value;
+															var req:URLRequest=new URLRequest("resource/images/zt_gree.gif");
+															if(data.zt=="1")
+															{
+																 req=new URLRequest("resource/images/zt_gree.gif");																										
+															} else if(data.zt=="2") {
+																req=new URLRequest("resource/images/zt_red.gif");	
+															} else if(data.zt=="3")  {
+																req=new URLRequest("resource/images/zt_yellow.gif");	
+															}
+															gifPlay.load(req);
+															ztImage.addChild(gifPlay); 															
+														}										
+													}
+												]]>
+											</fx:Script>							
+										</mx:Image>
+									</s:HGroup>
+								</s:GridItemRenderer>							
+							</fx:Component>
+						</s:itemRenderer>  
+					</s:GridColumn>-->
+				</s:ArrayList> 
+			</s:columns>
+		</s:DataGrid>
+		<ui:Pager id="pager" queryFunction="{thisModel.pageQueryZt}"/>
+	</s:VGroup>
+</ui:QueryLayout>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/zdwxyfb/xxlr/ZdwxyfbLayout.mxml

@@ -240,6 +240,7 @@
 						   visible="{Global.OPEN_MAP==YesNoSelect.YES && Global.user.sfyxckdt==YesNoSelect.YES}"
 						   includeInLayout="{Global.OPEN_MAP==YesNoSelect.YES && Global.user.sfyxckdt==YesNoSelect.YES}"/>
 		<button:IconButton id="copy" type="bgzy"  toolTip="复制" click="cgModel.doCopy(event)" enabled="{tab.selectedIndex==0}"/>
+		<button:IconButton id="status" type="check"  toolTip="{resourceManager.getString('common','btn.status')}" click="cgModel.doViewZt(event)"  enabled="{tab.selectedIndex==0}" visible="{Global.BUTTON_STATUS}" includeInLayout="{Global.BUTTON_STATUS}" />
 	</s:HGroup >
 	<mx:TabNavigator id="tab" width="100%" height="100%" selectedIndex="@{index}" minHeight="500">
 		<s:NavigatorContent label="储罐">

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/yjgl/zdwxyfb/CgVo.as

@@ -667,6 +667,7 @@ package com.jtgh.yjpt.vo.yjgl.zdwxyfb
 			return "NaN"==this.zdwxycgrl.toString()?"":this.zdwxycgrl.toString();
 		}
 		
+		public var zt:String="1";
 	}
 }
 

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/yjgl/zdwxyfb/CgztVo.as

@@ -0,0 +1,33 @@
+package com.jtgh.yjpt.vo.yjgl.zdwxyfb
+{
+	import com.jtgh.yjpt.vo.BaseVo;
+
+	[Bindable]
+	[RemoteClass(alias="com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgztEntity")]
+	public class CgztVo extends BaseVo
+	{
+		public function CgztVo()
+		{
+		}
+		public var id:Number;
+		/** 货种 */
+		public var hz:String;
+		/** 储罐 */
+		public var cg:CgVo;
+		/** 温度 */
+		public var wd:String;
+		/** 压力 */
+		public var yl:String;
+		/** 液位 */
+		public var yw:String;
+		/** 填报时间*/
+		public var tbsj:Date;
+		/** 状态*/
+		public var zt:String="1";
+		public function get cgName():String{
+			if(cg!=null)
+				return cg.qyccbh;
+			return "";
+		}
+	}
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/yjgl/zdwxyfb/CgztDao.java

@@ -0,0 +1,17 @@
+package com.jtgh.yjpt.dao.yjgl.zdwxyfb;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgztEntity;
+
+public interface CgztDao extends MyRepository<CgztEntity, Long> {
+
+	public CgztEntity findById(Long id);
+	
+	@Query("from CgztEntity where  cg=?1 and recordStatus<>9 order by tbsj desc")
+	public List<CgztEntity> findByCg(CgEntity cg);
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/yjgl/zdwxyfb/CgEntity.java

@@ -243,6 +243,8 @@ public class CgEntity extends BaseEntity<Long> implements Cloneable {
 	private Integer aqgd;
 	/** 直径 */
 	private Integer zj;
+	/** 储罐状态*/
+	private String zt;
 
 	/** 附件 */
 	private AccessoryEntity accessory;
@@ -729,4 +731,14 @@ public class CgEntity extends BaseEntity<Long> implements Cloneable {
 		return null;
 	}
 
+	@Transient
+	@XmlTransient
+	public String getZt() {
+		return zt;
+	}
+
+	public void setZt(String zt) {
+		this.zt = zt;
+	}
+
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/yjgl/zdwxyfb/CgztEntity.java

@@ -0,0 +1,106 @@
+package com.jtgh.yjpt.entity.yjgl.zdwxyfb;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.springframework.flex.remoting.RemotingExclude;
+
+import com.jtgh.yjpt.common.Constants;
+import com.jtgh.yjpt.entity.BaseEntity;
+
+@Entity
+@Table(name="T_YJPT_CGZT")
+public class CgztEntity extends BaseEntity<Long> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6141972583872401974L;
+
+	private Long id;
+	/** 货种 */
+	private String hz;
+	/** 储罐 */
+	private CgEntity cg;
+	/** 温度 */
+	private String wd;
+	/** 压力 */
+	private String yl;
+	/** 液位 */
+	private String yw;
+	/** 状态 */
+	private String zt;
+	/** 填报时间*/
+	private Date tbsj;
+	@Transient
+	public String getSequenceName() {
+		return Constants.SEQ_T_YJPT_CGZT;
+	}
+	
+	
+    @Id
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getHz() {
+		return hz;
+	}
+	public void setHz(String hz) {
+		this.hz = hz;
+	}
+	
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CgEntity.class)
+	@JoinColumn(name = "cg")
+	@RemotingExclude
+	public CgEntity getCg() {
+		return cg;
+	}
+	public void setCg(CgEntity cg) {
+		this.cg = cg;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getYl() {
+		return yl;
+	}
+	public void setYl(String yl) {
+		this.yl = yl;
+	}
+	public String getYw() {
+		return yw;
+	}
+	public void setYw(String yw) {
+		this.yw = yw;
+	}
+	public Date getTbsj() {
+		return tbsj;
+	}
+	public void setTbsj(Date tbsj) {
+		this.tbsj = tbsj;
+	}
+
+
+	public String getZt() {
+		return zt;
+	}
+
+
+	public void setZt(String zt) {
+		this.zt = zt;
+	}
+
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/yjgl/zdwxyfb/CgztServiceImp.java

@@ -0,0 +1,35 @@
+package com.jtgh.yjpt.service.impl.yjgl.zdwxyfb;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.dao.yjgl.zdwxyfb.CgztDao;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgztEntity;
+import com.jtgh.yjpt.service.BaseService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgztService;
+
+@Service
+public class CgztServiceImp extends BaseService<CgztEntity, Long> implements
+		CgztService {
+
+	@Autowired
+	private CgztDao cgztDao;
+
+	@Override
+	protected MyRepository<CgztEntity, Long> getDao() {
+		return cgztDao;
+	}
+
+	@Override
+	public CgztEntity findByCg(CgEntity cg) {
+		List<CgztEntity> list =cgztDao.findByCg(cg);
+		if(list != null && list.size()>0){
+			return list.get(0);
+		}
+		return null;
+	}
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/yjgl/zdwxyfb/CgztService.java

@@ -0,0 +1,47 @@
+package com.jtgh.yjpt.service.yjgl.zdwxyfb;
+
+import java.util.List;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgztEntity;
+
+public interface CgztService {
+
+	/**
+	 * 分页查询所有记录
+	 * 
+	 * @param spec
+	 * @param page
+	 * @return
+	 */
+	public Page<CgztEntity> findAll(Specification<CgztEntity> spec, Pageable page);
+
+	/**
+	 * 保存储罐状态信息
+	 * 
+	 * @param Entity
+	 * @return
+	 */
+	public <S extends CgztEntity> S save(S Entity);
+
+	/**
+	 * 逻辑删除
+	 * 
+	 * @param entities
+	 */
+	public void logicDelete(Iterable<CgztEntity> entities);
+
+	public void logicDelete(Long id);
+
+	public List<CgztEntity> findAll(Specification<CgztEntity> spec);
+
+	public List<CgztEntity> findAll(Specification<CgztEntity> spec, Sort sort);
+	
+	public CgztEntity findByCg(CgEntity cg);
+
+}

gkaq/yjpt-java/trunk/locale/zh_CN/common.properties

@@ -58,6 +58,7 @@ btn.wharf=\u5371\u8d27\u4f01\u4e1a\u4fe1\u606f\u7edf\u8ba1
 btn.storage=\u5b58\u50a8\u8bbe\u65bd\u4fe1\u606f\u7edf\u8ba1
 btn.administrative=\u6cd5\u4eba\u884c\u653f\u8bb8\u53ef
 btn.message=\u6d88\u606f\u7ba1\u7406
+btn.status=\u72b6\u6001
 
 col.code=\u7f16\u7801
 col.id=ID