预配界面添加提前运抵字段

shenhailong
src/main/java/com/agent/controller/agent/ManifestController.java
src/main/java/com/agent/controller/system/UserController.java
src/main/java/com/agent/entity/agent/ManifestEntity.java
src/main/java/com/agent/repository/agent/PreparesecondaryRepository.java
src/main/java/com/agent/service/agent/ManifestService.java
src/main/java/com/agent/service/agent/PreparesecondaryService.java
src/main/java/com/agent/vo/agent/ManifestVo.java
src/main/java/com/agent/xml/manifestdeclare/ManifestDeclarationXml.java
src/main/webapp/WEB-INF/views/manifest/edit.jsp
--- a/src/main/java/com/agent/controller/agent/ManifestController.java
查看文件 @56ecde8
+++ b/src/main/java/com/agent/controller/agent/ManifestController.java
查看文件 @56ecde8
@@ -521,6 +521,7 @@ public class ManifestController extends BasicController {
 		for (ManifestEntity mani : manis.getRows()){
 			ManifestVo manifestVo = new ManifestVo();
 			manifestVo.setId(mani.getId());
+			manifestVo.setArrived_ahead(mani.getArrived_ahead());
 			manifestVo.setUnlodingcode(mani.getUnlodingcode());
 			manifestVo.setCnecusid(mani.getCnecusid());
 			manifestVo.setShpcusid(mani.getShpcusid());
@@ -708,7 +709,9 @@ public class ManifestController extends BasicController {
 		// 海关状态
 		List<String> customsStatus = getcustomsStatus();
 		model.addAttribute("customsStatus", customsStatus);
-
+		// 提前报关
+//		List<String> arrivedAhead = getArrivedAhead();
+//		model.addAttribute("arrivedAhead", arrivedAhead);
 		// 危险品代码
 		List<PubDgEntity> dgList = dgService.findAll();
 		model.addAttribute("dgList", dgList);
@@ -719,9 +722,9 @@ public class ManifestController extends BasicController {
 		request.setAttribute("version", System.currentTimeMillis());
 		// model.addAttribute("customsStatus",flag);
-		String waybill_no = manifest != null ? manifest.getWaybillnomaster() : "";
-		WaybillReceiptEntity receipt = receiptService.findMain(waybill_no);
-		request.setAttribute("receipt", receipt);
+//		String waybill_no = manifest != null ? manifest.getWaybillnomaster() : "";
+//		WaybillReceiptEntity receipt = receiptService.findMain(waybill_no);
+//		request.setAttribute("receipt", receipt);
 		//货主与运单绑定关系
@@ -855,8 +858,8 @@ public class ManifestController extends BasicController {
 		if (pre != null && pre.getWaybillnosecondary() != null) {
 			sub_waybill_no = pre.getWaybillnosecondary();
 		}
-		WaybillReceiptEntity receipt = receiptService.findSub(waybill_no, sub_waybill_no);
-		request.setAttribute("receipt", receipt);
+//		WaybillReceiptEntity receipt = receiptService.findSub(waybill_no, sub_waybill_no);
+//		request.setAttribute("receipt", receipt);
 		return "manifest/sub_edit";
 	}
@@ -935,6 +938,14 @@ public class ManifestController extends BasicController {
 		return list;
 	}
+//	// 提前报关
+//	private List<String> getArrivedAhead(){
+//		List<String> list = new ArrayList<>();
+//		list.add("0");
+//		list.add("1");
+//		return list;
+//	}
+
 	// 支付方式
 	private List<String> getPayTypes() {
 		List<String> list = new ArrayList<>();
@@ -2716,7 +2727,7 @@ public class ManifestController extends BasicController {
 								model.setMsg(wbm+"请先添加主单号");
 								return model;
 							}else {
-								if (preparesecondaryServer.findWaybill(arr.get(2))==0) {
+								if (preparesecondaryServer.findWaybill(wbm,arr.get(2))==0) {
 									PreparesecondaryEntity seconday = new PreparesecondaryEntity();
 									seconday.setPreparemasterid(wbm1.getId());
 									// 主单号
@@ -2739,8 +2750,8 @@ public class ManifestController extends BasicController {
 									// 卸货地代码
 									seconday.setDestinationstation(arr.get(7));
 									// 货物装载运输时间
-									SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
-									seconday.setStowagedate(simpleDateFormat1.parse(arr.get(8)));
+//									SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
+									seconday.setStowagedate(new Date());
 									// 海关关区代码
 									seconday.setCustomscode(arr.get(9));
 									// 货物件数
--- a/src/main/java/com/agent/controller/system/UserController.java
查看文件 @56ecde8
+++ b/src/main/java/com/agent/controller/system/UserController.java
查看文件 @56ecde8
 package com.agent.controller.system;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import com.agent.entity.system.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -20,8 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.agent.controller.BasicController;
 import com.agent.entity.agent.BasicAgentEntity;
-import com.agent.entity.system.RoleEntity;
-import com.agent.entity.system.UserEntity;
 import com.agent.service.agent.BasicAgentService;
 import com.agent.service.system.RoleService;
 import com.agent.service.system.UserService;
@@ -250,5 +246,62 @@ public class UserController extends BasicController {
 		return model;
 	}
+//	/**
+//	 * 资源同步
+//	 */
+//	@RequestMapping(value = "/userSynchronization")
+//	@ResponseBody
+//	public ResultMessage userSynchronization(@RequestBody UAM uam) throws Exception {
+//		if ("user".equals(uam.getResType())){
+//			List<UserData> data = uam.getData();
+//			// 判断该用户是否存在
+//			int i = 0;
+//			for (UserData userData: data){
+//				if (userService.countLonginName(userData.getLOGIN_NAME()) > 0){
+//					log.info("通过账号为条件更新");
+//					i = userService.updateSyncUserLoginName(userData);
+//				}else {
+//					if (kakoUserMapperl.findLonginName("", userDate.getUSER_ID()) != null){
+//						KakoUser kakoUser = new KakoUser();
+//						kakoUser.setLoginName(userDate.getLOGIN_NAME());
+//						kakoUser.setPassword(userDate.getPWD());
+//						kakoUser.setUserSyncId(userDate.getUSER_ID());
+//						kakoUser.setMobile(userDate.getMOBILE());
+//						kakoUser.setEmail(userDate.getEMAIL());
+//						kakoUser.setDelFlag("0");
+//						kakoUser.setName(userDate.getUSER_NAME());
+//						kakoUser.setCompanyId("1");
+//						kakoUser.setOfficeId("5e95a0f081c64fce9f85d59e18cfdc5f");
+//						kakoUser.setUpdateBy("tyrz");
+//						kakoUser.setLoginFlag("1");
+//						kakoUser.setUpdateDate(new Date());
+//						log.info("账号不存在用过统一认证id更新");
+//						i = kakoUserMapperl.updateSyncUserId(kakoUser);
+//					}else {
+//						KakoUser kakoUser = new KakoUser();
+//						kakoUser.setId(UUID.randomUUID().toString());
+//						kakoUser.setLoginName(userDate.getLOGIN_NAME());
+//						kakoUser.setPassword(userDate.getPWD());
+//						kakoUser.setUserSyncId(userDate.getUSER_ID());
+//						kakoUser.setMobile(userDate.getMOBILE());
+//						kakoUser.setEmail(userDate.getEMAIL());
+//						kakoUser.setName(userDate.getUSER_NAME());
+//						kakoUser.setCompanyId("1");
+//						kakoUser.setOfficeId("5e95a0f081c64fce9f85d59e18cfdc5f");
+//						kakoUser.setLoginFlag("1");
+//						kakoUser.setCreateBy("tyrz");
+//						kakoUser.setUpdateBy("tyrz");
+//						kakoUser.setCreateDate(new Date());
+//						kakoUser.setUpdateDate(new Date());
+//						log.info("账号统一认证id都不在  新增");
+//						i = kakoUserMapperl.insertSelective(kakoUser);
+//					}
+//				}
+//			}
+//
+//			return  i > 0 ? new ResultMessage("200","资源同步成功"):new ResultMessage("202", "资源同步失败");
+//		}
+//		return new ResultMessage("201","不是用户信息");
+//	}
 }
--- a/src/main/java/com/agent/entity/agent/ManifestEntity.java
查看文件 @56ecde8
+++ b/src/main/java/com/agent/entity/agent/ManifestEntity.java
查看文件 @56ecde8
@@ -289,7 +289,20 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 	private Long save_time;
 	private Long USER_ID; // 报文所属的用户id
-//	// 验证密码  调用使用
+	/**
+	 * 是否提前运抵状态
+	 */
+	private String arrived_ahead;
+
+	public String getArrived_ahead() {
+		return arrived_ahead;
+	}
+
+	public void setArrived_ahead(String arrived_ahead) {
+		this.arrived_ahead = arrived_ahead;
+	}
+
+	//	// 验证密码  调用使用
 //	private String password;
 //
 //	public String getPassword() {
@@ -999,7 +1012,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 				+ ", de_volume=" + de_volume + ", de_type=" + de_type + ", de_trstation=" + de_trstation
 				+ ", de_packing=" + de_packing + ", de_remarks=" + de_remarks + ", de_ids=" + de_ids
 				+ ", response_code=" + response_code + ", response_text=" + response_text + ", save_time=" + save_time
-				+ ", USER_ID=" + USER_ID + "]";
+				+ ", USER_ID=" + USER_ID+ ", arrived_ahead=" + arrived_ahead + "]";
 	}
 	public static void main(String[] args) {
--- a/src/main/java/com/agent/repository/agent/PreparesecondaryRepository.java
查看文件 @56ecde8
+++ b/src/main/java/com/agent/repository/agent/PreparesecondaryRepository.java
查看文件 @56ecde8
@@ -47,8 +47,8 @@ JpaSpecificationExecutor<PreparesecondaryEntity>{
 	@Query(value = "DELETE FROM PREPARESECONDARY WHERE PREPAREMASTERID = ?1", nativeQuery = true)
 	void deleteSub(Long id);
-	@Query(value = "SELECT count(*) FROM PREPARESECONDARY WHERE WAYBILLNOSECONDARY = ?1", nativeQuery = true)
-	int findWaybill(String wbm);
+	@Query(value = "SELECT count(*) FROM PREPARESECONDARY WHERE WAYBILLNOMASTER=?1 AND WAYBILLNOSECONDARY = ?2", nativeQuery = true)
+	int findWaybill(String awba, String awbh);
 	@Query(value = "select count(id) from PREPARESECONDARY where WAYBILLNOMASTER = ?1 and WAYBILLNOSECONDARY=?2", nativeQuery = true)
 	int findAwbAwbH(String awb, String awbh);
--- a/src/main/java/com/agent/service/agent/ManifestService.java
查看文件 @56ecde8
+++ b/src/main/java/com/agent/service/agent/ManifestService.java
查看文件 @56ecde8
@@ -148,15 +148,15 @@ public class ManifestService extends BasicService<ManifestEntity> {
 		Specification<ManifestEntity> spec = buildSpecification(pageForm);
 		Page<ManifestEntity> page = manifestRepository.findAll(spec, pageRequest);
-		if (page != null && page.getContent() != null) {
-			List<ManifestEntity> list = page.getContent();
-			for (int i = 0; i < list.size(); i++) {
-				ManifestEntity bean = list.get(i);
-				WaybillReceiptEntity re = receiptService.findMain(bean.getWaybillnomaster());
-				bean.setResponse_code(re != null ? re.getResponse_code() : "");
-				bean.setResponse_text(re != null ? re.getResponse_text() : "");
-			}
-		}
+//		if (page != null && page.getContent() != null) {
+//			List<ManifestEntity> list = page.getContent();
+//			for (int i = 0; i < list.size(); i++) {
+//				ManifestEntity bean = list.get(i);
+//				WaybillReceiptEntity re = receiptService.findMain(bean.getWaybillnomaster());
+//				bean.setResponse_code(re != null ? re.getResponse_code() : "");
+//				bean.setResponse_text(re != null ? re.getResponse_text() : "");
+//			}
+//		}
 		return page;
 	}
@@ -341,6 +341,8 @@ public class ManifestService extends BasicService<ManifestEntity> {
 		// 预配舱单
 		ManifestDeclarationXml dec = new ManifestDeclarationXml();
 		// 预配舱单主表信息
+		//提前运抵
+		dec.setArrivedAhead(manifest.getArrived_ahead());
 		// 承运人
 		ManifestCarrierXml carr = new ManifestCarrierXml();
 		carr.setId(manifest.getCarrier());
--- a/src/main/java/com/agent/service/agent/PreparesecondaryService.java
查看文件 @56ecde8
+++ b/src/main/java/com/agent/service/agent/PreparesecondaryService.java
查看文件 @56ecde8
@@ -41,14 +41,14 @@ public class PreparesecondaryService extends BasicService<PreparesecondaryEntity
 	public List<PreparesecondaryEntity> findByMawbId(Long id) {
 		List<PreparesecondaryEntity> list =  preparesecondaryRepository.findByMawbId(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():"");
-			}
-		}
+//		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;
 	}
@@ -117,8 +117,8 @@ public class PreparesecondaryService extends BasicService<PreparesecondaryEntity
 		return preparesecondaryRepository.queryByUserId(user_id);
 	}
-	public int findWaybill(String wbm){
-		int waybill = preparesecondaryRepository.findWaybill(wbm);
+	public int findWaybill(String awba, String awbh){
+		int waybill = preparesecondaryRepository.findWaybill(awba, awbh);
 		return waybill;
 	}
--- a/src/main/java/com/agent/vo/agent/ManifestVo.java
查看文件 @56ecde8
+++ b/src/main/java/com/agent/vo/agent/ManifestVo.java
查看文件 @56ecde8
 package com.agent.vo.agent;
+import javax.persistence.Column;
 import java.util.Date;
 /**
@@ -283,6 +284,19 @@ public class ManifestVo {
 	//UserEntity    用户账号
 	private String loginaccount;
+    /**
+     * 是否提前运抵状态
+     */
+    private String arrived_ahead;
+
+    public String getArrived_ahead() {
+        return arrived_ahead;
+    }
+
+    public void setArrived_ahead(String arrived_ahead) {
+        this.arrived_ahead = arrived_ahead;
+    }
+
     public String getUnlodingcode() {
         return unlodingcode;
     }
--- a/src/main/java/com/agent/xml/manifestdeclare/ManifestDeclarationXml.java
查看文件 @56ecde8
+++ b/src/main/java/com/agent/xml/manifestdeclare/ManifestDeclarationXml.java
查看文件 @56ecde8
@@ -17,6 +17,9 @@ public class ManifestDeclarationXml {
 	@XmlElement(name = "Carrier",required = false)
 	private ManifestCarrierXml carrier;
+	@XmlElement(name = "ArrivedAhead",required = false)
+	private String arrivedAhead;
+
 	@XmlElement(name = "ORG",required = false)
 	private ManifestOrgXml org;
@@ -81,4 +84,11 @@ public class ManifestDeclarationXml {
 		this.consignment = consignment;
 	}
+	public String getArrivedAhead() {
+		return arrivedAhead;
+	}
+
+	public void setArrivedAhead(String arrivedAhead) {
+		this.arrivedAhead = arrivedAhead;
+	}
 }
--- a/src/main/webapp/WEB-INF/views/manifest/edit.jsp
查看文件 @56ecde8
+++ b/src/main/webapp/WEB-INF/views/manifest/edit.jsp
查看文件 @56ecde8
@@ -144,10 +144,18 @@
 							<td class="kv-label"><spring:message code="manifest.flight.date" /><span
 								class="required_span">*</span></td>
-							<td class="kv-content"><input type="text" class="date bill Wdate" 
+							<td class="kv-content"><input type="text" class="date bill Wdate"
 									id="flightdate" name="flightdate" required autocomplete="off"
 									value="<fmt:formatDate pattern='yyyy-MM-dd' value='${manifest.flightdate }'></fmt:formatDate>">
 							</td>
+							<td class="kv-label">提前运抵<span
+									class="required_span">*</span></td>
+							<td class="kv-content">
+								<select  id="arrived_ahead" name="arrived_ahead">
+									<option value="0" <c:if test = "${manifest.arrived_ahead == '0' }">selected="selected"</c:if>>正常运抵</option>
+									<option value="1" <c:if test = "${manifest.arrived_ahead == '1' }">selected="selected"</c:if>>提前运抵</option>
+								</select>
+							</td>
 						</tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.starting.point" /><span