代理人 所有

@@ -35,10 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import tools.DBConnection;
 import tools.NumKit;
@@ -770,11 +767,11 @@ public class ManifestController extends BasicController {
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value = "/sub/grid.json")
+	@RequestMapping(value = "/sub/grid.json", method = {RequestMethod.POST})
 	@ResponseBody
-	public DataGrid<PreparesecondaryEntity> gridSub(Long mawbId, HttpServletRequest request) {
+	public DataGrid<PreparesecondaryEntity> gridSub(@RequestParam(value = "mawbId") String mawbId, HttpServletRequest request) {
 		DataGrid<PreparesecondaryEntity> dg = new DataGrid<>();
-		dg.setRows(preparesecondaryServer.findByMawbId(mawbId));
+		dg.setRows(preparesecondaryServer.findAwb(mawbId));
 		return dg;
 	}
 
@@ -1256,7 +1253,7 @@ public class ManifestController extends BasicController {
 	 * @param manifest
 	 * @return
 	 */
-	@RequestMapping(value = "/f5f5669bbdecefd3dacfaba194647c35", method = { RequestMethod.POST })
+	@RequestMapping(value = "/f5f5669bbdecefd3dacfaba194647c35", method = { RequestMethod.POST})
 	@ResponseBody
 	public ResponseModel savesenManifest(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) {
 
@@ -1411,7 +1408,8 @@ public class ManifestController extends BasicController {
 							manifest.setResponse_code(String.valueOf(type.getValue()));
 							manifest.setResponse_text(type.getName());
 							manifest.setSave_time(System.currentTimeMillis());
-
+							manifest.setSh_name(manifest.getSh_company());
+							manifest.setCo_name(manifest.getCo_company());
 							manifest.setDe_trstation("");
 							manifest.setDe_packing("");
 							manifest.setDe_remarks("");
@@ -1423,11 +1421,13 @@ public class ManifestController extends BasicController {
 							return model;
 						}
 					}else {
-						PreparesecondaryEntity pe = new PreparesecondaryEntity();
 
+						PreparesecondaryEntity pe = new PreparesecondaryEntity();
 						// 查看主单号
 						if (manifest.getWaybillnomaster().contains("-")) {
 
+							pe.setWaybillnomaster(manifest.getWaybillnomaster());
+
 						} else {
 							StringBuilder stringBuilder = new StringBuilder(manifest.getWaybillnomaster());
 
@@ -1460,6 +1460,7 @@ public class ManifestController extends BasicController {
 						pe.setCustomscode(manifest.getCustomscode());
 						pe.setProductname(manifest.getProductname());
 						pe.setCo_company(manifest.getCo_company());
+						pe.setCo_name(manifest.getCo_company());
 						pe.setCo_address(manifest.getCo_address());
 						pe.setShpcusid(manifest.getShpcusid());
 
@@ -1470,6 +1471,7 @@ public class ManifestController extends BasicController {
 						}
 						pe.setCo_country(manifest.getCo_country());
 						pe.setSh_company(manifest.getSh_company());
+						pe.setSh_name(manifest.getSh_company());
 						pe.setSh_address(manifest.getSh_address());
 						pe.setCnecusid(manifest.getCnecusid());
 						pe.setSh_country(manifest.getSh_country());
@@ -1483,7 +1485,7 @@ public class ManifestController extends BasicController {
 						pe.setSh_city(manifest.getSh_city());
 						pe.setUSER_ID(manifest.getUSER_ID());
 						pe.setReach_station(manifest.getReach_station());
-
+						pe.setSave_time(System.currentTimeMillis());
 						int i = preparesecondaryServer.findAwbAwbH(pe.getWaybillnomaster(), pe.getWaybillnosecondary());
 
 						if (i > 0){
@@ -1493,10 +1495,12 @@ public class ManifestController extends BasicController {
 							return model;
 
 						}else {
-							preparesecondaryServer.save(pe);
-							model.setData(manifest);
+
+							PreparesecondaryEntity save = preparesecondaryServer.save(pe);
+							model.setData(save);
 							model.setStatus(200);
 							model.setMsg(HttpJsonMsg.SUCCESS);
+							return model;
 						}
 					}
 
@@ -1510,6 +1514,7 @@ public class ManifestController extends BasicController {
 			model.setStatus(500);
 			model.setMsg(HttpJsonMsg.ERROR);
 			logger.error("系统异常 >>", e);
+			return model;
 		}
 		return model;
 	}