|
|
@@ -312,12 +312,12 @@ public class XiangXServiceImpl implements XiangXService {
|
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
|
List<String> list = baseDao.callProcedureWithOut("SP_FINISHPO", new Object[]{poId}, new Integer[]{1}, new Integer[]{2,3,4,5});
|
|
|
if (list!=null && list.size()>0){
|
|
|
- if (list.get(0)!=null){
|
|
|
+ if (list.get(0)==null){
|
|
|
if(list.get(2)!=null && Integer.parseInt(list.get(2))>0){
|
|
|
baseDao.updateByCondition("CUSTOMTABLE","ct_confirmstatus='已确认'","ct_id="+poId);
|
|
|
try {
|
|
|
Map<String, Object> resMap = erpService.auditafter_post_xx(Integer.parseInt(list.get(2)), master);
|
|
|
- if("true".equals(resMap.get("success"))){
|
|
|
+ if(resMap.get("success")!=null&&Boolean.parseBoolean((resMap.get("success")).toString())){
|
|
|
map.put("success", true);
|
|
|
map.put("error", "报关成功");
|
|
|
return map;
|
|
|
@@ -329,15 +329,18 @@ public class XiangXServiceImpl implements XiangXService {
|
|
|
} catch (Exception e){
|
|
|
map.put("success", false);
|
|
|
map.put("error", "报关失败:"+e.getMessage());
|
|
|
+ return map;
|
|
|
}
|
|
|
}
|
|
|
}else {
|
|
|
map.put("success", false);
|
|
|
map.put("error", "报关失败:"+list.get(0));
|
|
|
+ return map;
|
|
|
}
|
|
|
}else {
|
|
|
map.put("success", false);
|
|
|
map.put("error", "报关失败");
|
|
|
+ return map;
|
|
|
}
|
|
|
map.put("success", true);
|
|
|
map.put("error", "报关成功");
|