可修改主单号绑定用户 增加删除功能

+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="agent:war exploded">
+    <output-path>$PROJECT_DIR$/target/ROOT</output-path>
+    <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="agent" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:2.7.5" />
+          <element id="library" level="project" name="Maven: xml-resolver:xml-resolver:1.2" />
+          <element id="library" level="project" name="Maven: asm:asm:3.3.1" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-api:2.7.5" />
+          <element id="library" level="project" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.2.0" />
+          <element id="library" level="project" name="Maven: org.codehaus.woodstox:stax2-api:3.1.1" />
+          <element id="library" level="project" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.0.3" />
+          <element id="library" level="project" name="Maven: org.apache.geronimo.specs:geronimo-javamail_1.4_spec:1.7.1" />
+          <element id="library" level="project" name="Maven: wsdl4j:wsdl4j:1.6.3" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-core:2.7.5" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:2.7.5" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:2.7.5" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:2.7.5" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:2.7.5" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-ws-addr:2.7.5" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-ws-policy:2.7.5" />
+          <element id="library" level="project" name="Maven: org.apache.neethi:neethi:3.0.2" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-transports-http:2.7.5" />
+          <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-ws-security:2.7.5" />
+          <element id="library" level="project" name="Maven: org.apache.ws.security:wss4j:1.6.10" />
+          <element id="library" level="project" name="Maven: org.apache.santuario:xmlsec:1.5.4" />
+          <element id="library" level="project" name="Maven: org.opensaml:opensaml:2.5.1-1" />
+          <element id="library" level="project" name="Maven: org.opensaml:openws:1.4.2-1" />
+          <element id="library" level="project" name="Maven: org.opensaml:xmltooling:1.3.2-1" />
+          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.1.1" />
+          <element id="library" level="project" name="Maven: javax.transaction:jta:1.1" />
+          <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
+          <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.16" />
+          <element id="library" level="project" name="Maven: org.jdom:jdom:1.1.3" />
+          <element id="library" level="project" name="Maven: junit:junit:4.12" />
+          <element id="library" level="project" name="Maven: org.hamcrest:hamcrest-core:1.3" />
+          <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.10" />
+          <element id="library" level="project" name="Maven: com.google.guava:guava:19.0" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.13" />
+          <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-api:2.5" />
+          <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-core:2.5" />
+          <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.5" />
+          <element id="library" level="project" name="Maven: javax.annotation:jsr250-api:1.0" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-aspects:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.8.7" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.2.4.RELEASE" />
+          <element id="library" level="project" name="Maven: commons-httpclient:commons-httpclient:3.0" />
+          <element id="library" level="project" name="Maven: org.springframework.data:spring-data-jpa:1.9.2.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework.data:spring-data-commons:1.11.2.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-orm:4.1.9.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.1.9.RELEASE" />
+          <element id="library" level="project" name="Maven: org.aspectj:aspectjrt:1.8.7" />
+          <element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-core:5.0.6.Final" />
+          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" />
+          <element id="library" level="project" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" />
+          <element id="library" level="project" name="Maven: org.javassist:javassist:3.18.1-GA" />
+          <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" />
+          <element id="library" level="project" name="Maven: org.jboss:jandex:2.0.0.Final" />
+          <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
+          <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" />
+          <element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-entitymanager:5.0.6.Final" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-ehcache:5.0.6.Final" />
+          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.38" />
+          <element id="library" level="project" name="Maven: com.alibaba:druid:1.0.16" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.4" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.4" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.6.4" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.4" />
+          <element id="library" level="project" name="Maven: joda-time:joda-time:2.2" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
+          <element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.3.1" />
+          <element id="library" level="project" name="Maven: commons-io:commons-io:2.2" />
+          <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-core:2.6.8" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-core:1.2.3" />
+          <element id="library" level="project" name="Maven: commons-beanutils:commons-beanutils:1.8.3" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-web:1.2.3" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-spring:1.2.3" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-ehcache:1.2.3" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-quartz:1.2.3" />
+          <element id="library" level="project" name="Maven: org.opensymphony.quartz:quartz:1.6.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-cas:1.2.3" />
+          <element id="library" level="project" name="Maven: org.jasig.cas.client:cas-client-core:3.2.1" />
+          <element id="library" level="project" name="Maven: net.pusuo:patchca:0.5.0" />
+          <element id="library" level="project" name="Maven: com.oracle:ojdbc6:11.2.0.4.0-atlassian-hosted" />
+          <element id="library" level="project" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" />
+          <element id="library" level="project" name="Maven: log4j:log4j:1.2.14" />
+          <element id="library" level="project" name="Maven: org.apache.poi:poi:3.14" />
+          <element id="library" level="project" name="Maven: javax.mail:mail:1.4" />
+          <element id="library" level="project" name="Maven: javax.activation:activation:1.1.1" />
+          <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml:3.14" />
+          <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.14" />
+          <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" />
+          <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
+          <element id="library" level="project" name="Maven: com.github.virtuald:curvesapi:1.03" />
+          <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.1" />
+          <element id="library" level="project" name="Maven: org.apache.velocity:velocity-tools:2.0" />
+          <element id="library" level="project" name="Maven: commons-digester:commons-digester:1.8" />
+          <element id="library" level="project" name="Maven: commons-chain:commons-chain:1.1" />
+          <element id="library" level="project" name="Maven: commons-validator:commons-validator:1.3.1" />
+          <element id="library" level="project" name="Maven: oro:oro:2.0.8" />
+          <element id="library" level="project" name="Maven: sslext:sslext:1.2-0" />
+          <element id="library" level="project" name="Maven: org.apache.struts:struts-core:1.3.8" />
+          <element id="library" level="project" name="Maven: org.apache.struts:struts-taglib:1.3.8" />
+          <element id="library" level="project" name="Maven: org.apache.struts:struts-tiles:1.3.8" />
+          <element id="library" level="project" name="Maven: org.apache.velocity:velocity:1.6.2" />
+          <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.4" />
+          <element id="library" level="project" name="Maven: redis.clients:jedis:2.1.0" />
+          <element id="library" level="project" name="Maven: commons-pool:commons-pool:1.5.5" />
+          <element id="library" level="project" name="Maven: org.apache.ant:ant:1.9.7" />
+          <element id="library" level="project" name="Maven: org.apache.ant:ant-launcher:1.9.7" />
+          <element id="library" level="project" name="Maven: javax.xml.bind:jaxb-api:2.3.0" />
+          <element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
+          <element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
+          <element id="library" level="project" name="Maven: com.google.code.gson:gson:2.8.2" />
+          <element id="library" level="project" name="Maven: com.jfinal:jfinal:3.4" />
+          <element id="library" level="project" name="Maven: cglib:cglib-nodep:3.2.5" />
+        </element>
+      </element>
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/target/ROOT/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="javaee-facet-resources" facet="agent/web/Web" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file

+package com.agent.controller.system;
+
+import com.agent.controller.BasicController;
+import com.agent.entity.Constant;
+import com.agent.entity.system.UserEntity;
+import com.agent.service.system.RoleService;
+import com.agent.service.system.UserService;
+import com.agent.util.HttpJsonMsg;
+import com.agent.vo.ResponseModel;
+import com.agent.vo.agent.CommodityVo;
+import com.agent.vo.agent.ManifestVo;
+import com.agent.xml.XmlBuildTask;
+import com.agent.xml.common.XmlHead;
+import com.agent.xml.common.XmlUtil;
+import com.agent.xml.fhlsli.FSXmlKit;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.framework.core.Servlets;
+import com.framework.shiro.SessionUtil;
+import com.framework.util.MessageKit;
+import com.framework.util.MessageType;
+import com.plugin.easyui.DataGrid;
+import com.plugin.easyui.EasyPage;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import tools.DBConnection;
+import tools.NumKit;
+import tools.Tools;
+import tools.oclass.FemyList;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import com.agent.entity.agent.BasicAgentEntity;
+import com.agent.entity.agent.ManifestBillEntity;
+import com.agent.entity.agent.ManifestEntity;
+import com.agent.entity.agent.PackageTypeEntity;
+import com.agent.entity.agent.PreparesecondaryEntity;
+import com.agent.entity.agent.PubDgEntity;
+import com.agent.entity.agent.TBasCarrierEntity;
+import com.agent.entity.agent.WaybillReceiptEntity;
+import com.agent.entity.agent.WaybillReceiptType;
+import com.agent.service.agent.BasicAgentService;
+import com.agent.service.agent.ConsigneeService;
+import com.agent.service.agent.ConsignorService;
+import com.agent.service.agent.ManifestBillService;
+import com.agent.service.agent.ManifestCommodityService;
+import com.agent.service.agent.ManifestContainerService;
+import com.agent.service.agent.ManifestService;
+import com.agent.service.agent.PackageTypeService;
+import com.agent.service.agent.PreparesecondaryService;
+import com.agent.service.agent.PubDgService;
+import com.agent.service.agent.TBasCarrierService;
+import com.agent.service.agent.WaybillReceiptService;
+import com.agent.xml.manifestdeclare.DeclarePreparemasterXmlBody;
+import com.agent.xml.manifestdeclare.ManifestBorderTransportMeansXml;
+import com.agent.xml.manifestdeclare.ManifestCarrierXml;
+import com.agent.xml.manifestdeclare.ManifestConsignmentItemXml;
+import com.agent.xml.manifestdeclare.ManifestConsignmentPackagingXml;
+import com.agent.xml.manifestdeclare.ManifestConsignmentXml;
+import com.agent.xml.manifestdeclare.ManifestConsignorXml;
+import com.agent.xml.manifestdeclare.ManifestDeclarationXml;
+import com.agent.xml.manifestdeclare.ManifestDeclareMetaXml;
+import com.agent.xml.manifestdeclare.ManifestDeclareMsgXml;
+import com.agent.xml.manifestdeclare.ManifestDesXml;
+import com.agent.xml.manifestdeclare.ManifestFreightPaymentXml;
+import com.agent.xml.manifestdeclare.ManifestLoadingLocationXml;
+import com.agent.xml.manifestdeclare.ManifestOrgXml;
+import com.agent.xml.manifestdeclare.ManifestTransportContractDocumentXml;
+import com.agent.xml.manifestdeclare.ManifestUnloadingLocationXml;
+import com.agent.xml.manifestdeclare.ManifestsAddressXml;
+/**
+ * @Auther: shenhl
+ * @Date: 2019/3/15 09:52
+ */
+@Controller
+@RequestMapping(value = "/wbm")
+public class WaybillnomasterController extends BasicController {
+
+    private static final Logger logger = LoggerFactory.getLogger(com.agent.controller.agent.ManifestController.class);
+
+    public static boolean isSuccess = false;
+
+    @Resource
+    private ManifestService manifestService;
+
+    @Resource
+    private PreparesecondaryService preparesecondaryServer;
+
+    @Resource
+    private BasicAgentService agentService;
+
+    @Resource
+    private UserService userService;
+
+
+    @RequestMapping(value="/list")
+    public String list() {
+        return "system/user/wbm";
+    }
+
+
+    /**
+     * 查询分页数据
+     *
+     * @return
+     */
+    @RequestMapping(value = "/grid.json")
+    @ResponseBody
+    public DataGrid<ManifestVo> grid(HttpServletRequest request, EasyPage<ManifestEntity> pageForm) {
+        Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
+        // searchParams.put("EQ_isdelete", 0);
+        pageForm.setSearchParams(searchParams);
+        // UserEntity ue =
+        // (UserEntity)SecurityUtils.getSubject().getSession().getAttribute("user");
+        UserEntity ue = (UserEntity) SecurityUtils.getSubject().getSession().getAttribute("user");
+        if (ue != null) {
+            Long u = ue.getId();
+            Set<String> sk = pageForm.getSearchParams().keySet();
+
+            if (Tools.getUserId() != null && Tools.getUserId() != 1) {
+                // 不是管理员,添加用户id的条件
+                pageForm.getSearchParams().put("EQ_USER_ID", u);
+            }
+        }
+
+        pageForm.parseData(manifestService.getPage(pageForm));
+        //
+        DataGrid<ManifestEntity> manis = pageForm.getData();
+        List<ManifestVo> manifestVos  = new ArrayList<>();
+        for (ManifestEntity mani : manis.getRows()){
+            ManifestVo manifestVo = new ManifestVo();
+            manifestVo.setId(mani.getId());
+            manifestVo.setUnlodingcode(mani.getUnlodingcode());
+            manifestVo.setCnecusid(mani.getCnecusid());
+            manifestVo.setShpcusid(mani.getShpcusid());
+            manifestVo.setShpaeo(mani.getShpaeo());
+            manifestVo.setCneaeo(mani.getCneaeo());
+            manifestVo.setFlightno(mani.getFlightno());
+            manifestVo.setFlightdate(mani.getFlightdate());
+            manifestVo.setOriginatingstation(mani.getOriginatingstation());
+            manifestVo.setDestinationstation(mani.getDestinationstation());
+            manifestVo.setWaybillnomaster(mani.getWaybillnomaster());
+            manifestVo.setTotalweight(mani.getTotalweight());
+            manifestVo.setTotalpiece(mani.getTotalpiece());
+            manifestVo.setPreparetotalpiece(mani.getPreparetotalpiece());
+            manifestVo.setPreparetotalweight(mani.getPreparetotalweight());
+            manifestVo.setAgentcompanycode(mani.getAgentcompanycode());
+            manifestVo.setStowagedate(mani.getStowagedate());
+            manifestVo.setStatus(mani.getStatus());
+            manifestVo.setCarrier(mani.getCarrier());
+            manifestVo.setCustomsstatus(mani.getCustomsstatus());
+            manifestVo.setPaymode(mani.getPaymode());
+            manifestVo.setSpecialgoodscode(mani.getSpecialgoodscode());
+            manifestVo.setCustomscode(mani.getCustomscode());
+            manifestVo.setAgentman(mani.getAgentman());
+            manifestVo.setAgentcompany(mani.getAgentcompany());
+            manifestVo.setReceiptinformation(mani.getReceiptinformation());
+            manifestVo.setCreatedate(mani.getCreatedate());
+            manifestVo.setProductname(mani.getProductname());
+            manifestVo.setUnnumber(mani.getUnnumber());
+            manifestVo.setCategory(mani.getCategory());
+            manifestVo.setSh_company(mani.getSh_company());
+            manifestVo.setSh_address(mani.getSh_address());
+            manifestVo.setSh_zipcode(mani.getSh_zipcode());
+            manifestVo.setSh_city(mani.getSh_city());
+            manifestVo.setSh_deltaname(mani.getSh_deltaname());
+            manifestVo.setSh_country(mani.getSh_country());
+            manifestVo.setSh_telephone(mani.getSh_telephone());
+            manifestVo.setSh_fax(mani.getSh_fax());
+            manifestVo.setSh_name(mani.getSh_name());
+            manifestVo.setCo_company(mani.getCo_company());
+            manifestVo.setCo_address(mani.getCo_address());
+            manifestVo.setCo_zipcode(mani.getCo_zipcode());
+            manifestVo.setCo_city(mani.getCo_city());
+            manifestVo.setCo_deltaname(mani.getCo_deltaname());
+            manifestVo.setCo_country(mani.getCo_country());
+            manifestVo.setCo_telephone(mani.getCo_telephone());
+            manifestVo.setCo_fax(mani.getCo_fax());
+            manifestVo.setCo_name(mani.getCo_name());
+            manifestVo.setReach_station(mani.getReach_station());
+            manifestVo.setCarrier1(mani.getCarrier1());
+            manifestVo.setReach_station1(mani.getReach_station1());
+            manifestVo.setCarrier2(mani.getCarrier2());
+            manifestVo.setReach_station2(mani.getReach_station2());
+            manifestVo.setName_ofgoods(mani.getName_ofgoods());
+            manifestVo.setDelivery_station(mani.getDelivery_station());
+            manifestVo.setSh_provincecode(mani.getSh_provincecode());
+            manifestVo.setSh_provincename(mani.getSh_provincename());
+            manifestVo.setDe_number(mani.getDe_number());
+            manifestVo.setDe_weight(mani.getDe_weight());
+            manifestVo.setDe_chweight(mani.getDe_chweight());
+            manifestVo.setDe_size(mani.getDe_size());
+            manifestVo.setDe_volume(mani.getDe_volume());
+            manifestVo.setDe_type(mani.getDe_type());
+            manifestVo.setDe_trstation(mani.getDe_trstation());
+            manifestVo.setDe_packing(mani.getDe_packing());
+            manifestVo.setDe_remarks(mani.getDe_remarks());
+            manifestVo.setDe_ids(mani.getDe_ids());
+            manifestVo.setResponse_code(mani.getResponse_code());
+            manifestVo.setResponse_text(mani.getResponse_text());
+            manifestVo.setSave_time(mani.getSave_time());
+            manifestVo.setUSER_ID(mani.getUSER_ID());
+
+            if(mani.getUSER_ID() != null){
+                UserEntity one = userService.findOne(mani.getUSER_ID());
+                manifestVo.setLoginaccount(one.getLoginaccount());
+                BasicAgentEntity one1 = agentService.findOne(one.getAgent());
+                manifestVo.setAgentCode(one1.getThreeCode());
+            }
+            manifestVos.add(manifestVo);
+        }
+        DataGrid<ManifestVo> vo  = new DataGrid<>();
+        vo.setRows(manifestVos);
+        vo.setTotal(manis.getTotal());
+//		return pageForm.getData();
+        return vo;
+    }
+
+    /**
+     *  模糊查询匹配信息
+     * @param id
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "/infor")
+    @ResponseBody
+    public List<ManifestEntity> infor(String id, Model model) {
+        List<ManifestEntity> li = null;
+        if (Tools.getUserId() != null && Tools.getUserId().longValue() == 1) {
+            li = manifestService.queryAll();
+        } else {
+            li = manifestService.queryByUserId(Tools.getUserId());
+        }
+
+        List<ManifestEntity> result = new FemyList();
+        for (ManifestEntity me : li) {
+            if (result.contains(me)) {
+            } else {
+                result.add(me);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * * 模糊查询匹配信息
+     *
+     * @param manifest
+     * @return
+     * @return
+     */
+    @RequestMapping(value = "/inforPre")
+    @ResponseBody
+    public List<PreparesecondaryEntity> inforPre(String id, Model model) {
+        List<PreparesecondaryEntity> li = preparesecondaryServer.queryByUserId(Tools.getUserId());
+        List<PreparesecondaryEntity> result = new FemyList();
+        for (PreparesecondaryEntity pe : li) {
+            if (result.contains(pe)) {
+
+            } else {
+                result.add(pe);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 查询分制单分页数据
+     *
+     * @return
+     */
+    @RequestMapping(value = "/sub/grid.json")
+    @ResponseBody
+    public DataGrid<PreparesecondaryEntity> gridSub(Long mawbId, HttpServletRequest request) {
+        DataGrid<PreparesecondaryEntity> dg = new DataGrid<>();
+        dg.setRows(preparesecondaryServer.findByMawbId(mawbId));
+        return dg;
+    }
+
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @RequestMapping(value = "/delete", method = { RequestMethod.POST })
+    @ResponseBody
+    public ResponseModel delete(String ids) {
+        ResponseModel model = new ResponseModel();
+        try {
+            manifestService.trueDeleteAll(ids);
+            model.setStatus(200);
+            model.setMsg(HttpJsonMsg.SUCCESS);
+        } catch (Exception e) {
+            model.setStatus(500);
+            model.setMsg(HttpJsonMsg.ERROR);
+            logger.error("系统异常 >>", e);
+        }
+        return model;
+    }
+
+
+    //编辑
+    @RequestMapping(value = "/edit/{id}")
+    public String edit(Model model, @PathVariable("id") Long id){
+        ManifestEntity manifest = null;
+        UserEntity user = SessionUtil.getUser();
+        // 判断是否是便捷
+        if (id != null) {
+            manifest = manifestService.findOne(id);
+            user = userService.findOne(manifest.getUSER_ID());
+        }
+        List<UserEntity> laList = userService.findAll();
+        //全部用户账户号
+        model.addAttribute("userList", laList);
+        //主单号id
+        model.addAttribute("manifest",manifest);
+        model.addAttribute("wbm", user);
+        return "system/user/wbm_edit";
+    }
+
+    //修改
+    @RequestMapping(value = "/userUpdate")
+    @ResponseBody
+    public ResponseModel userUpdate(@RequestParam("ids") Long ids,
+                                    @RequestParam("userId") Long userId,
+                                    @RequestParam("loginaccount") String loginaccount){
+        ResponseModel rm = new ResponseModel(200,"",null);
+
+        try {
+            UserEntity user = userService.findLoginaccount(loginaccount);
+            if (user.getId() != null){
+                manifestService.userUpdate(user.getId(), ids);
+                rm.setStatus(200);
+            }else {
+                rm.setStatus(500);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            rm.setStatus(500);
+        }
+
+        return rm;
+    }
+
+
+}

@@ -2,12 +2,14 @@ package com.agent.repository.agent;
 
 import com.agent.entity.agent.ManifestEntity;
 
+import java.beans.Transient;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Created by cohesion on 2017/4/19.
@@ -18,19 +20,31 @@ public interface ManifestRepository extends PagingAndSortingRepository<ManifestE
 	    @Modifying
 	    @Query(value = "UPDATE MANIFEST SET IS_DELETE = 1 WHERE ID = ?1",nativeQuery = true)
 	    public void delete(Long id);
+
+	    @Transactional
+	    @Modifying
+	    @Query(value = "DELETE FROM MANIFEST WHERE ID = ?1",nativeQuery = true)
+	    void trueDelete(Long id);
+
+		@Transactional
+	    @Modifying
+		@Query(value = "UPDATE MANIFEST SET USER_ID =?1 where ID = ?2", nativeQuery = true)
+		void userUpdate(Long userId, Long ids);
 	
 	  @Query(value = "SELECT * FROM MANIFEST ORDER BY ID DESC", nativeQuery = true)
 	  public List<ManifestEntity> findAll();
-	  
+
 	  @Query(value = "SELECT * FROM MANIFEST WHERE WAYBILLNOMASTER = ?1 and USER_ID=?2 ORDER BY ID DESC", nativeQuery = true)
 	  public List<ManifestEntity> findByMawbNo(String mawbNo, Long user_id);
-	  
+
 	  @Query(value = "SELECT * FROM MANIFEST WHERE WAYBILLNOMASTER = ?1 ORDER BY ID DESC", nativeQuery = true)
 	  public List<ManifestEntity> findByMawbNo(String mawbNo);
-	  
+
 	  @Query(value = "SELECT * FROM MANIFEST", nativeQuery = true)
 	  public List<ManifestEntity> queryAll();
-	  
+
 	  @Query(value = "SELECT * FROM MANIFEST WHERE USER_ID=?1", nativeQuery = true)
 	  public List<ManifestEntity> queryByUserId(Long user_id);
+
+
 }

@@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import com.agent.entity.agent.PreparesecondaryEntity;
+import org.springframework.transaction.annotation.Transactional;
 
 public interface PreparesecondaryRepository extends PagingAndSortingRepository<PreparesecondaryEntity, Long>,
 JpaSpecificationExecutor<PreparesecondaryEntity>{
@@ -37,4 +38,8 @@ JpaSpecificationExecutor<PreparesecondaryEntity>{
 	List<PreparesecondaryEntity> queryAll();
 	@Query(value = "SELECT * FROM PREPARESECONDARY WHERE USER_ID=?1", nativeQuery = true)
 	List<PreparesecondaryEntity> queryByUserId(Long user_id);
+	@Transactional
+	@Modifying
+	@Query(value = "DELETE FROM PREPARESECONDARY WHERE PREPAREMASTERID = ?1", nativeQuery = true)
+	void deleteSub(Long id);
 }

@@ -29,9 +29,15 @@ public interface UserRepository extends PagingAndSortingRepository<UserEntity, L
 
     @Query(value = "SELECT u.* FROM sys_user u LEFT JOIN sys_role r ON r.id = u.role  WHERE r.rolename IN (?1) AND u.isdelete='0'", nativeQuery = true)
     public List<UserEntity> findByRoleNames(String[] roleNames);
-    //根据用户名设置密码
+    //根m据用户名设置密码
     @Transactional
     @Modifying(clearAutomatically=true)
     @Query(value = "UPDATE SYS_USER SET password=?1 where loginaccount=?2", nativeQuery = true)
     public void updatePassword(String password, String loginacount);
+
+    @Query(value = "SELECT * FROM sys_user", nativeQuery = true)
+    List<UserEntity> findAlls();
+
+    @Query(value = "select * from sys_user where LOGINACCOUNT = ?1", nativeQuery = true)
+    UserEntity findLoginaccount(String loginaccount);
 }

@@ -134,6 +134,7 @@ 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++) {
@@ -192,6 +193,20 @@ public class ManifestService extends BasicService<ManifestEntity> {
 		}
 	}
 
+	@Transactional
+	public void trueDeleteAll(String ids) {
+		List<String> list = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(ids);
+		for (String id : list) {
+
+//			ManifestEntity manifest = manifestRepository.findOne(Long.valueOf(id));
+// 			if (manifest != null) {
+				// 先删除子表信息
+				preparesecondaryRepository.deleteSub(Long.valueOf(id));
+//			}
+			manifestRepository.trueDelete(Long.valueOf(id));
+		}
+	}
+
 	public List<ManifestEntity> findByMawbNo(String mawbNo) {
 		return manifestRepository.findByMawbNo(mawbNo, Tools.getUserId());
 	}
@@ -1025,4 +1040,13 @@ public class ManifestService extends BasicService<ManifestEntity> {
 		return body;
 	}
 
+
+	//修改主单号用户
+	public void userUpdate(Long userId, Long ids){
+
+		preparesecondaryRepository.deleteSub(ids);
+		manifestRepository.userUpdate(userId, ids);
+
+	}
+
 }

@@ -39,6 +39,15 @@ public class UserService extends BasicService<UserEntity> {
         return page;
     }
 
+
+    /**
+     * 查询所有用户
+     */
+    public List<UserEntity> findAll(){
+
+        return userDao.findAlls();
+    }
+
     /**
      * 根据id 查询
      *
@@ -138,4 +147,10 @@ public class UserService extends BasicService<UserEntity> {
     	//System.out.println("update loginaaccount and password:"+logincount+" "+password);
     	userDao.updatePassword(password, logincount);
     }
+
+    //查询该用户是否存在
+    public UserEntity findLoginaccount(String loginaccount){
+        return userDao.findLoginaccount(loginaccount);
+    }
+
 }

@@ -79,6 +79,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 	                           <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.role" />||system/role/list',this)"><spring:message code="menu.role" /></a></li>
 	                           <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.agent" />||agent/list',this)"><spring:message code="menu.agent" /></a></li>
 	                           <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.user" />||system/user/list',this)"><spring:message code="menu.user" /></a></li>
+                                <li><a href="javascript:void(0);" onclick="addTab('<spring:message code="menu.wbm" />||wbm/list',this)"><spring:message code="menu.wbm" /></a></li>
 	                           <%-- <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.consignee_info_set" />||consignee/list')"><spring:message code="menu.consignee_info_set" /></a></li> --%>
 	                        </ul>
 	                     </li>

+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2019/3/15
+  Time: 9:33
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="<%=basePath %>resource/css/base.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
+    <link rel="stylesheet" type="text/css" href="<%=basePath %>resource/easyui/uimaker/icon.css">
+    <link rel="stylesheet" href="<%=basePath %>resource/css/providers.css">
+
+    <link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
+    <script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+
+</head>
+<body>
+<div class="container">
+    <div data-options="closable:true">
+        <table id="dg" style="width:100%;" title="<spring:message code="wbm.list"/>"
+               data-options="
+                rownumbers:true,
+                singleSelect:false,
+                autoRowHeight:false,
+                pagination:true,
+                fitColumns:true,
+                striped:true,
+                collapsible:true,
+                toolbar:'#tb',
+                pageSize:10">
+            <thead>
+            <tr>
+                <th field="."  formatter="editFormat"><spring:message code="opt.edit" /></th>
+                <th field="loginaccount"><spring:message code="manifest.loginaccount"/></th>
+                <th field="agentCode"><spring:message code="manifest.agentCode"/></th>
+                <th field="waybillnomaster" sortable="true"><spring:message code="manifest.bill.number"/></th>
+                <th field="customscode"><spring:message code="manifest.customs"/></th>
+                <th field="flightno" formatter="appendCarrier"><spring:message code="manifest.flight.number"/></th>
+                <th field="flightdate" formatter="formatFlightDate"><spring:message code="manifest.flight.date"/></th>
+                <th field="originatingstation"><spring:message code="manifest.starting.point"/></th>
+                <th field="destinationstation"><spring:message code="manifest.destination"/></th>
+                <th field="preparetotalpiece"><spring:message code="manifest.number.of.fittings"/></th>
+                <th field="preparetotalweight"><spring:message code="manifest.pre.weight"/></th>
+                <th field="response_text" formatter="checkResponseText" width="200"><spring:message code="manifest.response_text" /></th>
+                <%--<th field=".." formatter="operatorFormat"><spring:message code="opt.operator" /></th>--%>
+            </tr>
+            </thead>
+        </table>
+        <div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc">
+            <form id="searchForm">
+                <table class="search_form_table">
+                    <spring:message code="manifest.bill.number"/>:<input id="manifnum" type="text" name="search_LIKE_waybillnomaster" style="width:166px;height:35px;line-height:35px;">
+                    <spring:message code="manifest.flight.number"/>:<input class="easyui-textbox" type="text" name="search_LIKE_flightno" style="width:166px;height:35px;line-height:35px;">
+                    <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
+                    <%--<a href="javascript:editRow()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add"><spring:message code="opt.add" /></a>--%>
+                    <a href="javascript:doDelete()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red" iconCls="icon-no"><spring:message code="opt.delete" /></a>
+                </table>
+            </form>
+        </div>
+    </div>
+
+</div>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/easyui-lang-${pageContext.response.locale}.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/datagrid-detailview.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/js/tools.js?version=${version}"></script>
+<!--弹出层引入的JS-->
+<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+<script type="text/javascript">
+
+    function formatFlightDate(value, row, index){
+        return row.flightdate.split(" ")[0];
+    }
+
+    function appendCarrier(value, row, index) {
+        return row.carrier+row.flightno;
+    }
+
+    function checkResponseText(value, row, index) {
+        var res = '';
+        if(value){
+            var start_yupei = value.indexOf("41301");
+            var start_yundi = value.indexOf("45201");
+            if(start_yupei>-1||start_yundi>-1){
+                // 成功
+                res = '<span style="color:green;">'+value+'</span>';
+            }else{
+                // 未通过或者未回执
+                var start_exception_ = value.indexOf("分单");
+                var start_exception_ = value.indexOf("主单");
+                if(start_exception_>-1||start_exception_>-1){
+                    //没有回执
+                    res = '<span style="color:black;">'+value+'</span>';
+                }else{
+                    res = '<span style="color:red;">'+value+'</span>';
+                }
+            }
+        }
+
+        return res;
+    }
+
+    $(function(){
+        function getPageNumber(){
+            var pageNumber = window.localStorage.getItem("pageNumber");
+            if(typeof(pageNumber) != "undefined")
+            {
+                try{
+                    var pattern = /^\d+$/g;		//判断是否是数字
+
+                    //console.log(pageNumber.search(pattern));
+
+                    if(pageNumber.search(pattern) >= 0)
+                    {
+                        var num = parseInt(pageNumber);
+                        return num;
+                    }
+                    return 1;
+                }
+                catch(e){
+                    return 1;
+                }
+            }
+            return 1;
+        }
+
+        //console.log(getPageNumber());
+
+        $('#dg').datagrid({
+            url:'<%=basePath %>wbm/grid.json',
+            //queryParams:$("#searchForm").serializeJson(),
+            pageNumber:getPageNumber(),
+            view: detailview,
+            detailFormatter:function(index,row){
+                return '<div id="ddv-' + index + '"style="padding:5px 0"></div>';
+            },
+            onExpandRow: function(index,row){
+                console.log("expand row index:"+index);
+                $('#ddv-'+index).datagrid({
+                    url:'<%=basePath %>wbm/sub/grid.json?mawbId='+row.id,
+                    fitColumns:true,
+                    singleSelect:true,
+                    loadMsg:'正在加载……',
+                    height:'auto',
+                    autoRowHeight:"true",
+                    columns:[[
+                        {field:'.',title:'',formatter:editHbillFormat},
+                        {field:'waybillnosecondary',title:'<spring:message code="manifest.odd.number"/>'},
+                        {field:'originatingstation',title:'<spring:message code="manifest.starting.point"/>'},
+                        {field:'destinationstation',title:'<spring:message code="manifest.destination"/>'},
+                        {field:'preparepiece',title:'<spring:message code="manifest.number.of.fittings"/>'},
+                        {field:'prepareweight',title:'<spring:message code="manifest.pre.weight"/>'},
+                        {field:'response_text',width:160,title:'<spring:message code="manifest.response_text"/>',
+                            formatter:function(value, row, index){
+                                var res = '';
+                                if(value){
+                                    var start_yupei = value.indexOf("41301");
+                                    var start_yundi = value.indexOf("45201");
+                                    if(start_yupei>-1||start_yundi>-1){
+                                        // 成功
+                                        res = '<span style="color:green;">'+value+'</span>';
+                                    }else{
+                                        // 未通过或者未回执
+                                        var start_exception_1 = value.indexOf("分单");
+                                        var start_exception_2 = value.indexOf("主单");
+                                        if(start_exception_1>-1||start_exception_2>-1){
+                                            //没有回执
+                                            res = '<span style="color:black;">'+value+'</span>';
+                                        }else{
+                                            res = '<span style="color:red;">'+value+'</span>';
+                                        }
+                                    }
+                                }
+
+                                return res;
+                            }
+                        },
+                        {field:'..', title:'<spring:message code="opt.operator" />', formatter:preoperatorFormat, width:40}
+                    ]],
+                    onResize:function(){
+                        $('#dg').datagrid('fixDetailRowHeight',index);
+                    },
+                    onLoadSuccess:function(){
+                        $('#dg').datagrid('resize');
+                    }
+                });
+
+                $('#dg').datagrid('fixDetailRowHeight',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="userUpdate('+row.id+')"><i class="iconfont">&#xe65a;</i></a>'
+        html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" </a>';
+        return html;
+    }
+
+    //分单撤销按钮
+    function preoperatorFormat(val, row, index){
+        var html =  "<a href='javascript:void(0)' style='text-decoration:none;color:blue;'></a>";
+        html+="<a href='javascript:void(0)' style='text-decoration:none;color:blue;margin-left:20px;'></a>";
+        return html;
+    }
+
+    function prebackout(id){
+        if(typeof(id) == "undefined")
+            return;
+        layer.confirm("确定要撤销吗？", function(flag){
+            layer.close(flag);
+            $.ajax({
+                url:"<%=basePath %>/manifest/prebackout",
+                data:{
+                    id:id
+                },
+                success:function(data){
+                    if(data.status == 200)
+                        layer.alert("撤销请求已发送！");
+                    else
+                        layer.alert("撤销请求发送失败！");
+                }
+            });
+        });
+    }
+    //主单撤销按钮
+    function operatorFormat(val, row, index){
+        var html = "<a href='javascript:void(0)' onclick='backout("+row.id+")' style='text-decoration:none;color:blue;'><spring:message code='opt.backout'/></a>";
+        html+="<a href='javascript:void(0)' onclick='openReceipt(\""+row.waybillnomaster+"\")' style='text-decoration:none;color:blue;margin-left:20px;'><spring:message code='opt.open.receipt'/></a>";
+        return html;
+    }
+    function backout(id){
+        if(typeof(id) == "undefined")
+            return;
+        layer.confirm("确定要撤销吗？", function(flag){
+            layer.close(flag);
+            //提交到后台，发送一个撤销报文
+            $.ajax({
+                url:"<%=basePath %>/manifest/backout",
+                data:{
+                    id:id
+                },
+                success:function(data){
+                    if(data.status == 200)
+                        layer.alert("撤销请求已发送！");
+                    else
+                        layer.alert("撤销请求发送失败！");
+                }
+            });
+        });
+    }
+
+    //查看分单回执
+    function openSubReceipt(waybill_no,subno){
+        if(typeof(waybill_no) == "undefined")
+            return;
+        if(typeof(subno) == "undefined")
+            return;
+        seeReceipt(waybill_no,subno,false);
+    }
+
+    //查看主单回执
+    function openReceipt(waybill_no){
+        if(typeof(waybill_no) == "undefined")
+            return;
+        seeReceipt(waybill_no,"",true);
+    }
+
+    function seeReceipt(waybill_no,sub_waybill_no,isMain){
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            var api="<%=basePath%>receipt/seeReceipt";
+            var params = "waybill_no="+waybill_no;
+            if(!isMain){
+                params+="&sub_waybill_no="+sub_waybill_no;
+            }
+            var viewUrl = api+"?"+params;
+
+            parent.layer.open({
+                type: 2,
+                title: "<spring:message code='opt.open.receipt'/>",
+                shadeClose: true,
+                shade: 0.8,
+                area: ['80%', '60%'],
+                content: viewUrl
+            });
+        });
+    }
+
+    //制分单
+    function makeHawb(id){
+        window.location.href="<%=basePath %>manifest/subedit?mawbId="+id;
+    }
+
+    //分单编辑
+    function editHbillRow(id){
+        window.location.href="<%=basePath %>manifest/subedit?id="+id;
+    }
+
+    function editHbillFormat(val,row,index){
+        var html='<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" onclick="editHbillRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>';
+// 	        html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:red;" onclick="delHbillRow('+row.id+','+row.mawbId+','+index+')"><i class="iconfont">&#xe661;</i></a>';
+        return html;
+    }
+
+
+    function editRow(id){
+        var page = $("#dg").datagrid("getPager").data("pagination").options;
+        window.localStorage.setItem("pageNumber", page.pageNumber);
+        if(id==undefined){
+            window.location.href='<%=basePath %>manifest/edit?id=';
+        }else{
+            window.location.href='<%=basePath %>manifest/edit?id='+id;
+        }
+    }
+
+    function userUpdate(id) {
+        // iframe层
+        layer.open({
+            type : 2,
+            title : '修改主单号用户',
+            maxmin : true,
+            shadeClose : false, // 点击遮罩关闭层
+            area : [ '400px', '260px' ],
+            content : '/wbm/edit/'+id
+        });
+    }
+
+    function doSearch(){
+        $('#dg').datagrid("options").queryParams=$("#searchForm").serializeJson();
+        $('#dg').datagrid("reload");
+    }
+
+    function getIds() {
+        var ids = [];
+        var rows = $("#dg").datagrid('getChecked');
+        $.each(rows,function(key,v){
+            ids.push(v.id);
+        });
+        return ids;
+    }
+
+    //分单删除
+    function delHbillRow(id,mawbId,index){
+        $.post("<%=basePath %>wbm/subdelete",{id:id},function(data){
+            if(data.status == 200) {
+                $('#ddv-'+index).datagrid({
+                    url:'<%=basePath %>wbm/sub/grid.json?mawbId='+id,
+                    queryParams:$("#searchForm").serializeJson(),
+                    fitColumns:true,
+                    singleSelect:true,
+                    loadMsg:'',
+                    height:'auto',
+                    columns:[[
+                        {field:'.',title:'<spring:message code="opt.name"/>',formatter:editHbillFormat,width:80},
+                        {field:'hawbNo',title:'<spring:message code="bill.hawbNo"/>',width:100},
+                        {field:'totalPieces',title:'<spring:message code="bill.pieces"/>',width:100},
+                        {field:'grossWeight',title:'<spring:message code="bill.weightcharge"/>',width:100},
+                        {field:'productname',title:'<spring:message code="bill.productname"/>',width:100},
+                        {field:'departureStation',title:'<spring:message code="bill.orilocation"/>',width:100},
+                        {field:'destinationStation',title:'<spring:message code="bill.destination"/>',width:100},
+                    ]],
+                    onResize:function(){
+                        $('#dg').datagrid('fixDetailRowHeight',index);
+                    },
+                    onLoadSuccess:function(){
+                        setTimeout(function(){
+                            $('#dg').datagrid('fixDetailRowHeight',index);
+                        },0);
+                    }
+                    //onClickRow: editHbillRow
+
+                })
+                layer.open({content:"<spring:message code="opt.success"/>"});
+            }else{
+                layer.open({content:"<spring:message code="opt.delfailed"/>!"});
+            }
+        },"json");
+    }
+
+
+    function doDelete(){
+        var rows = $("#dg").datagrid('getChecked');
+        if(rows.length==0){
+            layer.open({content:"<spring:message code="opt.selectone" />"});
+            return false;
+        }
+        layer.confirm("<spring:message code="opt.confirmdel" />?", {btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function () {
+            $.post("<%=basePath %>wbm/delete",{ids:getIds().join(",")},function(data){
+                if(data.status == 200) {
+                    layer.confirm("<spring:message code="opt.delsuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                        window.location.href="<%=basePath %>wbm/list";
+                    })
+                }else{
+                    layer.open({content:"<spring:message code="opt.delfailed" />!"});
+                }
+            },"json");
+
+        });
+    }
+
+    $("#manifnum").keyup(function(){
+        var leng =  $("#manifnum").val().length;
+        if (leng == 3)
+        {
+            $("#manifnum").val( $("#manifnum").val()+"-")
+        }
+    })
+</script>
+</body>
+</html>
+
+

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2019/3/15
+  Time: 16:24
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<html>
+<head>
+    <title>Title</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="<%=basePath %>resource/css/base.css" rel="stylesheet">
+    <link href="<%=basePath %>resource/css/basic_info.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
+    <link href="<%=basePath %>resource/css/form.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%=basePath %>resource/css/form.css">
+    <script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="<%=basePath %>resource/validate/jquery.validate.js"></script>
+    <script type="text/javascript" src="<%=basePath %>resource/validate/validate-extends.js"></script>
+
+    <script type="text/javascript" src="<%=basePath %>resource/js/tools.js"></script>
+    <!-- validate 验证中英文 -->
+    <script type="text/javascript" src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
+</head>
+<body>
+<div class="container">
+    <div class="content">
+        <form class="from-control" id="form">
+            <input type="hidden" id="id" name="id" value="${manifest.id }">
+            <div></div>
+            <div>
+                <table class="kv-table">
+                    <tbody>
+                        <div>
+                            <tr class="kv-content">
+                                <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6">用户账号</td>
+                                <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6">
+                                    <%--<select id="user_update" required>--%>
+                                        <%--<c:forEach var="user" items="${userList}">--%>
+                                            <%--<option id = "${user.id}">${user.loginaccount}</option>--%>
+                                        <%--</c:forEach>--%>
+                                    <%--</select>--%>
+                                        <input type="text" id = "loginaccount" name = "loginacciunt" value="${wbm.loginaccount}">
+                                </td>
+                            </tr>
+                            <tr class="kv-content">
+                                <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="2">
+                                     <button type="button"  class="layui-btn layui-btn-sm layui-icon layui-icon-user" id="subbtn">
+                                         <i class="fa fa-trash hidden" aria-hidden="true"></i>提交
+                                     </button>
+                                </td>
+                            </tr>
+                        </div>
+                    </tbody>
+                </table>
+            </div>
+        </form>
+    </div>
+</div>
+
+<script type="text/javascript">
+
+
+    $("#subbtn").on("click",function () {
+        var userId = "";
+        console.log("success");
+
+        var loginaccount = $("#loginaccount").val();
+        var idss = $('#user_update>option:selected');
+        idss.val(function(){
+            userId = (this.id);
+        });
+
+        var ids = $("#id").val();
+            $.ajax({
+                type : 'POST',
+                // contentType: 'application/json; charset=UTF-8',
+                data : {
+                    "ids" : ids,
+                    "userId" : userId,
+                    "loginaccount":loginaccount
+                },
+                url :"<%=basePath%>wbm/userUpdate",
+                success : function(data) {
+                    console.log(data)
+                    if (data.status != 200) {
+                        alert("该账号不存在");
+                    }else {
+                        // parent.reLoad();
+                        alert("修改成功");
+                        window.parent.location.reload();
+                        var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(index);
+                    }
+                }
+            });
+    })
+
+
+</script>
+</body>
+</html>