正在显示
3 个修改的文件
包含
30 行增加
和
8 行删除
@@ -49,7 +49,10 @@ public class TALLYSECONDARY extends WlptBaseModel { | @@ -49,7 +49,10 @@ public class TALLYSECONDARY extends WlptBaseModel { | ||
49 | 49 | ||
50 | private String receiptinformation; | 50 | private String receiptinformation; |
51 | 51 | ||
52 | + private TALLYMASTER master; | ||
53 | + | ||
52 | private CustomReception customReceptionT; | 54 | private CustomReception customReceptionT; |
55 | + | ||
53 | public String getAutoid() { | 56 | public String getAutoid() { |
54 | return autoid; | 57 | return autoid; |
55 | } | 58 | } |
@@ -211,12 +214,19 @@ public class TALLYSECONDARY extends WlptBaseModel { | @@ -211,12 +214,19 @@ public class TALLYSECONDARY extends WlptBaseModel { | ||
211 | this.waybillnosecondary = customReception.getWayBillSecond().split("_")[1]; | 214 | this.waybillnosecondary = customReception.getWayBillSecond().split("_")[1]; |
212 | this.status = AWBTools.transCusRspCode(customReception.getResponseCode()); | 215 | this.status = AWBTools.transCusRspCode(customReception.getResponseCode()); |
213 | this.receiptinformation = customReception.getResponseText(); | 216 | this.receiptinformation = customReception.getResponseText(); |
217 | + this.master = new TALLYMASTER(customReception); | ||
214 | } | 218 | } |
215 | 219 | ||
216 | @Override | 220 | @Override |
217 | public int secondAnalysisReception() { | 221 | public int secondAnalysisReception() { |
218 | 222 | ||
219 | //todo:这里要根据回执的航班信息取到主单的autoid,设置到分单中。做到精确解析 | 223 | //todo:这里要根据回执的航班信息取到主单的autoid,设置到分单中。做到精确解析 |
224 | + List<TALLYMASTER> masterlist = tallymasterMapper.selectAutoIdByAwb(this.master); | ||
225 | + if(!masterlist.isEmpty()){ | ||
226 | + TALLYMASTER masterResult = masterlist.get(0); | ||
227 | + this.tallymasterid = masterResult.getAutoid(); | ||
228 | + | ||
229 | + } | ||
220 | //更新分单回执 | 230 | //更新分单回执 |
221 | int i = tallysecondaryMapper.updateRECEIPTION(this); | 231 | int i = tallysecondaryMapper.updateRECEIPTION(this); |
222 | //获取分单autoid | 232 | //获取分单autoid |
@@ -258,13 +258,18 @@ | @@ -258,13 +258,18 @@ | ||
258 | </update> | 258 | </update> |
259 | 259 | ||
260 | <select id="selectAutoIdByAwb" parameterType="com.tianbo.analysis.model.TALLYMASTER" resultType="com.tianbo.analysis.model.TALLYMASTER"> | 260 | <select id="selectAutoIdByAwb" parameterType="com.tianbo.analysis.model.TALLYMASTER" resultType="com.tianbo.analysis.model.TALLYMASTER"> |
261 | - SELECT AUTOID | ||
262 | - FROM TALLYMASTER | 261 | + SELECT |
262 | + AUTOID | ||
263 | + FROM | ||
264 | + TALLYMASTER | ||
263 | WHERE | 265 | WHERE |
264 | WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} | 266 | WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} |
265 | - AND FLIGHTNO = #{flightno, jdbcType=VARCHAR} | ||
266 | - AND trunc(FLIGHTDATE) = #{flightdate, jdbcType=DATE} | ||
267 | - AND TALLTYPE = #{talltype,jdbcType=VARCHAR } | 267 | + AND |
268 | + FLIGHTNO = #{flightno, jdbcType=VARCHAR} | ||
269 | + AND | ||
270 | + trunc(FLIGHTDATE) = #{flightdate, jdbcType=DATE} | ||
271 | + AND | ||
272 | + TALLTYPE = #{talltype,jdbcType=VARCHAR } | ||
268 | </select> | 273 | </select> |
269 | 274 | ||
270 | </mapper> | 275 | </mapper> |
@@ -166,13 +166,20 @@ | @@ -166,13 +166,20 @@ | ||
166 | STATUS = #{status,jdbcType=VARCHAR} | 166 | STATUS = #{status,jdbcType=VARCHAR} |
167 | WHERE WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} | 167 | WHERE WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} |
168 | AND WAYBILLNOSECONDARY = #{waybillnosecondary,jdbcType=VARCHAR} | 168 | AND WAYBILLNOSECONDARY = #{waybillnosecondary,jdbcType=VARCHAR} |
169 | + AND TALLYMASTERID = #{tallymasterid,jdbcType=VARCHAR } | ||
169 | </update> | 170 | </update> |
170 | 171 | ||
171 | <select id="selectAutoIdByawbAawbH" parameterType="com.tianbo.analysis.model.TALLYSECONDARY" resultType="com.tianbo.analysis.model.TALLYSECONDARY"> | 172 | <select id="selectAutoIdByawbAawbH" parameterType="com.tianbo.analysis.model.TALLYSECONDARY" resultType="com.tianbo.analysis.model.TALLYSECONDARY"> |
172 | - SELECT AUTOID | ||
173 | - FROM TALLYSECONDARY | 173 | + SELECT |
174 | + AUTOID | ||
175 | + FROM | ||
176 | + TALLYSECONDARY | ||
174 | WHERE | 177 | WHERE |
175 | - WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} AND WAYBILLNOSECONDARY = #{waybillnosecondary,jdbcType=VARCHAR} | 178 | + WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} |
179 | + AND | ||
180 | + WAYBILLNOSECONDARY = #{waybillnosecondary,jdbcType=VARCHAR} | ||
181 | + AND | ||
182 | + TALLYMASTERID = #{tallymasterid,jdbcType=VARCHAR } | ||
176 | </select> | 183 | </select> |
177 | 184 | ||
178 | </mapper> | 185 | </mapper> |
-
请 注册 或 登录 后发表评论