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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -1177,6 +1177,10 @@ public class ZysqbpController extends BaseController {
 		String url = Thread.currentThread().getStackTrace()[2].getClassName()
 				+ "."
 				+ Thread.currentThread().getStackTrace()[2].getMethodName();
+		
+		//提单号同意转换成大写
+		vo.setBLNo(vo.getBLNo().toUpperCase());
+		
 		try {
 			BusinessContext bc = createBusinessContext();
 			if (null == vo.getId() || vo.getId().equals(0L)) {
@@ -1218,6 +1222,8 @@ public class ZysqbpController extends BaseController {
 				+ Thread.currentThread().getStackTrace()[2].getMethodName();
 		BusinessContext bc = createBusinessContext();
 		
+		//提单号同意转换成大写
+		vo.setBLNo(vo.getBLNo().toUpperCase());
 		
 		/***********从开工、完工报处调用save函数才需要执行这边代码****plus by xh-2016-11-02*************/
 		//开工报

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpEntity.java

@@ -3,6 +3,7 @@ package com.jtgh.yjpt.entity.zysqbp;
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
@@ -195,7 +196,20 @@ public class ZysqbpEntity extends BaseEntity<Long> {
 	/*-------------------------------新增字段用于记录开工报、完工报填报人 end -------------------------------------------------------------*/
 
 	
-	/**/
+	/* 新增提单号字段 plus by xuhao 2017-03-25
+	 * 用于张家港永嘉的开工报完工报对接
+	 *  */
+	private String BLNo;
+	
+	
+	@Column(name = "BL_NO")
+	public String getBLNo() {
+		return BLNo;
+	}
+	public void setBLNo(String bLNo) {
+		BLNo = bLNo;
+	}
+	/*-------------提单号字段end--------------*/
 	
 	public String getCnno() {
 		return cnno;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zysqbp/ZysqbpServiceImpl.java

@@ -229,6 +229,10 @@ public class ZysqbpServiceImpl extends
 		SimpleDateFormat sdf = new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss ");
 		String kasj = data.getZysjq() != null ? sdf.format(data.getZysjq()) : "";
 		
+
+		//提单号同意转换成大写
+		data.setBLNo(data.getBLNo().toUpperCase());
+		
 		if (data.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {
 			//被退回的数据重新提交
 			data.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -1,6 +1,6 @@
 #***************************************  jdbc info  ********************************************#
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
-jdbc.url                      = jdbc:oracle:thin:@192.168.57.36:1521:orcl
+jdbc.url                      = jdbc:oracle:thin:@localhost:1521:orcl
 jdbc.username           = yjptzj
 jdbc.password            = yjpt
 hibernate.dialect        = org.hibernate.dialect.Oracle10gDialect