朱兆平 / agent · 提交

转到一个项目

作者 shenhailong
提交 c50372390cf2685fe31d6475092e7f4438163512 1 个父辈 062deee0

远程预配添加接口 修改 收发货人为非必填项

内嵌 并排对比
正在显示 2 个修改的文件 包含 7 行增加 和 5 行删除
@@ -1272,11 +1272,9 @@ public class ManifestController extends BasicController { @@ -1272,11 +1272,9 @@ public class ManifestController extends BasicController {
1272 || StringUtils.isBlank(manifest.getTotalweight()) || StringUtils.isBlank(manifest.getPaymode()) 1272 || StringUtils.isBlank(manifest.getTotalweight()) || StringUtils.isBlank(manifest.getPaymode())
1273 || StringUtils.isBlank(manifest.getCustomsstatus()) || StringUtils.isBlank(manifest.getCustomscode()) 1273 || StringUtils.isBlank(manifest.getCustomsstatus()) || StringUtils.isBlank(manifest.getCustomscode())
1274 || StringUtils.isBlank(manifest.getProductname()) || StringUtils.isBlank(manifest.getCo_company()) 1274 || StringUtils.isBlank(manifest.getProductname()) || StringUtils.isBlank(manifest.getCo_company())
1275 - || StringUtils.isBlank(manifest.getCo_address()) || StringUtils.isBlank(manifest.getShpcusid())  
1276 - || StringUtils.isBlank(manifest.getCo_country()) || StringUtils.isBlank(manifest.getSh_company())  
1277 - || StringUtils.isBlank(manifest.getSh_address()) || StringUtils.isBlank(manifest.getCnecusid())  
1278 - || StringUtils.isBlank(manifest.getSh_country()) || StringUtils.isBlank(manifest.getSh_city())  
1279 - || StringUtils.isBlank(manifest.getReach_station()) || manifest.getUSER_ID() == null){ 1275 + || StringUtils.isBlank(manifest.getCo_address()) || StringUtils.isBlank(manifest.getCo_country())
  1276 + || StringUtils.isBlank(manifest.getSh_company()) || StringUtils.isBlank(manifest.getReach_station())
  1277 + || manifest.getUSER_ID() == null || StringUtils.isBlank(manifest.getCo_telephone())){
1280 1278
1281 model.setStatus(203); 1279 model.setStatus(203);
1282 model.setMsg("缺少参数"); 1280 model.setMsg("缺少参数");
@@ -1319,6 +1317,7 @@ public class ManifestController extends BasicController { @@ -1319,6 +1317,7 @@ public class ManifestController extends BasicController {
1319 if (wbm != null) { 1317 if (wbm != null) {
1320 model.setStatus(201); 1318 model.setStatus(201);
1321 model.setMsg("主单号已存在！"); 1319 model.setMsg("主单号已存在！");
  1320 + return model;
1322 } else { 1321 } else {
1323 // 货主信息 1322 // 货主信息
1324 if(StringUtils.isBlank(de_trstation) && StringUtils.isBlank(de_packing) && StringUtils.isBlank(de_remarks)){ 1323 if(StringUtils.isBlank(de_trstation) && StringUtils.isBlank(de_packing) && StringUtils.isBlank(de_remarks)){
@@ -1421,6 +1420,7 @@ public class ManifestController extends BasicController { @@ -1421,6 +1420,7 @@ public class ManifestController extends BasicController {
1421 model.setData(manifest); 1420 model.setData(manifest);
1422 model.setStatus(200); 1421 model.setStatus(200);
1423 model.setMsg(HttpJsonMsg.SUCCESS); 1422 model.setMsg(HttpJsonMsg.SUCCESS);
  1423 + return model;
1424 } 1424 }
1425 }else { 1425 }else {
1426 PreparesecondaryEntity pe = new PreparesecondaryEntity(); 1426 PreparesecondaryEntity pe = new PreparesecondaryEntity();
@@ -1490,6 +1490,7 @@ public class ManifestController extends BasicController { @@ -1490,6 +1490,7 @@ public class ManifestController extends BasicController {
1490 1490
1491 model.setData(204); 1491 model.setData(204);
1492 model.setMsg("分单号存在"); 1492 model.setMsg("分单号存在");
  1493 + return model;
1493 1494
1494 }else { 1495 }else {
1495 preparesecondaryServer.save(pe); 1496 preparesecondaryServer.save(pe);
@@ -1503,6 +1504,7 @@ public class ManifestController extends BasicController { @@ -1503,6 +1504,7 @@ public class ManifestController extends BasicController {
1503 }else{ 1504 }else{
1504 model.setStatus(202); 1505 model.setStatus(202);
1505 model.setMsg("验证码错误"); 1506 model.setMsg("验证码错误");
  1507 + return model;
1506 } 1508 }
1507 } catch (Exception e) { 1509 } catch (Exception e) {
1508 model.setStatus(500); 1510 model.setStatus(500);