zhangFan / analysis_imf · 提交

转到一个项目

作者 xudada
提交 289314422f8ecef59d57ce367cc55c9d727304f1 1 个父辈 b5156221

增加拉入黑名单备案车辆出区不允许抬杆儿

内嵌 并排对比
正在显示 3 个修改的文件 包含 67 行增加 和 51 行删除
@@ -80,6 +80,7 @@ public class LiftBar { @@ -80,6 +80,7 @@ public class LiftBar {
80 private static String FANGXING="有运单未放行"; 80 private static String FANGXING="有运单未放行";
81 private static String FENBO = "装载运单的分拨申请舱单未通过校验"; 81 private static String FENBO = "装载运单的分拨申请舱单未通过校验";
82 private static String NOGrossWt = "过磅重量异常"; 82 private static String NOGrossWt = "过磅重量异常";
  83 + private static String BLACKLIST="此车辆已被拉进黑名单，不允许出区";
83 84
84 85
85 //分拨申请回执 86 //分拨申请回执
@@ -145,6 +146,10 @@ public class LiftBar { @@ -145,6 +146,10 @@ public class LiftBar {
145 //CommandClient.Client(info, NORECORD + vaName); 146 //CommandClient.Client(info, NORECORD + vaName);
146 return result; 147 return result;
147 } 148 }
  149 + if("Y".equals(ve.getVeState())){
  150 + sendBw(info,false,BLACKLIST + vaName,new LandBusinessTypeList(),listinfos);
  151 + return result;
  152 + }
148 selfWt=Double.parseDouble(ve.getSelfWt());//车辆备案我不是 153 selfWt=Double.parseDouble(ve.getSelfWt());//车辆备案我不是
149 if(info.getGrosswt().compareTo(BigDecimal.ZERO)==1){ 154 if(info.getGrosswt().compareTo(BigDecimal.ZERO)==1){
150 logger.info("过磅重量校验通过，过磅重量大于0"); 155 logger.info("过磅重量校验通过，过磅重量大于0");
@@ -121,6 +121,16 @@ public class LandRoadVe { @@ -121,6 +121,16 @@ public class LandRoadVe {
121 121
122 private Date updateDate; 122 private Date updateDate;
123 123
  124 + public String getVeState() {
  125 + return veState;
  126 + }
  127 +
  128 + public void setVeState(String veState) {
  129 + this.veState = veState;
  130 + }
  131 +
  132 + private String veState;
  133 +
124 public String getId() { 134 public String getId() {
125 return id; 135 return id;
126 } 136 }
@@ -592,4 +602,4 @@ public class LandRoadVe { @@ -592,4 +602,4 @@ public class LandRoadVe {
592 public void setUpdateDate(Date updateDate) { 602 public void setUpdateDate(Date updateDate) {
593 this.updateDate = updateDate; 603 this.updateDate = updateDate;
594 } 604 }
595 -}  
  605 +}
@@ -61,21 +61,22 @@ @@ -61,21 +61,22 @@
61 <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" /> 61 <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
62 <result column="UPDATE_BY" jdbcType="VARCHAR" property="updateBy" /> 62 <result column="UPDATE_BY" jdbcType="VARCHAR" property="updateBy" />
63 <result column="UPDATE_DATE" jdbcType="TIMESTAMP" property="updateDate" /> 63 <result column="UPDATE_DATE" jdbcType="TIMESTAMP" property="updateDate" />
  64 + <result column="VE_STATE" jdbcType="VARCHAR" property="veState" />
64 </resultMap> 65 </resultMap>
65 <sql id="Base_Column_List"> 66 <sql id="Base_Column_List">
66 - ID, EPORT_ID, MAIN_PORT, CO_CODE, VE_TARGET_NO, DOMESTIC_LISENCE_NO, DOMESTIC_LICENSE_COLOR,  
67 - FOREIGN_LICENSE, VE_REG_PLACE, VE_PROPERTY, VE_CONVEY_QUA, VE_CARD_NO, VE_OWNER_NAME,  
68 - VE_OWNER_NO, OWNER_INSIDE_ADDR, OWNER_INSIDE_TEL, VE_TYPE, BRAND, MODEL, EXHAUST_CAPACITY,  
69 - VE_FACTORY_DATE, VE_MOTOR_NO, VE_FRAME_NO, VE_TON, SELF_WT, ALLOW_TOW_TOTAL_WT, CONTAINER_INNER_LENGTH,  
70 - CONTAINER_INNER_WIDTH, CONTAINER_INNER_HEIGHT, OUTER_LENGTH, OUTER_WIDTH, OUTER_HEIGHT,  
71 - VE_BODY_COLOR, OIL_BOX_CAPCITY, ALLOW_VE_IE_PORT, APPR_NO, APPR_PERIOD, CURR_APPLY_BUSSINESS,  
72 - FRONT_45C_PIC, BACK_45C_PIC, OIL_BOX_PIC, VE_BOTTOM_PIC, MEMO, PROPOSER, PROPOSE_TIME,  
73 - VE_CLASS_FLAG, OPERATION_TYPE, TRAILER_LICENSE_NO, TRAILER_FRAME_NO, APPRO_NO_PIC,  
74 - VE_FRAME_NO_PIC, MOTOR_NO_PIC, FOREIGN_LICENSE_PIC, NATIONALITY, RETURNMESSAGE, CREATE_BY,  
75 - CREATE_DATE, UPDATE_BY, UPDATE_DATE 67 + ID, EPORT_ID, MAIN_PORT, CO_CODE, VE_TARGET_NO, DOMESTIC_LISENCE_NO, DOMESTIC_LICENSE_COLOR,
  68 + FOREIGN_LICENSE, VE_REG_PLACE, VE_PROPERTY, VE_CONVEY_QUA, VE_CARD_NO, VE_OWNER_NAME,
  69 + VE_OWNER_NO, OWNER_INSIDE_ADDR, OWNER_INSIDE_TEL, VE_TYPE, BRAND, MODEL, EXHAUST_CAPACITY,
  70 + VE_FACTORY_DATE, VE_MOTOR_NO, VE_FRAME_NO, VE_TON, SELF_WT, ALLOW_TOW_TOTAL_WT, CONTAINER_INNER_LENGTH,
  71 + CONTAINER_INNER_WIDTH, CONTAINER_INNER_HEIGHT, OUTER_LENGTH, OUTER_WIDTH, OUTER_HEIGHT,
  72 + VE_BODY_COLOR, OIL_BOX_CAPCITY, ALLOW_VE_IE_PORT, APPR_NO, APPR_PERIOD, CURR_APPLY_BUSSINESS,
  73 + FRONT_45C_PIC, BACK_45C_PIC, OIL_BOX_PIC, VE_BOTTOM_PIC, MEMO, PROPOSER, PROPOSE_TIME,
  74 + VE_CLASS_FLAG, OPERATION_TYPE, TRAILER_LICENSE_NO, TRAILER_FRAME_NO, APPRO_NO_PIC,
  75 + VE_FRAME_NO_PIC, MOTOR_NO_PIC, FOREIGN_LICENSE_PIC, NATIONALITY, RETURNMESSAGE, CREATE_BY,
  76 + CREATE_DATE, UPDATE_BY, UPDATE_DATE,VE_STATE
76 </sql> 77 </sql>
77 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> 78 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
78 - select 79 + select
79 <include refid="Base_Column_List" /> 80 <include refid="Base_Column_List" />
80 from land_road_ve_record 81 from land_road_ve_record
81 where ID = #{id,jdbcType=VARCHAR} 82 where ID = #{id,jdbcType=VARCHAR}
@@ -91,46 +92,46 @@ @@ -91,46 +92,46 @@
91 where ID = #{id,jdbcType=VARCHAR} 92 where ID = #{id,jdbcType=VARCHAR}
92 </delete> 93 </delete>
93 <insert id="insert" parameterType="com.sy.model.LandRoadVe"> 94 <insert id="insert" parameterType="com.sy.model.LandRoadVe">
94 - insert into land_road_ve_record (ID, EPORT_ID, MAIN_PORT,  
95 - CO_CODE, VE_TARGET_NO, DOMESTIC_LISENCE_NO,  
96 - DOMESTIC_LICENSE_COLOR, FOREIGN_LICENSE, VE_REG_PLACE,  
97 - VE_PROPERTY, VE_CONVEY_QUA, VE_CARD_NO,  
98 - VE_OWNER_NAME, VE_OWNER_NO, OWNER_INSIDE_ADDR,  
99 - OWNER_INSIDE_TEL, VE_TYPE, BRAND,  
100 - MODEL, EXHAUST_CAPACITY, VE_FACTORY_DATE,  
101 - VE_MOTOR_NO, VE_FRAME_NO, VE_TON,  
102 - SELF_WT, ALLOW_TOW_TOTAL_WT, CONTAINER_INNER_LENGTH,  
103 - CONTAINER_INNER_WIDTH, CONTAINER_INNER_HEIGHT,  
104 - OUTER_LENGTH, OUTER_WIDTH, OUTER_HEIGHT,  
105 - VE_BODY_COLOR, OIL_BOX_CAPCITY, ALLOW_VE_IE_PORT,  
106 - APPR_NO, APPR_PERIOD, CURR_APPLY_BUSSINESS,  
107 - FRONT_45C_PIC, BACK_45C_PIC, OIL_BOX_PIC,  
108 - VE_BOTTOM_PIC, MEMO, PROPOSER,  
109 - PROPOSE_TIME, VE_CLASS_FLAG, OPERATION_TYPE,  
110 - TRAILER_LICENSE_NO, TRAILER_FRAME_NO, APPRO_NO_PIC,  
111 - VE_FRAME_NO_PIC, MOTOR_NO_PIC, FOREIGN_LICENSE_PIC,  
112 - NATIONALITY, RETURNMESSAGE, CREATE_BY, 95 + insert into land_road_ve_record (ID, EPORT_ID, MAIN_PORT,
  96 + CO_CODE, VE_TARGET_NO, DOMESTIC_LISENCE_NO,
  97 + DOMESTIC_LICENSE_COLOR, FOREIGN_LICENSE, VE_REG_PLACE,
  98 + VE_PROPERTY, VE_CONVEY_QUA, VE_CARD_NO,
  99 + VE_OWNER_NAME, VE_OWNER_NO, OWNER_INSIDE_ADDR,
  100 + OWNER_INSIDE_TEL, VE_TYPE, BRAND,
  101 + MODEL, EXHAUST_CAPACITY, VE_FACTORY_DATE,
  102 + VE_MOTOR_NO, VE_FRAME_NO, VE_TON,
  103 + SELF_WT, ALLOW_TOW_TOTAL_WT, CONTAINER_INNER_LENGTH,
  104 + CONTAINER_INNER_WIDTH, CONTAINER_INNER_HEIGHT,
  105 + OUTER_LENGTH, OUTER_WIDTH, OUTER_HEIGHT,
  106 + VE_BODY_COLOR, OIL_BOX_CAPCITY, ALLOW_VE_IE_PORT,
  107 + APPR_NO, APPR_PERIOD, CURR_APPLY_BUSSINESS,
  108 + FRONT_45C_PIC, BACK_45C_PIC, OIL_BOX_PIC,
  109 + VE_BOTTOM_PIC, MEMO, PROPOSER,
  110 + PROPOSE_TIME, VE_CLASS_FLAG, OPERATION_TYPE,
  111 + TRAILER_LICENSE_NO, TRAILER_FRAME_NO, APPRO_NO_PIC,
  112 + VE_FRAME_NO_PIC, MOTOR_NO_PIC, FOREIGN_LICENSE_PIC,
  113 + NATIONALITY, RETURNMESSAGE, CREATE_BY,
113 CREATE_DATE, UPDATE_BY, UPDATE_DATE 114 CREATE_DATE, UPDATE_BY, UPDATE_DATE
114 ) 115 )
115 - values (#{id,jdbcType=VARCHAR}, #{eportId,jdbcType=VARCHAR}, #{mainPort,jdbcType=VARCHAR},  
116 - #{coCode,jdbcType=VARCHAR}, #{veTargetNo,jdbcType=VARCHAR}, #{domesticLisenceNo,jdbcType=VARCHAR},  
117 - #{domesticLicenseColor,jdbcType=VARCHAR}, #{foreignLicense,jdbcType=VARCHAR}, #{veRegPlace,jdbcType=VARCHAR},  
118 - #{veProperty,jdbcType=VARCHAR}, #{veConveyQua,jdbcType=VARCHAR}, #{veCardNo,jdbcType=VARCHAR},  
119 - #{veOwnerName,jdbcType=VARCHAR}, #{veOwnerNo,jdbcType=VARCHAR}, #{ownerInsideAddr,jdbcType=VARCHAR},  
120 - #{ownerInsideTel,jdbcType=VARCHAR}, #{veType,jdbcType=VARCHAR}, #{brand,jdbcType=VARCHAR},  
121 - #{model,jdbcType=VARCHAR}, #{exhaustCapacity,jdbcType=VARCHAR}, #{veFactoryDate,jdbcType=DATE},  
122 - #{veMotorNo,jdbcType=VARCHAR}, #{veFrameNo,jdbcType=VARCHAR}, #{veTon,jdbcType=VARCHAR},  
123 - #{selfWt,jdbcType=VARCHAR}, #{allowTowTotalWt,jdbcType=VARCHAR}, #{containerInnerLength,jdbcType=VARCHAR},  
124 - #{containerInnerWidth,jdbcType=VARCHAR}, #{containerInnerHeight,jdbcType=VARCHAR},  
125 - #{outerLength,jdbcType=VARCHAR}, #{outerWidth,jdbcType=VARCHAR}, #{outerHeight,jdbcType=VARCHAR},  
126 - #{veBodyColor,jdbcType=VARCHAR}, #{oilBoxCapcity,jdbcType=VARCHAR}, #{allowVeIePort,jdbcType=VARCHAR},  
127 - #{apprNo,jdbcType=VARCHAR}, #{apprPeriod,jdbcType=DATE}, #{currApplyBussiness,jdbcType=VARCHAR},  
128 - #{front45cPic,jdbcType=VARCHAR}, #{back45cPic,jdbcType=VARCHAR}, #{oilBoxPic,jdbcType=VARCHAR},  
129 - #{veBottomPic,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{proposer,jdbcType=VARCHAR},  
130 - #{proposeTime,jdbcType=TIMESTAMP}, #{veClassFlag,jdbcType=VARCHAR}, #{operationType,jdbcType=VARCHAR},  
131 - #{trailerLicenseNo,jdbcType=VARCHAR}, #{trailerFrameNo,jdbcType=VARCHAR}, #{approNoPic,jdbcType=VARCHAR},  
132 - #{veFrameNoPic,jdbcType=VARCHAR}, #{motorNoPic,jdbcType=VARCHAR}, #{foreignLicensePic,jdbcType=VARCHAR},  
133 - #{nationality,jdbcType=VARCHAR}, #{returnmessage,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, 116 + values (#{id,jdbcType=VARCHAR}, #{eportId,jdbcType=VARCHAR}, #{mainPort,jdbcType=VARCHAR},
  117 + #{coCode,jdbcType=VARCHAR}, #{veTargetNo,jdbcType=VARCHAR}, #{domesticLisenceNo,jdbcType=VARCHAR},
  118 + #{domesticLicenseColor,jdbcType=VARCHAR}, #{foreignLicense,jdbcType=VARCHAR}, #{veRegPlace,jdbcType=VARCHAR},
  119 + #{veProperty,jdbcType=VARCHAR}, #{veConveyQua,jdbcType=VARCHAR}, #{veCardNo,jdbcType=VARCHAR},
  120 + #{veOwnerName,jdbcType=VARCHAR}, #{veOwnerNo,jdbcType=VARCHAR}, #{ownerInsideAddr,jdbcType=VARCHAR},
  121 + #{ownerInsideTel,jdbcType=VARCHAR}, #{veType,jdbcType=VARCHAR}, #{brand,jdbcType=VARCHAR},
  122 + #{model,jdbcType=VARCHAR}, #{exhaustCapacity,jdbcType=VARCHAR}, #{veFactoryDate,jdbcType=DATE},
  123 + #{veMotorNo,jdbcType=VARCHAR}, #{veFrameNo,jdbcType=VARCHAR}, #{veTon,jdbcType=VARCHAR},
  124 + #{selfWt,jdbcType=VARCHAR}, #{allowTowTotalWt,jdbcType=VARCHAR}, #{containerInnerLength,jdbcType=VARCHAR},
  125 + #{containerInnerWidth,jdbcType=VARCHAR}, #{containerInnerHeight,jdbcType=VARCHAR},
  126 + #{outerLength,jdbcType=VARCHAR}, #{outerWidth,jdbcType=VARCHAR}, #{outerHeight,jdbcType=VARCHAR},
  127 + #{veBodyColor,jdbcType=VARCHAR}, #{oilBoxCapcity,jdbcType=VARCHAR}, #{allowVeIePort,jdbcType=VARCHAR},
  128 + #{apprNo,jdbcType=VARCHAR}, #{apprPeriod,jdbcType=DATE}, #{currApplyBussiness,jdbcType=VARCHAR},
  129 + #{front45cPic,jdbcType=VARCHAR}, #{back45cPic,jdbcType=VARCHAR}, #{oilBoxPic,jdbcType=VARCHAR},
  130 + #{veBottomPic,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{proposer,jdbcType=VARCHAR},
  131 + #{proposeTime,jdbcType=TIMESTAMP}, #{veClassFlag,jdbcType=VARCHAR}, #{operationType,jdbcType=VARCHAR},
  132 + #{trailerLicenseNo,jdbcType=VARCHAR}, #{trailerFrameNo,jdbcType=VARCHAR}, #{approNoPic,jdbcType=VARCHAR},
  133 + #{veFrameNoPic,jdbcType=VARCHAR}, #{motorNoPic,jdbcType=VARCHAR}, #{foreignLicensePic,jdbcType=VARCHAR},
  134 + #{nationality,jdbcType=VARCHAR}, #{returnmessage,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
134 #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateDate,jdbcType=TIMESTAMP} 135 #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateDate,jdbcType=TIMESTAMP}
135 ) 136 )
136 </insert> 137 </insert>
@@ -737,4 +738,4 @@ @@ -737,4 +738,4 @@
737 UPDATE_DATE = #{updateDate,jdbcType=TIMESTAMP} 738 UPDATE_DATE = #{updateDate,jdbcType=TIMESTAMP}
738 where ID = #{id,jdbcType=VARCHAR} 739 where ID = #{id,jdbcType=VARCHAR}
739 </update> 740 </update>
740 -</mapper>  
  741 +</mapper>