修改 预配仓 id不为null

@@ -538,6 +538,7 @@ public class ManifestController extends BasicController {
 		List<ManifestVo> manifestVos  = new ArrayList<>();
 		List<ManifestVo> manifestVos  = new ArrayList<>();
 		for (ManifestEntity mani : manis.getRows()){
 		for (ManifestEntity mani : manis.getRows()){
 			ManifestVo manifestVo = new ManifestVo();
 			ManifestVo manifestVo = new ManifestVo();
+			manifestVo.setId(mani.getId());
 			manifestVo.setUnlodingcode(mani.getUnlodingcode());
 			manifestVo.setUnlodingcode(mani.getUnlodingcode());
 			manifestVo.setCnecusid(mani.getCnecusid());
 			manifestVo.setCnecusid(mani.getCnecusid());
 			manifestVo.setShpcusid(mani.getShpcusid());
 			manifestVo.setShpcusid(mani.getShpcusid());
@@ -625,10 +626,9 @@ public class ManifestController extends BasicController {
 	}
 	}
 
 
 	/**
 	/**
-	 * * 模糊查询匹配信息
-	 *
-	 * @param manifest
-	 * @return
+	 *  模糊查询匹配信息
+	 * @param id
+	 * @param model
 	 * @return
 	 * @return
 	 */
 	 */
 	@RequestMapping(value = "/infor")
 	@RequestMapping(value = "/infor")

@@ -157,6 +157,9 @@ public class LoginController {
 		UserEntity user = new UserEntity();
 		UserEntity user = new UserEntity();
 		user.setLoginaccount(loginAccount);
 		user.setLoginaccount(loginAccount);
 		user.setPassword(password);
 		user.setPassword(password);
+
+
+		System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+PropertiesLoader.getLogin("openRemoteLogin"));
         if (!loginAccount.equals("admin") && loginAccount.equals(PropertiesLoader.getLogin("openRemoteLogin"))) {
         if (!loginAccount.equals("admin") && loginAccount.equals(PropertiesLoader.getLogin("openRemoteLogin"))) {
 			// 远程登录
 			// 远程登录
 			// 用户数据
 			// 用户数据

@@ -290,6 +290,28 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 	private Long USER_ID; // 报文所属的用户id
 	private Long USER_ID; // 报文所属的用户id
 
 
 
 
+	/*//BasicAgentEntity   货代  代理人三字码
+	private String agentCode;
+
+	//UserEntity    用户账号
+	private String loginaccount;
+
+	public String getAgentCode() {
+		return agentCode;
+	}
+
+	public void setAgentCode(String agentCode) {
+		this.agentCode = agentCode;
+	}
+
+	public String getLoginaccount() {
+		return loginaccount;
+	}
+
+	public void setLoginaccount(String loginaccount) {
+		this.loginaccount = loginaccount;
+	}*/
+
 	public String getUnlodingcode() {
 	public String getUnlodingcode() {
 		return StringUtils.isBlank(unlodingcode) ? getDestinationstation() : unlodingcode;
 		return StringUtils.isBlank(unlodingcode) ? getDestinationstation() : unlodingcode;
 	}
 	}

@@ -8,6 +8,9 @@ import java.util.Date;
  */
  */
 public class ManifestVo {
 public class ManifestVo {
 
 
+
+    private Long id;
+
     private String unlodingcode;// 卸货地代码
     private String unlodingcode;// 卸货地代码
     private String cnecusid;// 收货人代码
     private String cnecusid;// 收货人代码
     private String shpcusid;// 发货人代码
     private String shpcusid;// 发货人代码
@@ -296,6 +299,14 @@ public class ManifestVo {
         this.cnecusid = cnecusid;
         this.cnecusid = cnecusid;
     }
     }
 
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public String getShpcusid() {
     public String getShpcusid() {
         return shpcusid;
         return shpcusid;
     }
     }

@@ -76,7 +76,7 @@
 			<value>
 			<value>
 				/receipt/a0608c4054662dd902e1314f7e450e3eaa81c114 = anon
 				/receipt/a0608c4054662dd902e1314f7e450e3eaa81c114 = anon
 				/login = anon
 				/login = anon
-
+				/loginApi= anon
 				/druid/** = anon
 				/druid/** = anon
 				/unauthorized = anon
 				/unauthorized = anon
 				/resource/** = anon
 				/resource/** = anon

@@ -198,6 +198,7 @@
     });
     });
 		
 		
 		function editFormat(val,row,index){
 		function editFormat(val,row,index){
+
 	    		var html='<a href="javascript:void(0)" style="padding-left:10px;text-decoration:none;color:blue;padding-right:20px;" onclick="editRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>'
 	    		var html='<a href="javascript:void(0)" style="padding-left:10px;text-decoration:none;color:blue;padding-right:20px;" onclick="editRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>'
 	    		html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" onclick="makeHawb('+row.id+')"><i class="iconfont">&#xe663;</i><spring:message code="manifest.new.sheet"/></a>';
 	    		html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" onclick="makeHawb('+row.id+')"><i class="iconfont">&#xe663;</i><spring:message code="manifest.new.sheet"/></a>';
 	    		return html;
 	    		return html;