代理人 所有

@@ -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;
 	}

@@ -20,6 +20,9 @@ JpaSpecificationExecutor<PreparesecondaryEntity>{
 	@Query(value = "SELECT * FROM PREPARESECONDARY WHERE PREPAREMASTERID = ?1 ORDER BY ID DESC", nativeQuery = true)
 	List<PreparesecondaryEntity> findByMawbId(Long id);
 
+	@Query(value = "SELECT * FROM PREPARESECONDARY WHERE WAYBILLNOMASTER = ?1 ORDER BY ID DESC", nativeQuery = true)
+	List<PreparesecondaryEntity> findAwb(String awb);
+
 	@Query(value = "SELECT * FROM PREPARESECONDARY WHERE WAYBILLNOSECONDARY = ?1", nativeQuery = true)
 	List<PreparesecondaryEntity> findByMawbNo(String mawbNo);
 	

@@ -6,6 +6,9 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.agent.entity.agent.ManifestEntity;
+import com.agent.repository.agent.ManifestRepository;
+import org.hibernate.Transaction;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,9 +25,13 @@ public class PreparesecondaryService extends BasicService<PreparesecondaryEntity
 	@Resource
 	private WaybillReceiptService receiptService;
 
+	@Resource
+	private ManifestRepository manifestRepository;
+
 	@Transactional
 	public PreparesecondaryEntity save(PreparesecondaryEntity manifest) {
-		manifest.setSave_time(System.currentTimeMillis());
+		ManifestEntity wbm = manifestRepository.findWbm(manifest.getWaybillnomaster());
+		manifest.setPreparemasterid(wbm.getId());
 		return preparesecondaryRepository.save(manifest);
 	}
 
@@ -45,6 +52,20 @@ public class PreparesecondaryService extends BasicService<PreparesecondaryEntity
 		
 		return list;
 	}
+	public List<PreparesecondaryEntity> findAwb(String id) {
+		List<PreparesecondaryEntity> list =  preparesecondaryRepository.findAwb(id);
+		if(list!=null) {
+			for (int i = 0; i < list.size(); i++) {
+				PreparesecondaryEntity bean = list.get(i);
+				WaybillReceiptEntity re = receiptService.findSub(bean.getWaybillnomaster(), bean.getWaybillnosecondary());
+				bean.setResponse_code(re!=null?re.getResponse_code():"");
+				bean.setResponse_text(re!=null?re.getResponse_text():"");
+			}
+		}
+
+		return list;
+	}
+
 
 	public PreparesecondaryEntity findOne(Long mawbId) {
 		return preparesecondaryRepository.findOne(mawbId);

@@ -13,7 +13,7 @@
 # 69
 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 #jdbc.url=jdbc:oracle:thin:@10.50.3.69:1521:CGODB
-jdbc.url=jdbc:oracle:thin:@218.28.199.134:8004:CGODB
+jdbc.url=jdbc:oracle:thin:@192.168.1.253:1522:ORCLL
 jdbc.username=CGOASM
 jdbc.password=vmvnv1v2
 

 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:oxm="http://www.springframework.org/schema/oxm"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:oxm="http://www.springframework.org/schema/oxm"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
     http://www.springframework.org/schema/beans/spring-beans.xsd
     http://www.springframework.org/schema/oxm
     http://www.springframework.org/schema/oxm/spring-oxm.xsd">
 
-	<bean id="marshaller" class="org.springframework.oxm.xstream.XStreamMarshaller">
-	
+    <bean id="marshaller" class="org.springframework.oxm.xstream.XStreamMarshaller">
+
     </bean>
-    
+
 </beans>
\ No newline at end of file

@@ -340,7 +340,7 @@
 						</tr>
 						<tr>
 							<td class="kv-label" colspan="6">
-								<select id="co_cusid" required>
+								<select id="co_cusid">
 									<c:if test="${not empty manifest.shpcusid}">
 										<c:set var="tempShpType" value='${fn:split(manifest.shpcusid,"+")[0]}' />
 										<option value="${tempShpType}">${tempShpType}</option>
@@ -351,7 +351,7 @@
 									</c:if>
 								</select> 
 								<span style="color: black; font-size: 16px;">+</span> 
-								<input id="shpcusid"  type="text" maxlength="100" required
+								<input id="shpcusid"  type="text" maxlength="100"
 									<c:if test="${not empty manifest.shpcusid}">
 										<c:set var="tempShpValue" value='${fn:split(manifest.shpcusid,"+")[1]}' />
 										value="${tempShpValue}"

@@ -149,7 +149,7 @@
             onExpandRow: function(index,row){
             		console.log("expand row index:"+index);
                 $('#ddv-'+index).datagrid({
-                    url:'<%=basePath %>manifest/sub/grid.json?mawbId='+row.id,
+                    url:'<%=basePath %>manifest/sub/grid.json?mawbId='+row.waybillnomaster,
                     fitColumns:true,
                     singleSelect:true,
                     loadMsg:'正在加载……',

@@ -149,9 +149,11 @@
                 return '<div id="ddv-' + index + '"style="padding:5px 0"></div>';
             },
             onExpandRow: function(index,row){
+                var awbNo = row.waybillnomaster;
                 console.log("expand row index:"+index);
                 $('#ddv-'+index).datagrid({
-                    url:'<%=basePath %>wbm/sub/grid.json?mawbId='+row.id,
+                    url:'<%=basePath %>wbm/sub/grid.json?mawbId='+awbNo,
+//                    contentType: 'application/json;charset=UTF-8',
                     fitColumns:true,
                     singleSelect:true,
                     loadMsg:'正在加载……',