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

@@ -1272,11 +1272,9 @@ public class ManifestController extends BasicController {
 						|| StringUtils.isBlank(manifest.getTotalweight()) || StringUtils.isBlank(manifest.getPaymode())
 						|| StringUtils.isBlank(manifest.getCustomsstatus()) || StringUtils.isBlank(manifest.getCustomscode())
 						|| StringUtils.isBlank(manifest.getProductname()) || StringUtils.isBlank(manifest.getCo_company())
-						|| StringUtils.isBlank(manifest.getCo_address()) || StringUtils.isBlank(manifest.getShpcusid())
-						|| StringUtils.isBlank(manifest.getCo_country()) || StringUtils.isBlank(manifest.getSh_company())
-						|| StringUtils.isBlank(manifest.getSh_address()) || StringUtils.isBlank(manifest.getCnecusid())
-						|| StringUtils.isBlank(manifest.getSh_country()) || StringUtils.isBlank(manifest.getSh_city())
-						|| StringUtils.isBlank(manifest.getReach_station()) || manifest.getUSER_ID() == null){
+						|| StringUtils.isBlank(manifest.getCo_address()) || StringUtils.isBlank(manifest.getCo_country())
+						|| StringUtils.isBlank(manifest.getSh_company()) || StringUtils.isBlank(manifest.getReach_station())
+						|| manifest.getUSER_ID() == null || StringUtils.isBlank(manifest.getCo_telephone())){
 
 					model.setStatus(203);
 					model.setMsg("缺少参数");
@@ -1319,6 +1317,7 @@ public class ManifestController extends BasicController {
 						if (wbm != null) {
 							model.setStatus(201);
 							model.setMsg("主单号已存在！");
+							return model;
 						} else {
 							// 货主信息
 							if(StringUtils.isBlank(de_trstation) && StringUtils.isBlank(de_packing) && StringUtils.isBlank(de_remarks)){
@@ -1421,6 +1420,7 @@ public class ManifestController extends BasicController {
 							model.setData(manifest);
 							model.setStatus(200);
 							model.setMsg(HttpJsonMsg.SUCCESS);
+							return model;
 						}
 					}else {
 						PreparesecondaryEntity pe = new PreparesecondaryEntity();
@@ -1490,6 +1490,7 @@ public class ManifestController extends BasicController {
 
 							model.setData(204);
 							model.setMsg("分单号存在");
+							return model;
 
 						}else {
 							preparesecondaryServer.save(pe);
@@ -1503,6 +1504,7 @@ public class ManifestController extends BasicController {
 			}else{
 				model.setStatus(202);
 				model.setMsg("验证码错误");
+				return model;
 			}
 		} catch (Exception e) {
 			model.setStatus(500);