添加 远程调用 预配添加接口

@@ -499,7 +499,6 @@
 			<artifactId>axis</artifactId>
 			<artifactId>axis</artifactId>
 			<version>1.4</version>
 			<version>1.4</version>
 		</dependency>
 		</dependency>
-
 	</dependencies>
 	</dependencies>
 
 
 	<!-- 配置文件 -->
 	<!-- 配置文件 -->

@@ -1253,12 +1253,26 @@ public class ManifestController extends BasicController {
 	 * @param manifest
 	 * @param manifest
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequestMapping(value = "/savesendMainfest", method = { RequestMethod.POST })
+	@RequestMapping(value = "/savesenManifest", method = { RequestMethod.POST })
 	@ResponseBody
 	@ResponseBody
-	public ResponseModel savesendMainfest(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) {
+	public ResponseModel savesenManifest(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) {
 
 
 		ResponseModel model = new ResponseModel();
 		ResponseModel model = new ResponseModel();
-		if ("dcdf38d9a5d6411985e49155481882f5".equals(manifest.getPassword())){
+		if ("dcdf38d9a5d6411985e49155481882f5".equals(manifest.getDe_size())){
+
+			if(manifest.getWaybillnomaster().contains("-")){
+
+			}else {
+				StringBuilder stringBuilder = new StringBuilder(manifest.getWaybillnomaster());
+
+				StringBuilder waybill = stringBuilder.insert(3, "-");
+
+				manifest.setWaybillnomaster(waybill.toString());
+
+			}
+
+			manifest.setDe_size("");
+
 			String flightno = manifest.getFlightno();
 			String flightno = manifest.getFlightno();
 			String carrier = "";
 			String carrier = "";
 			if (StringUtils.isNotBlank(flightno) && flightno.length() > 2) {
 			if (StringUtils.isNotBlank(flightno) && flightno.length() > 2) {
@@ -1270,12 +1284,13 @@ public class ManifestController extends BasicController {
 
 
 
 
 			try {
 			try {
-				manifest.setUSER_ID(Tools.getUserId());
-				if (manifestService.isExistsByWaybill(manifest)) {
+//				manifest.setUSER_ID(Tools.getUserId());
+				ManifestEntity wbm = manifestService.findWbm(manifest.getWaybillnomaster());
+				if (wbm != null) {
 					model.setStatus(201);
 					model.setStatus(201);
 					model.setMsg("该订单号已存在！");
 					model.setMsg("该订单号已存在！");
 				} else {
 				} else {
-					WaybillReceiptType type = WaybillReceiptType.APPLY;
+					WaybillReceiptType type = WaybillReceiptType.TEMP_SAVE;
 
 
 					String stowagedate = request.getParameter("stowagedate");
 					String stowagedate = request.getParameter("stowagedate");
 					manifest.setStowagedate(ManifestEntity.getStowagedate(stowagedate));
 					manifest.setStowagedate(ManifestEntity.getStowagedate(stowagedate));
@@ -1286,11 +1301,6 @@ public class ManifestController extends BasicController {
 					manifest.setSave_time(System.currentTimeMillis());
 					manifest.setSave_time(System.currentTimeMillis());
 
 
 					manifestService.save(manifest);
 					manifestService.save(manifest);
-					receiptService.saveFromManifest(manifest, type);
-
-					manifest.setAgentcompany(getAgent().getNameCn());
-					manifest.setAgentman(getAgent().getThreeCode());
-					manifest.setAgentcompanycode(getAgent().getThreeCode());
 
 
 					model.setData(manifest);
 					model.setData(manifest);
 					model.setStatus(200);
 					model.setStatus(200);

@@ -289,16 +289,16 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 	private Long save_time;
 	private Long save_time;
 	private Long USER_ID; // 报文所属的用户id
 	private Long USER_ID; // 报文所属的用户id
 
 
-	// 验证密码  调用使用
-	private String password;
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
+//	// 验证密码  调用使用
+//	private String password;
+//
+//	public String getPassword() {
+//		return password;
+//	}
+//
+//	public void setPassword(String password) {
+//		this.password = password;
+//	}
 
 
 	public String getUnlodingcode() {
 	public String getUnlodingcode() {
 		return StringUtils.isBlank(unlodingcode) ? getDestinationstation() : unlodingcode;
 		return StringUtils.isBlank(unlodingcode) ? getDestinationstation() : unlodingcode;

@@ -29,7 +29,7 @@ public class MyShiroController implements Filter {
 	}
 	}
 
 
 	private String publicAction[] = { "/login", "/doLogin", "/manifest/app/send",
 	private String publicAction[] = { "/login", "/doLogin", "/manifest/app/send",
-			"/receipt/a0608c4054662dd902e1314f7e450e3eaa81c114" };
+			"/receipt/a0608c4054662dd902e1314f7e450e3eaa81c114", "/manifest/savesenManifest" };
 	private String crossDomain[] = { "/cross/", "tracking/detail" };
 	private String crossDomain[] = { "/cross/", "tracking/detail" };
 
 
 	// manifest/cross/grid.json
 	// manifest/cross/grid.json