正在显示
1 个修改的文件
包含
31 行增加
和
9 行删除
@@ -216,15 +216,37 @@ public class CustomXmlHandleThread implements Runnable{ | @@ -216,15 +216,37 @@ public class CustomXmlHandleThread implements Runnable{ | ||
216 | 216 | ||
217 | switch (msgType){ | 217 | switch (msgType){ |
218 | case "MT9999": | 218 | case "MT9999": |
219 | - ORIGINMANIFESTMASTER originmanifestmaster = new ORIGINMANIFESTMASTER(customReception); | ||
220 | - PREPAREMASTER preparemaster= new PREPAREMASTER(customReception); | ||
221 | - ARRIVEDMASTER arrivedmaster9999 = new ARRIVEDMASTER(customReception); | ||
222 | - if(originmanifestmaster.masterAnalysisReception()>0){ | ||
223 | - i=1; | ||
224 | - }else if(preparemaster.masterAnalysisReception()>0){ | ||
225 | - i=1; | ||
226 | - }else { | ||
227 | - i=arrivedmaster9999.masterAnalysisReception(); | 219 | + if (customReception.getWayBillSecond()!=null && customReception.getWayBillSecond().contains(secondSplit)){ |
220 | + PREPARESECONDARY preparesecondary = new PREPARESECONDARY(customReception); | ||
221 | + int pre_i = preparesecondary.secondAnalysisReception(); | ||
222 | + | ||
223 | + if (pre_i>0){ | ||
224 | + i=1; | ||
225 | + }else { | ||
226 | + ARRIVEDSECONDARY arrivedsecondary = new ARRIVEDSECONDARY(customReception); | ||
227 | + int arr_i=arrivedsecondary.secondAnalysisReception(); | ||
228 | + | ||
229 | + if (arr_i>0){ | ||
230 | + i= 1; | ||
231 | + }else { | ||
232 | + Originmanifestsecondary originmanifestsecondary = new Originmanifestsecondary(customReception); | ||
233 | + int org_i=originmanifestsecondary.secondAnalysisReception(); | ||
234 | + if (org_i>0){ | ||
235 | + i=1; | ||
236 | + } | ||
237 | + } | ||
238 | + } | ||
239 | + }else{ | ||
240 | + ORIGINMANIFESTMASTER originmanifestmaster = new ORIGINMANIFESTMASTER(customReception); | ||
241 | + PREPAREMASTER preparemaster= new PREPAREMASTER(customReception); | ||
242 | + ARRIVEDMASTER arrivedmaster9999 = new ARRIVEDMASTER(customReception); | ||
243 | + if(originmanifestmaster.masterAnalysisReception()>0){ | ||
244 | + i=1; | ||
245 | + }else if(preparemaster.masterAnalysisReception()>0){ | ||
246 | + i=1; | ||
247 | + }else { | ||
248 | + i=arrivedmaster9999.masterAnalysisReception(); | ||
249 | + } | ||
228 | } | 250 | } |
229 | break; | 251 | break; |
230 | case "MT3201": | 252 | case "MT3201": |
-
请 注册 或 登录 后发表评论