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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/Constants.java

@@ -217,6 +217,16 @@ public class Constants {
 	final public static String SEQ_T_YJPT_TASK = "SEQ_T_YJPT_TASK";
 	/** 流程属性序列 */
 	public static final String SEQ_T_YJPT_WF_PROP = "SEQ_T_YJPT_WF_PROP";
+
+	//港口危险货物储罐基本信息表 生成主键序列
+	public static final String SEQ_CG_INFO = "SEQ_CG_INFO";
+	//储罐储存介质 生成主键序列
+	public static final String SEQ_CG_STORAGE= "SEQ_CG_STORAGE";
+	//储罐近3个月作业情况 生成主键序列
+	public static final String SEQ_CG_OPERATION_CONDITION="SEQ_CG_OPERATION_CONDITION";
+	
+	
+	
 	// 分页时默认每页条数
 	public final static int DEFAULT_PAGE_SIZE = 10;
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/cginfo/CgInfoDao.java

@@ -0,0 +1,8 @@
+package com.jtgh.yjpt.dao.cginfo;
+
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.entity.cginfo.CgInfoEntity;
+
+public interface CgInfoDao extends MyRepository<CgInfoEntity, Long>{
+
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/cginfo/CgOperationConditionDao.java

@@ -0,0 +1,9 @@
+package com.jtgh.yjpt.dao.cginfo;
+
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.entity.cginfo.CgOperationConditionEntity;
+
+
+public interface CgOperationConditionDao extends MyRepository<CgOperationConditionEntity, Long>{
+
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/cginfo/CgStorageDao.java

@@ -0,0 +1,8 @@
+package com.jtgh.yjpt.dao.cginfo;
+
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.entity.cginfo.CgStorageEntity;
+
+public interface CgStorageDao extends MyRepository<CgStorageEntity, Long>{
+
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/cginfo/CgInfoEntity.java

@@ -0,0 +1,431 @@
+package com.jtgh.yjpt.entity.cginfo;
+
+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;
+import com.jtgh.yjpt.entity.gkgq.GqEntity;
+import com.jtgh.yjpt.entity.jyr.JyrEntity;
+
+@Entity
+@Table(name = "T_YJPT_CG_INFO")
+public class CgInfoEntity  extends BaseEntity<Long> implements Cloneable {
+	 
+	private static final long serialVersionUID = 622928578418850812L;
+	
+	private long id;
+	private Date buildDate;
+	private GqEntity szgq;
+	private String bh;
+	private JyrEntity jyr;
+	private String contactPerson;
+	private String contactPhone;
+	private String contactEmail;
+	private String cgForm;
+	private double zgVolume;
+	private String cgMaterial;
+	private String haveDesignInfo;
+	private String designOrgName;
+	private String designOrgQualification;
+	private double designPressure;
+	private double designTemp;
+	private String haveCompletionInfo;
+	private String buildOrgName;
+	private String buildOrgQualification;
+	private String isRegularDetection;
+	private Date detectionTime;
+	private String detectionOrg;
+	private String detectionConclusion;
+	private String isRepaired;
+	private Date repairTime;
+	private String repairPart;
+	private String repairWay;
+	
+	
+	
+	
+	//生成主键所用序列
+	@Transient
+	public String getSequenceName() {
+		return Constants.SEQ_CG_INFO;
+	}
+	
+	@Id
+	public long getID() {
+		return ID;
+	}
+	public void setID(long iD) {
+		ID = iD;
+	}
+
+	public Date getBuildDate() {
+		return buildDate;
+	}
+
+
+
+
+	public void setBuildDate(Date buildDate) {
+		this.buildDate = buildDate;
+	}
+
+
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = GqEntity.class)
+	@JoinColumn(name = "szgq")
+	@RemotingExclude
+	public GqEntity getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(GqEntity szgq) {
+		this.szgq = szgq;
+	}
+
+
+
+
+	public String getBh() {
+		return bh;
+	}
+
+
+
+
+	public void setBh(String bh) {
+		this.bh = bh;
+	}
+
+
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = JyrEntity.class) 
+	@JoinColumn(name = "jyr")
+	@RemotingExclude
+	public JyrEntity getJyr() {
+		return jyr;
+	}
+ 
+	public void setJyr(JyrEntity jyr) {
+		this.jyr = jyr;
+	}
+
+
+
+
+	public String getContactPerson() {
+		return contactPerson;
+	}
+
+
+
+
+	public void setContactPerson(String contactPerson) {
+		this.contactPerson = contactPerson;
+	}
+
+
+
+
+	public String getContactPhone() {
+		return contactPhone;
+	}
+
+
+
+
+	public void setContactPhone(String contactPhone) {
+		this.contactPhone = contactPhone;
+	}
+
+
+
+
+	public String getContactEmail() {
+		return contactEmail;
+	}
+
+
+
+
+	public void setContactEmail(String contactEmail) {
+		this.contactEmail = contactEmail;
+	}
+
+
+
+
+	public String getCgForm() {
+		return cgForm;
+	}
+
+
+
+
+	public void setCgForm(String cgForm) {
+		this.cgForm = cgForm;
+	}
+
+
+
+
+	public double getZgVolume() {
+		return zgVolume;
+	}
+
+
+
+
+	public void setZgVolume(double zgVolume) {
+		this.zgVolume = zgVolume;
+	}
+
+
+
+
+	public String getCgMaterial() {
+		return cgMaterial;
+	}
+
+
+
+
+	public void setCgMaterial(String cgMaterial) {
+		this.cgMaterial = cgMaterial;
+	}
+
+
+
+
+	public String getHaveDesignInfo() {
+		return haveDesignInfo;
+	}
+
+
+
+
+	public void setHaveDesignInfo(String haveDesignInfo) {
+		this.haveDesignInfo = haveDesignInfo;
+	}
+
+
+
+
+	public String getDesignOrgName() {
+		return designOrgName;
+	}
+
+
+
+
+	public void setDesignOrgName(String designOrgName) {
+		this.designOrgName = designOrgName;
+	}
+
+
+
+
+	public String getDesignOrgQualification() {
+		return designOrgQualification;
+	}
+
+
+
+
+	public void setDesignOrgQualification(String designOrgQualification) {
+		this.designOrgQualification = designOrgQualification;
+	}
+
+
+
+
+	public double getDesignPressure() {
+		return designPressure;
+	}
+
+
+
+
+	public void setDesignPressure(double designPressure) {
+		this.designPressure = designPressure;
+	}
+
+
+
+
+	public double getDesignTemp() {
+		return designTemp;
+	}
+
+
+
+
+	public void setDesignTemp(double designTemp) {
+		this.designTemp = designTemp;
+	}
+
+
+
+
+	public String getHaveCompletionInfo() {
+		return haveCompletionInfo;
+	}
+
+
+
+
+	public void setHaveCompletionInfo(String haveCompletionInfo) {
+		this.haveCompletionInfo = haveCompletionInfo;
+	}
+
+
+
+
+	public String getBuildOrgName() {
+		return buildOrgName;
+	}
+
+
+
+
+	public void setBuildOrgName(String buildOrgName) {
+		this.buildOrgName = buildOrgName;
+	}
+
+
+
+
+	public String getBuildOrgQualification() {
+		return buildOrgQualification;
+	}
+
+
+
+
+	public void setBuildOrgQualification(String buildOrgQualification) {
+		this.buildOrgQualification = buildOrgQualification;
+	}
+
+
+
+
+	public String getIsRegularDetection() {
+		return isRegularDetection;
+	}
+
+
+
+
+	public void setIsRegularDetection(String isRegularDetection) {
+		this.isRegularDetection = isRegularDetection;
+	}
+
+
+
+
+	public Date getDetectionTime() {
+		return detectionTime;
+	}
+
+
+
+
+	public void setDetectionTime(Date detectionTime) {
+		this.detectionTime = detectionTime;
+	}
+
+
+
+
+	public String getDetectionOrg() {
+		return detectionOrg;
+	}
+
+
+
+
+	public void setDetectionOrg(String detectionOrg) {
+		this.detectionOrg = detectionOrg;
+	}
+
+
+
+
+	public String getDetectionConclusion() {
+		return detectionConclusion;
+	}
+
+
+
+
+	public void setDetectionConclusion(String detectionConclusion) {
+		this.detectionConclusion = detectionConclusion;
+	}
+
+
+
+
+	public String getIsRepaired() {
+		return isRepaired;
+	}
+
+
+
+
+	public void setIsRepaired(String isRepaired) {
+		this.isRepaired = isRepaired;
+	}
+
+
+
+
+	public Date getRepairTime() {
+		return repairTime;
+	}
+
+
+
+
+	public void setRepairTime(Date repairTime) {
+		this.repairTime = repairTime;
+	}
+
+
+
+
+	public String getRepairPart() {
+		return repairPart;
+	}
+
+
+
+
+	public void setRepairPart(String repairPart) {
+		this.repairPart = repairPart;
+	}
+
+
+
+
+	public String getRepairWay() {
+		return repairWay;
+	}
+
+
+
+
+	public void setRepairWay(String repairWay) {
+		this.repairWay = repairWay;
+	}
+
+
+
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/cginfo/CgOperationConditionEntity.java

@@ -0,0 +1,80 @@
+package com.jtgh.yjpt.entity.cginfo;
+
+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_CG_OPERATION_CONDITION")
+public class CgOperationConditionEntity extends BaseEntity<Long> implements Cloneable{
+
+	private static final long serialVersionUID = -1502126331966448087L;
+	
+	private Long id;
+	private CgInfoEntity cgInfoId;
+	private Date operationTime;
+	private String operationCommodityName;
+	private double operationPressure;
+	private double operationTemp;
+	
+	//生成主键所用序列
+	@Transient
+	public String getSequenceName() {
+		return Constants.SEQ_CG_OPERATION_CONDITION;
+	}
+	
+	@Id
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}	
+	
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CgInfoEntity.class)
+	@JoinColumn(name = "CG_INFO_ID")
+	@RemotingExclude
+	public CgInfoEntity getCgInfoId() {
+		return cgInfoId;
+	}
+
+	public void setCgInfoId(CgInfoEntity cgInfoId) {
+		this.cgInfoId = cgInfoId;
+	}
+	
+	public Date getOperationTime() {
+		return operationTime;
+	}
+	public void setOperationTime(Date operationTime) {
+		this.operationTime = operationTime;
+	}
+	public String getOperationCommodityName() {
+		return operationCommodityName;
+	}
+	public void setOperationCommodityName(String operationCommodityName) {
+		this.operationCommodityName = operationCommodityName;
+	}
+	public double getOperationPressure() {
+		return operationPressure;
+	}
+	public void setOperationPressure(double operationPressure) {
+		this.operationPressure = operationPressure;
+	}
+	public double getOperationTemp() {
+		return operationTemp;
+	}
+	public void setOperationTemp(double operationTemp) {
+		this.operationTemp = operationTemp;
+	}
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/cginfo/CgStorageEntity.java

@@ -0,0 +1,91 @@
+package com.jtgh.yjpt.entity.cginfo;
+
+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_CG_STORAGE")
+public class CgStorageEntity extends BaseEntity<Long> implements Cloneable{ 
+ 
+	private static final long serialVersionUID = -7561911003716600379L;
+	
+	private long id;
+	private CgInfoEntity cgInfoId;
+	private String commodityName;
+	private String cas;
+	private String un;
+	private String fireRisk;
+	private String dangerChemical;
+	private String toxicChemical;
+	
+	//生成主键所用序列
+	@Transient
+	public String getSequenceName() {
+		return Constants.SEQ_CG_STORAGE;
+	}
+	
+	@Id
+	public long getId() {
+		return id;
+	}
+	public void setId(long id) {
+		this.id = id;
+	}
+	
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CgInfoEntity.class)
+	@JoinColumn(name = "CG_INFO_ID")
+	@RemotingExclude
+	public CgInfoEntity getCgInfoId() {
+		return cgInfoId;
+	}
+	public void setCgInfoId(CgInfoEntity cgInfoId) {
+		this.cgInfoId = cgInfoId;
+	}
+	
+	public String getCommodityName() {
+		return commodityName;
+	}
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+	public String getCas() {
+		return cas;
+	}
+	public void setCas(String cas) {
+		this.cas = cas;
+	}
+	public String getUn() {
+		return un;
+	}
+	public void setUn(String un) {
+		this.un = un;
+	}
+	public String getFireRisk() {
+		return fireRisk;
+	}
+	public void setFireRisk(String fireRisk) {
+		this.fireRisk = fireRisk;
+	}
+	public String getDangerChemical() {
+		return dangerChemical;
+	}
+	public void setDangerChemical(String dangerChemical) {
+		this.dangerChemical = dangerChemical;
+	}
+	public String getToxicChemical() {
+		return toxicChemical;
+	}
+	public void setToxicChemical(String toxicChemical) {
+		this.toxicChemical = toxicChemical;
+	}
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/cginfo/CgInfoService.java

@@ -0,0 +1,16 @@
+package com.jtgh.yjpt.service.cginfo;
+
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+
+import com.jtgh.yjpt.entity.cginfo.CgInfoEntity;
+
+public interface CgInfoService {
+	public Page<CgInfoEntity> findAll(Specification<CgInfoEntity> spec, Pageable pageable);
+	public CgInfoEntity findOne(Long id); 
+	//public CgInfoEntity save(CgInfoEntity entity);
+	public <S extends CgInfoEntity> S save(S entity);
+	public void logicDelete(Long id);
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/cginfo/CgOperationConditionService.java

@@ -0,0 +1,15 @@
+package com.jtgh.yjpt.service.cginfo;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+
+import com.jtgh.yjpt.entity.cginfo.CgOperationConditionEntity;
+
+public interface CgOperationConditionService {
+	public Page<CgOperationConditionEntity> findAll(Specification<CgOperationConditionEntity> spec, Pageable pageable);
+	public CgOperationConditionEntity findOne(Long id); 
+	//public CgOperationConditionEntity save(CgOperationConditionEntity entity);
+	public <S extends CgOperationConditionEntity> S save(S entity);
+	public void logicDelete(Long id);
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/cginfo/CgStorageService.java

@@ -0,0 +1,15 @@
+package com.jtgh.yjpt.service.cginfo;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+
+import com.jtgh.yjpt.entity.cginfo.CgStorageEntity;
+
+public interface CgStorageService {
+	public Page<CgStorageEntity> findAll(Specification<CgStorageEntity> spec, Pageable pageable);
+	public CgStorageEntity findOne(Long id); 
+	//public CgStorageEntity save(CgStorageEntity entity);
+	public <S extends CgStorageEntity> S save(S entity);
+	public void logicDelete(Long id);
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/cginfo/CgInfoServiceImpl.java

@@ -0,0 +1,23 @@
+package com.jtgh.yjpt.service.impl.cginfo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.jtgh.yjpt.dao.cginfo.CgInfoDao;
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.entity.cginfo.CgInfoEntity;
+import com.jtgh.yjpt.service.BaseService;
+import com.jtgh.yjpt.service.cginfo.CgInfoService;
+
+@Service
+public class CgInfoServiceImpl extends BaseService<CgInfoEntity, Long> implements CgInfoService {
+	@Autowired
+	CgInfoDao dao;
+	
+	@Override
+	protected MyRepository<CgInfoEntity, Long> getDao() {
+		return dao;
+	}
+ 
+}
+

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/cginfo/CgOperationConditionServiceImpl.java

@@ -0,0 +1,24 @@
+package com.jtgh.yjpt.service.impl.cginfo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.jtgh.yjpt.dao.cginfo.CgOperationConditionDao;
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.entity.cginfo.CgOperationConditionEntity;
+import com.jtgh.yjpt.service.BaseService;
+import com.jtgh.yjpt.service.cginfo.CgOperationConditionService;
+
+@Service
+public class CgOperationConditionServiceImpl extends BaseService<CgOperationConditionEntity, Long> 
+											  implements CgOperationConditionService{
+	@Autowired
+	CgOperationConditionDao dao;
+
+	@Override
+	protected MyRepository<CgOperationConditionEntity, Long> getDao() {
+		return dao;
+	}
+
+	
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/cginfo/CgStorageServiceImpl.java

@@ -0,0 +1,22 @@
+package com.jtgh.yjpt.service.impl.cginfo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.jtgh.yjpt.dao.cginfo.CgStorageDao;
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.entity.cginfo.CgStorageEntity;
+import com.jtgh.yjpt.service.BaseService;
+import com.jtgh.yjpt.service.cginfo.CgStorageService;
+
+@Service
+public class CgStorageServiceImpl extends BaseService<CgStorageEntity, Long> implements CgStorageService{
+	@Autowired
+	CgStorageDao dao;
+
+	@Override
+	protected MyRepository<CgStorageEntity, Long> getDao() {
+		return dao;
+	}
+	
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/gg/GgServiceImpl.java

@@ -23,8 +23,7 @@ import com.jtgh.yjpt.service.BaseService;
 import com.jtgh.yjpt.service.gg.GgService;
 
 @Service
-public class GgServiceImpl extends BaseService<GgEntity, Long> implements
-		GgService {
+public class GgServiceImpl extends BaseService<GgEntity, Long> implements GgService {
 
 	@Autowired
 	private GgDao ggDao;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zysqbp/WhsqbpWebService.java

@@ -581,7 +581,7 @@ public class WhsqbpWebService extends BaseController {
 	 * 4：当前任务状态的数据不需填写完工报
 	 * 5：当前数据已填写了完工报
 	 * 6：先填写开工报，再填写完工报
-	 * @param entityId 申报信息对应id 
+	 * @param BlNo     提单号
 	 * @param wgsj     完工时间
 	 * @param sg       上港
 	 * @param xg       下港

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

@@ -55,6 +55,8 @@ m002002_c=\u5e94\u6025\u57f9\u8bad\u3001\u6f14\u7ec3\u548c\u6f14\u4e60\u586b\u62
 m002005=\u4e8b\u6545\u6848\u4f8b\u7ba1\u7406
 m002005_c=\u4e8b\u6545\u6848\u4f8b\u586b\u62a5
 m002007=\u91cd\u5927\u5371\u9669\u6e90\u5f55\u5165
+m002010=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
+m002010_c=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
 m002007001=\u4fe1\u606f\u5f55\u5165
 m002007001_c=\u4fe1\u606f\u5f55\u5165
 m002007_c=\u50a8\u7f50\u4fe1\u606f\u586b\u62a5

gkaq/yjpt-java/trunk/resources/sql/init/9.update.sql.ftl

@@ -8625,3 +8625,209 @@ ALTER TABLE T_YJPT_WXHWGKZYSBD ADD BL_NO VARCHAR2(200);
 COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.BL_NO IS '提单号bill of loading number';
 </#if>
 
+
+<#if versionDate?date("yyyyMMdd") lt "20170330"?date("yyyyMMdd")>
+create table T_YJPT_CG_INFO
+(
+	ID number(38,0) not null primary key,
+	ADD_USER VARCHAR2(50),
+	ADD_DATE TIMESTAMP,
+	UPDATE_USER VARCHAR(50),
+	UPDATE_DATE TIMESTAMP,
+	RECORD_STATUS NUMBER(38,0),
+	SFTB CHAR(1),
+	TBZT CHAR(1),
+	TBDYID NUMBER(38,0),
+	QYLB CHAR(1),
+	SZD NUMBER(38,0),
+	RECORD_CODE VARCHAR2(30),
+	BYZD1 VARCHAR(100),
+	BYZD2 VARCHAR(100),
+	BYZD3 VARCHAR(100),
+	BYZD4 VARCHAR(100),
+	BYZD5 VARCHAR(100),
+	BUILD_DATE TIMESTAMP,
+	SZGQ  number(38,0),
+	BH    VARCHAR2(100),
+	JYR number(38,0),
+	CONTACT_PERSON VARCHAR2(100),
+	CONTACT_PHONE  VARCHAR2(50),
+	CONTACT_EMAIL  VARCHAR2(50),
+	CG_FORM VARCHAR2(100),
+	CG_VOLUME NUMBER(*,3),
+	CG_MATERIAL VARCHAR2(100),
+	HAVE_DESIGN_INFO CHAR(1),
+	DESIGN_ORG_NAME VARCHAR2(100),
+	DESIGN_ORG_QUALIFICATION VARCHAR2(100),
+	DESIGN_PRESSURE NUMBER(*,3),
+	DESIGN_TEMP NUMBER(*,3),
+	HAVA_COMPLETION_INFO CHAR(1),
+	BUILD_ORG_NAME VARCHAR2(100),
+	BUILD_ORG_QUALIFICATION VARCHAR2(100),
+	IS_REGULAR_DETECTION CHAR(1),
+	DETECTION_TIME TIMESTAMP,
+	DETECTION_ORG VARCHAR2(100),
+	DETECTION_CONCLUSION VARCHAR2(200),
+	IS_REPAIRED CHAR(1),
+	REPAIR_TIME TIMESTAMP,
+	REPAIR_PART VARCHAR2(100),
+	REPAIR_WAY VARCHAR2(100)
+);
+
+comment on table T_YJPT_CG_INFO is '港口危险货物储罐基本信息表,区别于T_YJPT_CG表';
+comment on column T_YJPT_CG_INFO.ID is 'ID主键';
+comment on column T_YJPT_CG_INFO.ADD_USER is '信息添加人ID';
+comment on column T_YJPT_CG_INFO.ADD_DATE is '信息添加时间';
+comment on column T_YJPT_CG_INFO.UPDATE_USER is '最近一次信息修改人ID';
+comment on column T_YJPT_CG_INFO.UPDATE_DATE is '最近一次信息修改时间';
+comment on column T_YJPT_CG_INFO.RECORD_STATUS is '记录状态';
+comment on column T_YJPT_CG_INFO.SFTB is '是否需要同步：Y是、N否';
+comment on column T_YJPT_CG_INFO.TBZT is '是否已同步：Y是、N否';
+comment on column T_YJPT_CG_INFO.TBDYID is '同步对应ID';
+comment on column T_YJPT_CG_INFO.QYLB is '区域类别：0:省级、1:市级';
+comment on column T_YJPT_CG_INFO.SZD is '所在地ID';
+comment on column T_YJPT_CG_INFO.RECORD_CODE is '所属角色编码';
+comment on column T_YJPT_CG_INFO.BYZD1 is '备用字段1';
+comment on column T_YJPT_CG_INFO.BYZD2 is '备用字段2';
+comment on column T_YJPT_CG_INFO.BYZD3 is '备用字段3';
+comment on column T_YJPT_CG_INFO.BYZD4 is '备用字段4';
+comment on column T_YJPT_CG_INFO.BYZD5 is '备用字段5';
+comment on column T_YJPT_CG_INFO.BUILD_DATE is '建造日期';
+comment on column T_YJPT_CG_INFO.SZGQ is '所属港区ID';
+comment on column T_YJPT_CG_INFO.BH is '储罐编号';
+comment on column T_YJPT_CG_INFO.JYR is '经营人ID';
+comment on column T_YJPT_CG_INFO.CONTACT_PERSON is '联系人';
+comment on column T_YJPT_CG_INFO.CONTACT_PHONE is '联系电话';
+comment on column T_YJPT_CG_INFO.CONTACT_PHONE is '联系人邮箱';
+comment on column T_YJPT_CG_INFO.CG_FORM is '储罐形式';
+comment on column T_YJPT_CG_INFO.CG_VOLUME is '储罐容积';
+comment on column T_YJPT_CG_INFO.CG_MATERIAL is '储罐材质';
+comment on column T_YJPT_CG_INFO.HAVE_DESIGN_INFO is '是否有设计资料：Y有、N没有';
+comment on column T_YJPT_CG_INFO.DESIGN_ORG_NAME is '储罐设计单位名称';
+comment on column T_YJPT_CG_INFO.DESIGN_ORG_QUALIFICATION is '储罐设计单位资质';
+comment on column T_YJPT_CG_INFO.DESIGN_PRESSURE is '储罐设计压力MPa';
+comment on column T_YJPT_CG_INFO.DESIGN_TEMP is '储罐设计温度℃';
+comment on column T_YJPT_CG_INFO.HAVA_COMPLETION_INFO is '是否有建造工程资料（竣工资料）';
+comment on column T_YJPT_CG_INFO.BUILD_ORG_NAME is '建造单位名称';
+comment on column T_YJPT_CG_INFO.BUILD_ORG_NAME is '建造单位资质';
+comment on column T_YJPT_CG_INFO.IS_REGULAR_DETECTION is '是否对储罐进行过定期检测';
+comment on column T_YJPT_CG_INFO.DETECTION_TIME is '检测时间';
+comment on column T_YJPT_CG_INFO.DETECTION_ORG is '检测机构';
+comment on column T_YJPT_CG_INFO.DETECTION_CONCLUSION is '检测结论';
+comment on column T_YJPT_CG_INFO.IS_REPAIRED is '是否对储罐进行过维修';
+comment on column T_YJPT_CG_INFO.REPAIR_TIME is '储罐维修时间';
+comment on column T_YJPT_CG_INFO.REPAIR_PART is '储罐维修部位';
+comment on column T_YJPT_CG_INFO.REPAIR_PART is '储罐维修方式';
+
+
+create table T_YJPT_CG_STORAGE
+(
+	ID NUMBER(38,0) NOT NULL PRIMARY KEY, 
+	CG_INFO_ID NUMBER(38,0) NOT NULL,
+	ADD_USER VARCHAR2(50),
+	ADD_DATE TIMESTAMP,
+	UPDATE_USER VARCHAR(50),
+	UPDATE_DATE TIMESTAMP,
+	RECORD_STATUS NUMBER(38,0),
+	SFTB CHAR(1),
+	TBZT CHAR(1),
+	TBDYID NUMBER(38,0),
+	QYLB CHAR(1),
+	SZD NUMBER(38,0),
+	RECORD_CODE VARCHAR2(30),
+	BYZD1 VARCHAR(100),
+	BYZD2 VARCHAR(100),
+	BYZD3 VARCHAR(100),
+	BYZD4 VARCHAR(100),
+	BYZD5 VARCHAR(100),
+	COMMODITY_NAME VARCHAR2(100),
+	CAS VARCHAR2(20),
+	UN  VARCHAR2(20),
+	FIRE_RISK VARCHAR2(100),
+	DANGER_CHEMICAL VARCHAR2(100),
+	TOXIC_CHEMICAL VARCHAR2(100)
+);
+
+comment on table T_YJPT_CG_STORAGE is '储罐储存介质，港口危险货物储罐基本信息表的子表';
+comment on column T_YJPT_CG_STORAGE.ID is 'ID主键';
+comment on column T_YJPT_CG_STORAGE.CG_INFO_ID is '储罐基础信息表的ID';
+comment on column T_YJPT_CG_STORAGE.ADD_USER is '信息添加人ID';
+comment on column T_YJPT_CG_STORAGE.ADD_DATE is '信息添加时间';
+comment on column T_YJPT_CG_STORAGE.UPDATE_USER is '最近一次信息修改人ID';
+comment on column T_YJPT_CG_STORAGE.UPDATE_DATE is '最近一次信息修改时间';
+comment on column T_YJPT_CG_STORAGE.RECORD_STATUS is '记录状态';
+comment on column T_YJPT_CG_STORAGE.SFTB is '是否需要同步：Y是、N否';
+comment on column T_YJPT_CG_STORAGE.TBZT is '是否已同步：Y是、N否';
+comment on column T_YJPT_CG_STORAGE.TBDYID is '同步对应ID';
+comment on column T_YJPT_CG_STORAGE.QYLB is '区域类别：0:省级、1:市级';
+comment on column T_YJPT_CG_STORAGE.SZD is '所在地ID';
+comment on column T_YJPT_CG_STORAGE.RECORD_CODE is '所属角色编码';
+comment on column T_YJPT_CG_STORAGE.BYZD1 is '备用字段1';
+comment on column T_YJPT_CG_STORAGE.BYZD2 is '备用字段2';
+comment on column T_YJPT_CG_STORAGE.BYZD3 is '备用字段3';
+comment on column T_YJPT_CG_STORAGE.BYZD4 is '备用字段4';
+comment on column T_YJPT_CG_STORAGE.BYZD5 is '备用字段5';
+comment on column T_YJPT_CG_STORAGE.COMMODITY_NAME is '货种名称';
+comment on column T_YJPT_CG_STORAGE.CAS is 'CAS号';
+comment on column T_YJPT_CG_STORAGE.UN is 'UN编号';
+comment on column T_YJPT_CG_STORAGE.FIRE_RISK is '火灾危险性';
+comment on column T_YJPT_CG_STORAGE.DANGER_CHEMICAL is '危险化学品';
+comment on column T_YJPT_CG_STORAGE.TOXIC_CHEMICAL is '剧毒化学品';
+
+
+create table T_YJPT_CG_OPERATION_CONDITION 
+(
+	ID NUMBER(38,0) NOT NULL PRIMARY KEY, 
+	CG_INFO_ID NUMBER NOT NULL,
+	ADD_USER VARCHAR2(50),
+	ADD_DATE TIMESTAMP,
+	UPDATE_USER VARCHAR(50),
+	UPDATE_DATE TIMESTAMP,
+	RECORD_STATUS NUMBER(38,0),
+	SFTB CHAR(1),
+	TBZT CHAR(1),
+	TBDYID NUMBER(38,0),
+	QYLB CHAR(1),
+	SZD NUMBER(38,0),
+	RECORD_CODE VARCHAR2(30),
+	BYZD1 VARCHAR(100),
+	BYZD2 VARCHAR(100),
+	BYZD3 VARCHAR(100),
+	BYZD4 VARCHAR(100),
+	BYZD5 VARCHAR(100),
+	OPERATION_TIME TIMESTAMP,
+	OPERATION_COMMODITY_NAME VARCHAR2(100),
+	OPERATION_PRESSURE NUMBER(*,3),
+	OPERATION_TEMP NUMBER(*,3)
+);
+
+
+comment on table T_YJPT_CG_OPERATION_CONDITION is '储罐近3个月作业情况，港口危险货物储罐基本信息表的子表';
+comment on column T_YJPT_CG_OPERATION_CONDITION.ID is 'ID主键';
+comment on column T_YJPT_CG_OPERATION_CONDITION.CG_INFO_ID is '储罐基础信息表的ID';
+comment on column T_YJPT_CG_OPERATION_CONDITION.ADD_USER is '信息添加人ID';
+comment on column T_YJPT_CG_OPERATION_CONDITION.ADD_DATE is '信息添加时间';
+comment on column T_YJPT_CG_OPERATION_CONDITION.UPDATE_USER is '最近一次信息修改人ID';
+comment on column T_YJPT_CG_OPERATION_CONDITION.UPDATE_DATE is '最近一次信息修改时间';
+comment on column T_YJPT_CG_OPERATION_CONDITION.RECORD_STATUS is '记录状态';
+comment on column T_YJPT_CG_OPERATION_CONDITION.SFTB is '是否需要同步：Y是、N否';
+comment on column T_YJPT_CG_OPERATION_CONDITION.TBZT is '是否已同步：Y是、N否';
+comment on column T_YJPT_CG_OPERATION_CONDITION.TBDYID is '同步对应ID';
+comment on column T_YJPT_CG_OPERATION_CONDITION.QYLB is '区域类别：0:省级、1:市级';
+comment on column T_YJPT_CG_OPERATION_CONDITION.SZD is '所在地ID';
+comment on column T_YJPT_CG_OPERATION_CONDITION.RECORD_CODE is '所属角色编码';
+comment on column T_YJPT_CG_OPERATION_CONDITION.BYZD1 is '备用字段1';
+comment on column T_YJPT_CG_OPERATION_CONDITION.BYZD2 is '备用字段2';
+comment on column T_YJPT_CG_OPERATION_CONDITION.BYZD3 is '备用字段3';
+comment on column T_YJPT_CG_OPERATION_CONDITION.BYZD4 is '备用字段4';
+comment on column T_YJPT_CG_OPERATION_CONDITION.BYZD5 is '备用字段5';
+comment on column T_YJPT_CG_OPERATION_CONDITION.BYZD2 is '作业时间';
+comment on column T_YJPT_CG_OPERATION_CONDITION.BYZD3 is '作业货种名';
+comment on column T_YJPT_CG_OPERATION_CONDITION.BYZD4 is '作业压力MPa';
+comment on column T_YJPT_CG_OPERATION_CONDITION.BYZD5 is '作业温度℃';
+
+CREATE SEQUENCE SEQ_CG_INFO MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
+CREATE SEQUENCE SEQ_CG_STORAGE MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
+CREATE SEQUENCE SEQ_CG_OPERATION_CONDITION MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
+
+</#if>