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

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

@@ -91,14 +91,13 @@ public class DcController extends BaseController {
 	 * @throws ParseException
 	 */
 	@Log(Type.QUERY)
-	public BusinessContext list(SinglePageRequest pageRequest, Long functionId,
-			DcEntity entity, Date jcsjK, Date jcsjZ) throws ParseException {
+	public BusinessContext list(SinglePageRequest pageRequest, Long functionId,DcEntity entity, Date jcsjK, Date jcsjZ) 
+			throws ParseException {
 		BusinessContext bc = new BusinessContext();
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		addRecordCodeFilter(functionId, filterList, null, "bdcdw");
 		if (null != entity.getSzd()) {
-			addNotEmptyModel(filterList, "szd.id", entity.getSzd().getId(),
-					Operator.LIKE_R);
+			addNotEmptyModel(filterList, "szd.id", entity.getSzd().getId(),Operator.LIKE_R);
 		}
 		addNotEmptyModel(filterList, "szgq", entity.getSzgq(), Operator.EQ);
 		addNotEmptyModel(filterList, "bdcdw", entity.getBdcdw(), Operator.EQ);
@@ -106,27 +105,24 @@ public class DcController extends BaseController {
 		addNotEmptyModel(filterList, "mqzt", entity.getMqzt(), Operator.EQ);
 		addNotEmptyModel(filterList, "original", "original", Operator.NL);
 		if (jcsjK != null) {
-			addNotEmptyModel(filterList, "sj", Utils.getDateFirstTime(jcsjK),
-					Operator.GTE);
+			addNotEmptyModel(filterList, "sj", Utils.getDateFirstTime(jcsjK),Operator.GTE);
 		}
 		if (jcsjZ != null) {
-			addNotEmptyModel(filterList, "sj", Utils.getDateLastTime(jcsjZ),
-					Operator.LTE);
+			addNotEmptyModel(filterList, "sj", Utils.getDateLastTime(jcsjZ),Operator.LTE);
 		}
-		addNotEmptyModel(filterList, "bdcdwfzr", entity.getBdcdwfzr(),
-				Operator.LIKE);
-		addNotEmptyModel(filterList, "recordStatus",
-				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
-		Specification<DcEntity> spec = SpecificationCreater
-				.searchByPredicateModels(filterList);
+		addNotEmptyModel(filterList, "bdcdwfzr", entity.getBdcdwfzr(),Operator.LIKE);
+		addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		//plus by xuhao 20160208
+		//经营人不要看到未提交的数据
+		if(Utils.getCurrentUser().getSfjyr().equals(Constants.YES)){
+			addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_VALID, Operator.NEQ);
+		}
+		Specification<DcEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
 		Page<DcEntity> page = dcService.findAll(spec, pageRequest);
 		for (DcEntity ba : page) {
-			if (dcService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId()
-					.toString(), ba.getId().toString()) != null) {
+			if (dcService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), ba.getId().toString()) != null) {
 				ba.setTaskState(Constants.TASK_ASSIGN);
-			} else if (dcService
-					.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser()
-							.getId().toString(), ba.getId().toString()) != null) {
+			} else if (dcService.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), ba.getId().toString()) != null) {
 				ba.setTaskState(Constants.TASK_CANDIDATE);
 			}
 			if (ba.getTaskList() != null && ba.getTaskList().size() > 0) {

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

@@ -482,6 +482,7 @@ public class WhsqbpWebService extends BaseController {
 	 * 3:您好，根据《港口危险货物安全管理规定》，危险货物港口经营人在危险货物港口装卸
 	 * 、过驳作业开始24小时前，应当向所在地港口行政管理部门报告。报告人在取得作业批准后72小时内未开始作业的
 	 * ，应当重新报告。现间隔超过72小时，请重新填写！ 4:您选择的作业场所被禁止作业，请重新选择！
+	 * 5:作业数量超过泊位核查靠泊能力
 	 */
 	public String submit(ZysqbpEntity sqbp) {
 		if (null == sqbp.getId() || sqbp.getId().equals(0l)) {
@@ -576,6 +577,26 @@ public class WhsqbpWebService extends BaseController {
 				return "4";
 			}
 		}
+		
+		
+		//校验作业数量和泊位核查靠泊能力
+		if(sqbp.getZyddqybh()!=null && sqbp.getZyddqybh().getZycs()!=null && sqbp.getZyddqybh().getZycs().getId()==10000501L){
+			if(sqbp.getZyddqybh().getQynbbh()!=null && !sqbp.getZyddqybh().getQynbbh().equals("")){//泊位企业内部编号
+				BwEntity bwEntity = bwService.findOne(Long.parseLong(sqbp.getZyddqybh().getQynbbh()));
+				//做是否船队申报判断
+				if(sqbp!=null && sqbp.getByzd3()!=null&& !sqbp.getByzd3().equals("") && Integer.valueOf(sqbp.getByzd3())>0){//船队
+					//是船队，平均到每条船上的作业数量也应小于泊位核查靠泊能力，与web验证方式一致
+					if((Double.parseDouble(bwEntity.getHckpnl())*10000)<(sqbp.getZysl()/Integer.valueOf(sqbp.getByzd3()))){
+						return "5";
+					}
+				}
+				else if((Double.parseDouble(bwEntity.getHckpnl())*10000)<sqbp.getZysl()){//非船队
+					return "5";
+				}
+			}
+		}
+		
+		
 		sqbp = zysqbpService.submitWebService(sqbp);
 		// 自动审批
 		if (sqbp.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
@@ -600,8 +621,8 @@ public class WhsqbpWebService extends BaseController {
 				}
 
 			}
-
-		}
+		}//end同步
+		
 		return "0";
 	}
 

gkaq/yjpt-java/trunk/resources/iReport/aqsp/zysq-html.jrxml

@@ -2,7 +2,7 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="zysq" language="groovy" pageWidth="595" pageHeight="855" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isIgnorePagination="true" uuid="6ba495ef-8263-45ad-a2fd-2d5f92c4f9fd">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="377"/>
+	<property name="ireport.y" value="91"/>
 	<parameter name="audit_user" class="java.lang.String"/>
 	<parameter name="audit_date" class="java.util.Date"/>
 	<parameter name="audit_op" class="java.lang.String"/>
@@ -461,6 +461,7 @@
 	<field name="zywtr_1" class="java.lang.String">
 		<fieldDescription><![CDATA[zywtr]]></fieldDescription>
 	</field>
+	<field name="jzxxh" class="java.lang.String"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -492,7 +493,7 @@
 		</band>
 	</title>
 	<detail>
-		<band height="795" splitType="Immediate">
+		<band height="796" splitType="Immediate">
 			<textField isBlankWhenNull="true">
 				<reportElement x="370" y="50" width="185" height="25" uuid="8a5c3dcf-807a-48a2-8542-5c47b1f549bf"/>
 				<box leftPadding="5">
@@ -780,7 +781,7 @@
 				<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{hwzl}.getName())]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="345" width="95" height="25" uuid="d3e1a39e-1e5c-4458-bd37-4362c1c3f78a"/>
+				<reportElement positionType="Float" x="0" y="367" width="95" height="25" uuid="d3e1a39e-1e5c-4458-bd37-4362c1c3f78a"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -793,7 +794,7 @@
 				<text><![CDATA[作业地点]]></text>
 			</staticText>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="95" y="345" width="460" height="25" uuid="e597d526-1bf9-476b-b8b5-569aae50883a"/>
+				<reportElement positionType="Float" x="95" y="367" width="460" height="25" uuid="e597d526-1bf9-476b-b8b5-569aae50883a"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -806,7 +807,7 @@
 				<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{zydd}.getName())+"_"+$F{zyddqybh}.getQynbmc()]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="370" width="95" height="25" uuid="e9859303-ffbd-40cf-acb0-9adbfbe7ed06"/>
+				<reportElement positionType="Float" x="0" y="392" width="95" height="25" uuid="e9859303-ffbd-40cf-acb0-9adbfbe7ed06"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -819,7 +820,7 @@
 				<text><![CDATA[作业时间起]]></text>
 			</staticText>
 			<staticText>
-				<reportElement positionType="Float" x="275" y="370" width="95" height="25" uuid="f3fbc3b7-4ece-4f18-a911-39ad93e4b28c"/>
+				<reportElement positionType="Float" x="275" y="392" width="95" height="25" uuid="f3fbc3b7-4ece-4f18-a911-39ad93e4b28c"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -832,7 +833,7 @@
 				<text><![CDATA[作业时间止]]></text>
 			</staticText>
 			<textField pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="370" y="370" width="185" height="25" uuid="6c555886-6a67-4f78-82bf-c2f51411bb76"/>
+				<reportElement positionType="Float" x="370" y="392" width="185" height="25" uuid="6c555886-6a67-4f78-82bf-c2f51411bb76"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -845,7 +846,7 @@
 				<textFieldExpression><![CDATA[$F{zysjz}]]></textFieldExpression>
 			</textField>
 			<textField pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="95" y="370" width="180" height="25" uuid="cb2fb5d5-a170-473b-bed7-f033b27d99a3"/>
+				<reportElement positionType="Float" x="95" y="392" width="180" height="25" uuid="cb2fb5d5-a170-473b-bed7-f033b27d99a3"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -858,7 +859,7 @@
 				<textFieldExpression><![CDATA[$F{zysjq}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="275" y="478" width="95" height="25" uuid="4efcf49e-7476-49a3-8d26-6e91a0700eab"/>
+				<reportElement positionType="Float" x="275" y="500" width="95" height="25" uuid="4efcf49e-7476-49a3-8d26-6e91a0700eab"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -871,7 +872,7 @@
 				<text><![CDATA[联系方式]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="95" y="478" width="180" height="25" uuid="81ef04cd-7074-4ba4-8531-12de8bcf6c91"/>
+				<reportElement positionType="Float" x="95" y="500" width="180" height="25" uuid="81ef04cd-7074-4ba4-8531-12de8bcf6c91"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -884,7 +885,7 @@
 				<textFieldExpression><![CDATA[$F{bgr}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="478" width="95" height="25" uuid="e5792ec9-dd11-4554-bd2f-998ad21688e0"/>
+				<reportElement positionType="Float" x="0" y="500" width="95" height="25" uuid="e5792ec9-dd11-4554-bd2f-998ad21688e0"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -897,7 +898,7 @@
 				<text><![CDATA[报告人]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="370" y="478" width="185" height="25" uuid="20830a8f-f2b1-4bbe-b4cb-700d443eba62"/>
+				<reportElement positionType="Float" x="370" y="500" width="185" height="25" uuid="20830a8f-f2b1-4bbe-b4cb-700d443eba62"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -910,7 +911,7 @@
 				<textFieldExpression><![CDATA[$F{lxfs}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="275" y="503" width="95" height="25" uuid="bb07aed2-6232-4266-9558-16aad33a66af"/>
+				<reportElement positionType="Float" x="275" y="525" width="95" height="25" uuid="bb07aed2-6232-4266-9558-16aad33a66af"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -923,7 +924,7 @@
 				<text><![CDATA[申报员证书编号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="503" width="95" height="25" uuid="f4d7a166-54d5-49d4-bd32-155635073a6b"/>
+				<reportElement positionType="Float" x="0" y="525" width="95" height="25" uuid="f4d7a166-54d5-49d4-bd32-155635073a6b"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -936,7 +937,7 @@
 				<text><![CDATA[报告时间]]></text>
 			</staticText>
 			<textField pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="95" y="503" width="180" height="25" uuid="8f1d8139-403c-4755-abe2-43902d0d13b2"/>
+				<reportElement positionType="Float" x="95" y="525" width="180" height="25" uuid="8f1d8139-403c-4755-abe2-43902d0d13b2"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -949,7 +950,7 @@
 				<textFieldExpression><![CDATA[$F{bgsj}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="370" y="503" width="185" height="25" uuid="cf393de3-7c29-4b44-b498-d30aa07eb315"/>
+				<reportElement positionType="Float" x="370" y="525" width="185" height="25" uuid="cf393de3-7c29-4b44-b498-d30aa07eb315"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -962,7 +963,7 @@
 				<textFieldExpression><![CDATA[$F{byzd2}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="596" width="95" height="40" uuid="e4eb1361-d4c8-47f3-80f0-00ac9bda6026"/>
+				<reportElement positionType="Float" x="0" y="608" width="95" height="30" uuid="e4eb1361-d4c8-47f3-80f0-00ac9bda6026"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -975,7 +976,7 @@
 				<text><![CDATA[审核机构]]></text>
 			</staticText>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="556" width="95" height="40" uuid="9173aab9-0d50-442d-8d54-d9e8f03b308c"/>
+				<reportElement positionType="Float" x="0" y="578" width="95" height="29" uuid="9173aab9-0d50-442d-8d54-d9e8f03b308c"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -988,7 +989,7 @@
 				<text><![CDATA[审核意见]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="95" y="556" width="180" height="40" uuid="9d0d12f0-62e7-433b-8bdd-7fb9c77d9a77"/>
+				<reportElement positionType="Float" x="95" y="578" width="180" height="29" uuid="9d0d12f0-62e7-433b-8bdd-7fb9c77d9a77"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1001,7 +1002,7 @@
 				<textFieldExpression><![CDATA[$P{audit_op}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="95" y="596" width="180" height="40" uuid="154965c1-8309-4427-80a5-f57781988f59"/>
+				<reportElement positionType="Float" x="95" y="608" width="180" height="30" uuid="154965c1-8309-4427-80a5-f57781988f59"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1014,14 +1015,14 @@
 				<textFieldExpression><![CDATA[$P{audit_dept}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="528" width="555" height="28" uuid="59cd0672-cc0e-44d1-beec-a003eca40942"/>
+				<reportElement positionType="Float" x="0" y="550" width="555" height="28" uuid="59cd0672-cc0e-44d1-beec-a003eca40942"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="16" isBold="true" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
 				</textElement>
 				<text><![CDATA[审核]]></text>
 			</staticText>
 			<staticText>
-				<reportElement positionType="Float" mode="Transparent" x="275" y="636" width="95" height="25" uuid="1d7a5058-80ad-4abc-bb03-ee5b675d5d00"/>
+				<reportElement positionType="Float" mode="Transparent" x="275" y="638" width="95" height="25" uuid="1d7a5058-80ad-4abc-bb03-ee5b675d5d00"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1034,7 +1035,7 @@
 				<text><![CDATA[审核日期]]></text>
 			</staticText>
 			<textField pattern="yyyy-MM-dd" isBlankWhenNull="true">
-				<reportElement positionType="Float" mode="Transparent" x="370" y="636" width="185" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="4402e1e5-d0fb-471f-a47e-3e6a7360d79a"/>
+				<reportElement positionType="Float" mode="Transparent" x="370" y="638" width="185" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="4402e1e5-d0fb-471f-a47e-3e6a7360d79a"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1048,7 +1049,7 @@
 				<textFieldExpression><![CDATA[$P{audit_date}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="636" width="95" height="25" uuid="30fa207a-471b-45a1-add1-d5edbcde6f65"/>
+				<reportElement positionType="Float" x="0" y="638" width="95" height="25" uuid="30fa207a-471b-45a1-add1-d5edbcde6f65"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1061,7 +1062,7 @@
 				<text><![CDATA[审核人]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="95" y="636" width="180" height="25" uuid="f8f0ad68-ddca-4fa2-962c-3d4b17e7d802"/>
+				<reportElement positionType="Float" x="95" y="638" width="180" height="25" uuid="f8f0ad68-ddca-4fa2-962c-3d4b17e7d802"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1074,7 +1075,7 @@
 				<textFieldExpression><![CDATA[$P{audit_user}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="741" width="555" height="27" isRemoveLineWhenBlank="true" uuid="41150641-1933-48f4-bd09-aee5076636cd">
+				<reportElement positionType="Float" x="0" y="743" width="555" height="27" isRemoveLineWhenBlank="true" uuid="41150641-1933-48f4-bd09-aee5076636cd">
 					<printWhenExpression><![CDATA[$F{qxzysj}!=null]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -1083,7 +1084,7 @@
 				<textFieldExpression><![CDATA["取消作业，取消作业时间为："+new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format($F{qxzysj})]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="768" width="555" height="27" isRemoveLineWhenBlank="true" uuid="075fce64-c1f9-4c5b-be88-5542ef643356">
+				<reportElement positionType="Float" x="0" y="769" width="555" height="27" isRemoveLineWhenBlank="true" uuid="075fce64-c1f9-4c5b-be88-5542ef643356">
 					<printWhenExpression><![CDATA[$F{qxzysj}!=null]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Justified" verticalAlignment="Middle">
@@ -1105,7 +1106,7 @@
 				<text><![CDATA[船名]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="275" y="25" width="95" height="25" uuid="f4667ed4-7c94-457b-bc2f-d329f1a15a2e"/>
+				<reportElement x="275" y="225" width="95" height="25" uuid="f4667ed4-7c94-457b-bc2f-d329f1a15a2e"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1183,7 +1184,7 @@
 				<textFieldExpression><![CDATA[$F{zydw}.getGkjyr()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="370" y="25" width="185" height="25" uuid="0b52f8ca-902e-447c-8467-b6466e87e5b4"/>
+				<reportElement x="370" y="225" width="185" height="25" uuid="0b52f8ca-902e-447c-8467-b6466e87e5b4"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1196,31 +1197,13 @@
 				<textFieldExpression><![CDATA[$F{xcglfzr}]]></textFieldExpression>
 			</textField>
 			<frame>
-				<reportElement positionType="Float" x="275" y="556" width="280" height="80" uuid="6a7baab4-a401-4660-9be0-f3d78ad8fc82"/>
+				<reportElement positionType="Float" x="275" y="578" width="280" height="60" uuid="6a7baab4-a401-4660-9be0-f3d78ad8fc82"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
-				<image scaleImage="Clip" hAlign="Center" vAlign="Middle" isUsingCache="false" isLazy="true">
-					<reportElement isPrintRepeatedValues="false" x="0" y="10" width="280" height="60" uuid="7562ba88-12f7-4a0e-babc-20441148c842">
-						<printWhenExpression><![CDATA[!$F{szd}.getId().equals(9001603l)&&!$F{szd}.getId().equals(90028l)
-&&!$F{szd}.getId().equals(9001211l)&&!$F{szd}.getId().equals(9001201l)&&!$F{szd}.getId().equals(9001205l)
-&&($F{recordStatus}.toString()=="2"||$F{recordStatus}.toString()=="6"||$F{recordStatus}.toString()=="10")]]></printWhenExpression>
-					</reportElement>
-					<box topPadding="5" leftPadding="10" rightPadding="0"/>
-					<imageExpression><![CDATA[$P{qianzhang_url}==""?null:$P{qianzhang_url}]]></imageExpression>
-				</image>
-				<image scaleImage="RetainShape" hAlign="Center" vAlign="Middle" isUsingCache="false" isLazy="true">
-					<reportElement isPrintRepeatedValues="false" x="0" y="0" width="280" height="80" uuid="03a35f83-edcd-4f7a-bb29-c28dd5a537cd">
-						<printWhenExpression><![CDATA[($F{szd}.getId().equals(9001603l)||$F{szd}.getId().equals(90028l)
-    ||$F{szd}.getId().equals(9001211l)||$F{szd}.getId().equals(9001201l)||$F{szd}.getId().equals(9001205l))
-&&($F{recordStatus}.toString()=="2"||$F{recordStatus}.toString()=="6"||$F{recordStatus}.toString()=="10")]]></printWhenExpression>
-					</reportElement>
-					<box topPadding="5" leftPadding="10" rightPadding="0"/>
-					<imageExpression><![CDATA[$P{qianzhang_url}==""?null:$P{qianzhang_url}]]></imageExpression>
-				</image>
 			</frame>
 			<staticText>
 				<reportElement x="0" y="100" width="95" height="25" uuid="d2f8c73f-b0f9-4227-b561-170e0a21c292"/>
@@ -1275,7 +1258,7 @@
 				<textFieldExpression><![CDATA[$F{byzd4}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="395" width="95" height="83" uuid="1935dd90-9213-4b56-837e-dfbbdffc870f"/>
+				<reportElement x="0" y="417" width="95" height="44" uuid="1935dd90-9213-4b56-837e-dfbbdffc870f"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1288,7 +1271,7 @@
 				<text><![CDATA[安全防范措施]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement x="95" y="395" width="460" height="83" uuid="549f1ef5-ab70-4744-aeeb-3452012bbc6d"/>
+				<reportElement x="95" y="417" width="460" height="44" uuid="549f1ef5-ab70-4744-aeeb-3452012bbc6d"/>
 				<box topPadding="0" leftPadding="5" bottomPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1353,7 +1336,7 @@
 				<textFieldExpression><![CDATA[$F{xg_1}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="300" width="95" height="45" uuid="bb838763-46ff-4b52-9def-8a8c0c5ee3bb"/>
+				<reportElement x="0" y="328" width="95" height="39" uuid="bb838763-46ff-4b52-9def-8a8c0c5ee3bb"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1366,7 +1349,7 @@
 				<text><![CDATA[理化性质]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement x="95" y="300" width="460" height="45" uuid="3091f2ce-4752-4b60-a239-78d9ed797ce8"/>
+				<reportElement x="95" y="328" width="460" height="39" uuid="3091f2ce-4752-4b60-a239-78d9ed797ce8"/>
 				<box topPadding="0" leftPadding="5" bottomPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1380,7 +1363,7 @@
 				<textFieldExpression><![CDATA[$F{lhxz}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="275" y="225" width="95" height="25" uuid="7c7bc537-72be-4733-94b7-e13103565de5"/>
+				<reportElement x="275" y="25" width="95" height="25" uuid="7c7bc537-72be-4733-94b7-e13103565de5"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1393,7 +1376,7 @@
 				<text><![CDATA[航次]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement x="370" y="225" width="185" height="25" uuid="147f1f63-4467-4493-8f8b-99c2cccdfb64"/>
+				<reportElement x="370" y="25" width="185" height="25" uuid="147f1f63-4467-4493-8f8b-99c2cccdfb64"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1406,7 +1389,7 @@
 				<textFieldExpression><![CDATA[$F{hc}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="691" width="95" height="25" uuid="a166e246-75e3-4e24-8109-9d40a3bc314c"/>
+				<reportElement positionType="Float" x="0" y="693" width="95" height="25" uuid="a166e246-75e3-4e24-8109-9d40a3bc314c"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1419,7 +1402,7 @@
 				<text><![CDATA[靠泊时间]]></text>
 			</staticText>
 			<textField pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="95" y="691" width="180" height="25" uuid="12001919-7487-4073-afe8-588af47894ca"/>
+				<reportElement positionType="Float" x="95" y="693" width="180" height="25" uuid="12001919-7487-4073-afe8-588af47894ca"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1432,7 +1415,7 @@
 				<textFieldExpression><![CDATA[$F{kpsj}]]></textFieldExpression>
 			</textField>
 			<textField pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="95" y="716" width="180" height="25" uuid="53d4ac47-8ee2-470b-a908-1f5b289a8d39"/>
+				<reportElement positionType="Float" x="95" y="718" width="180" height="25" uuid="53d4ac47-8ee2-470b-a908-1f5b289a8d39"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1445,7 +1428,7 @@
 				<textFieldExpression><![CDATA[$F{kgsj}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="716" width="95" height="25" uuid="7f3846a6-8fa9-4c47-9eee-ae7d18b2741d"/>
+				<reportElement positionType="Float" x="0" y="718" width="95" height="25" uuid="7f3846a6-8fa9-4c47-9eee-ae7d18b2741d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1458,7 +1441,7 @@
 				<text><![CDATA[开工时间]]></text>
 			</staticText>
 			<textField pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
-				<reportElement positionType="Float" mode="Transparent" x="370" y="716" width="185" height="25" uuid="4dc1f35b-373c-436f-bd9a-674fd9be8d0d"/>
+				<reportElement positionType="Float" mode="Transparent" x="370" y="718" width="185" height="25" uuid="4dc1f35b-373c-436f-bd9a-674fd9be8d0d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1471,7 +1454,7 @@
 				<textFieldExpression><![CDATA[$F{wgsj}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" mode="Transparent" x="275" y="716" width="95" height="25" uuid="b104d242-5bf9-444b-95e7-adff52d3f3f2"/>
+				<reportElement positionType="Float" mode="Transparent" x="275" y="718" width="95" height="25" uuid="b104d242-5bf9-444b-95e7-adff52d3f3f2"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1484,7 +1467,7 @@
 				<text><![CDATA[完工时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement positionType="Float" mode="Transparent" x="275" y="691" width="95" height="25" uuid="99f45689-dd6c-4aa4-8c42-e4baabd83330"/>
+				<reportElement positionType="Float" mode="Transparent" x="275" y="693" width="95" height="25" uuid="99f45689-dd6c-4aa4-8c42-e4baabd83330"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1497,7 +1480,7 @@
 				<text><![CDATA[]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" mode="Transparent" x="370" y="691" width="185" height="25" uuid="645a8db9-b0a5-4120-b10e-027b6ed391b0"/>
+				<reportElement positionType="Float" mode="Transparent" x="370" y="693" width="185" height="25" uuid="645a8db9-b0a5-4120-b10e-027b6ed391b0"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -1509,7 +1492,7 @@
 				</textElement>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="0" y="661" width="555" height="30" uuid="6b4c1e02-4a90-4e03-b6b3-d0b23b1b23f3"/>
+				<reportElement positionType="Float" x="0" y="663" width="555" height="30" uuid="6b4c1e02-4a90-4e03-b6b3-d0b23b1b23f3"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="16" isBold="true" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
 				</textElement>
@@ -1567,6 +1550,77 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{jspm}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement x="0" y="300" width="95" height="28" uuid="a708beb2-ef22-4863-8e72-ae7deb8ae934"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement verticalAlignment="Middle">
+					<font fontName="宋体" size="12" isBold="true" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
+				</textElement>
+				<text><![CDATA[集装箱箱号]]></text>
+			</staticText>
+			<textField isBlankWhenNull="true">
+				<reportElement x="95" y="300" width="460" height="28" uuid="f77c91fc-b99b-4041-8645-c651d3eaa68c"/>
+				<box topPadding="0" leftPadding="5" bottomPadding="5">
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement verticalAlignment="Middle">
+					<font fontName="Serif" size="12" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{jzxxh}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="95" y="461" width="460" height="39" uuid="893cf936-170e-452c-94b6-cb20aa1b6db5"/>
+				<box topPadding="0" leftPadding="5" bottomPadding="5">
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement verticalAlignment="Middle">
+					<font fontName="Serif" size="12" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{byzd3}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="461" width="95" height="39" uuid="1f2cf67f-3d1b-43df-bafd-9e66833bab34"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement verticalAlignment="Middle">
+					<font fontName="宋体" size="12" isBold="true" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
+				</textElement>
+				<text><![CDATA[备注]]></text>
+			</staticText>
+			<image scaleImage="Clip" hAlign="Center" vAlign="Middle" isUsingCache="false" isLazy="true">
+				<reportElement isPrintRepeatedValues="false" x="275" y="578" width="280" height="60" uuid="7562ba88-12f7-4a0e-babc-20441148c842">
+					<printWhenExpression><![CDATA[!$F{szd}.getId().equals(9001603l)&&!$F{szd}.getId().equals(90028l)
+&&!$F{szd}.getId().equals(9001211l)&&!$F{szd}.getId().equals(9001201l)&&!$F{szd}.getId().equals(9001205l)
+&&($F{recordStatus}.toString()=="2"||$F{recordStatus}.toString()=="6"||$F{recordStatus}.toString()=="10")]]></printWhenExpression>
+				</reportElement>
+				<box topPadding="5" leftPadding="10" rightPadding="0"/>
+				<imageExpression><![CDATA[$P{qianzhang_url}==""?null:$P{qianzhang_url}]]></imageExpression>
+			</image>
+			<image scaleImage="RetainShape" hAlign="Center" vAlign="Middle" isUsingCache="false" isLazy="true">
+				<reportElement isPrintRepeatedValues="false" x="275" y="578" width="280" height="60" uuid="03a35f83-edcd-4f7a-bb29-c28dd5a537cd">
+					<printWhenExpression><![CDATA[($F{szd}.getId().equals(9001603l)||$F{szd}.getId().equals(90028l)
+    ||$F{szd}.getId().equals(9001211l)||$F{szd}.getId().equals(9001201l)||$F{szd}.getId().equals(9001205l))
+&&($F{recordStatus}.toString()=="2"||$F{recordStatus}.toString()=="6"||$F{recordStatus}.toString()=="10")]]></printWhenExpression>
+				</reportElement>
+				<box topPadding="5" leftPadding="10" rightPadding="0"/>
+				<imageExpression><![CDATA[$P{qianzhang_url}==""?null:$P{qianzhang_url}]]></imageExpression>
+			</image>
 		</band>
 	</detail>
 </jasperReport>

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

@@ -8856,3 +8856,7 @@ Alter TABLE T_YJPT_WXHWGKZYSBD ADD FR VARCHAR2(100);
 COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.SR IS '开工报填报人StartReport';
 COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.FR IS '完工报填报人FinishReport';
 </#if>
+
+<#if versionDate?date("yyyyMMdd") lt "20170217"?date("yyyyMMdd")>
+COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.BYZD3 IS '备注';
+</#if>