一类管理 二级类管理

+package com.agent.controller.system;
+
+import com.agent.entity.agent.SDCargoNameEntity;
+import com.agent.entity.system.SDBIGTYPEEntity;
+import com.agent.entity.system.SDTWOTYPEEntity;
+import com.agent.service.system.SDBIGTYPEService;
+import com.agent.service.system.SDCargoNameService;
+import com.agent.service.system.SDCargoTypeService;
+import com.agent.service.system.SDTWOTYPEService;
+import com.agent.util.HttpJsonMsg;
+import com.agent.vo.ResponseModel;
+import com.agent.vo.agent.SdBigTypeVo;
+import com.agent.vo.agent.SdTwoTypeVo;
+import com.framework.core.Servlets;
+import com.framework.shiro.SessionUtil;
+import com.plugin.easyui.DataGrid;
+import com.plugin.easyui.EasyPage;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** 货物品名 大类 二级类 统计
+ * @Auther: shenhl
+ * @Date: 2019/8/8 15:51
+ */
+@Controller
+@RequestMapping(value = "/type")
+public class SDCARGONAMEController {
+
+    private static final Logger logger = LoggerFactory.getLogger(com.agent.controller.system.SDCARGONAMEController.class);
+    @Autowired
+    SDBIGTYPEService sdbigtypeService;
+
+    @Autowired
+    SDTWOTYPEService sdtwotypeService;
+
+    @Autowired
+    SDCargoNameService sdCargoNameService;
+
+    /**
+     * 一级类  列表页面
+     * @return
+     */
+    @RequestMapping(value = "/list")
+    public String list(){
+        return  "sdtype/bigtype";
+    }
+
+    /**
+     * 一级类 跳转添加页面
+     * @return
+     */
+    @RequestMapping(value = "/add")
+    public String add(){
+        return  "sdtype/sdtypeadd";
+    }
+
+    /**
+     * 二级类列表跳转
+     * @return
+     */
+    @RequestMapping(value = "/tlist")
+    public String tlist(){
+        return "sdtype/twolist";
+    }
+
+
+    /**
+     * 一级类分页查询
+     * @param request
+     * @param pageForm
+     * @return
+     */
+    @RequestMapping(value = "/grid.json")
+    @ResponseBody
+    public DataGrid<SdBigTypeVo> grid(HttpServletRequest request, EasyPage<SDBIGTYPEEntity> pageForm) {
+
+        Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
+        pageForm.setSearchParams(searchParams);
+        pageForm.parseData(sdbigtypeService.getPage(pageForm));
+        DataGrid<SDBIGTYPEEntity> hzshipperinformationEntityDataGrid = pageForm.getData();
+        List<SdBigTypeVo> rows = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(hzshipperinformationEntityDataGrid.getRows())){
+            for (SDBIGTYPEEntity sd: hzshipperinformationEntityDataGrid.getRows()){
+                SdBigTypeVo sdBigTypeVo = new SdBigTypeVo();
+                sdBigTypeVo.setId(sd.getId());
+                sdBigTypeVo.setType_name(sd.getType_name());
+                sdBigTypeVo.setType_order(sd.getType_order());
+                rows.add(sdBigTypeVo);
+            }
+        }
+        DataGrid<SdBigTypeVo> vos = new DataGrid<>();
+        vos.setRows(rows);
+        vos.setTotal(hzshipperinformationEntityDataGrid.getTotal());
+        return vos;
+    }
+
+
+    /**
+     * 大类添加
+     * @param sd
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/bigSave")
+    @ResponseBody
+    public ResponseModel saves(SDBIGTYPEEntity sd, HttpServletRequest request){
+        ResponseModel model = new ResponseModel();
+        try {
+            // 如果为空 默认为0
+            if (sd.getType_order() == null){
+                sd.setType_order("0");
+            }
+
+            if (sdbigtypeService.findName(sd.getType_name()) == 0){
+                sdbigtypeService.saves(sd);
+
+                model.setStatus(200);
+            }else {
+                model.setStatus(201);
+            }
+
+            return model;
+        }catch (Exception e){
+            e.printStackTrace();
+            model.setStatus(500);
+            return model;
+        }
+    }
+
+    /**
+     * 一级类修改跳转
+     * @param model
+     * @param id
+     * @return
+             */
+    @RequestMapping(value = "/edit")
+    public String edit(Model model, Long id){
+
+        SDBIGTYPEEntity one = sdbigtypeService.findOne(id);
+
+        model.addAttribute("big", one);
+
+        return "sdtype/typeedit";
+    }
+
+
+    /**
+     * 一级类修改修改
+     * @param sd
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public ResponseModel update(SDBIGTYPEEntity sd, HttpServletRequest request){
+        ResponseModel responseModel = new ResponseModel();
+
+        // 如果为空 默认为0
+        if (sd.getType_order() == null){
+            sd.setType_order("0");
+        }
+        if (sdbigtypeService.findName(sd.getType_name()) == 0){
+            if (sdbigtypeService.typeUpdate(sd) > 0){
+                responseModel.setStatus(200);
+            }else {
+                responseModel.setStatus(500);
+            }
+        }else {
+            responseModel.setStatus(201);
+        }
+        return responseModel;
+    }
+
+
+    /**
+     * 一级类删除
+     *
+     * @param ids
+     * @return
+     */
+    @RequestMapping(value = "/delete", method = { RequestMethod.POST })
+    @ResponseBody
+    public ResponseModel delete(String ids) {
+        ResponseModel model = new ResponseModel();
+        try {
+            sdbigtypeService.bigTypeDelete(ids);
+            model.setStatus(200);
+            model.setMsg(HttpJsonMsg.SUCCESS);
+        } catch (Exception e) {
+            e.printStackTrace();
+            model.setStatus(500);
+            model.setMsg(HttpJsonMsg.ERROR);
+            logger.error("系统异常 >>", e);
+        }
+        return model;
+    }
+
+
+    /**
+     * 二级类分页查询
+     * @param request
+     * @param pageForm
+     * @return
+     */
+    @RequestMapping(value = "/twogrid.json")
+    @ResponseBody
+    public DataGrid<SdTwoTypeVo> twogrid(HttpServletRequest request, EasyPage<SDTWOTYPEEntity> pageForm) {
+
+        Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
+        pageForm.setSearchParams(searchParams);
+        pageForm.parseData(sdtwotypeService.getPage(pageForm));
+        DataGrid<SDTWOTYPEEntity> hzshipperinformationEntityDataGrid = pageForm.getData();
+        List<SdTwoTypeVo> rows = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(hzshipperinformationEntityDataGrid.getRows())){
+            for (SDTWOTYPEEntity sd: hzshipperinformationEntityDataGrid.getRows()){
+                SdTwoTypeVo sdTwoTypeVo = new SdTwoTypeVo();
+
+                SDBIGTYPEEntity one = sdbigtypeService.findOne(sd.getBig_type_id());
+                sdTwoTypeVo.setBigName(one.getType_name());
+                sdTwoTypeVo.setId(sd.getId());
+                sdTwoTypeVo.setBig_type_id(sd.getBig_type_id());
+                sdTwoTypeVo.setCargo_name(sd.getCargo_name());
+                sdTwoTypeVo.setCargo_name_id(sd.getCargo_name_id());
+                sdTwoTypeVo.setTwo_type_name(sd.getTwo_type_name());
+                sdTwoTypeVo.setTwo_type_order(sd.getTwo_type_order());
+
+                rows.add(sdTwoTypeVo);
+            }
+        }
+        DataGrid<SdTwoTypeVo> vos = new DataGrid<>();
+        vos.setRows(rows);
+        vos.setTotal(hzshipperinformationEntityDataGrid.getTotal());
+        return vos;
+    }
+
+
+    /**
+     * 二级类 跳转添加页面
+     * @return
+     */
+    @RequestMapping(value = "/tadd")
+    public String tadd(Model model){
+        // 一级类名称
+        List<SDBIGTYPEEntity> alls = sdbigtypeService.findAlls();
+        // 二级类名称
+        List<String> alls1 = sdCargoNameService.findAlls();
+        model.addAttribute("big", alls);
+        model.addAttribute("cargo", alls1);
+        return  "sdtype/tadd";
+    }
+
+
+    /**
+     * 二级类添加
+     * @param sd
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/twoSave")
+    @ResponseBody
+    public ResponseModel twoSave(SDTWOTYPEEntity sd, HttpServletRequest request){
+        ResponseModel model = new ResponseModel();
+        try {
+            // 如果为空 默认为0
+            if (sd.getTwo_type_order() == null){
+                sd.setTwo_type_order("0");
+            }
+            sdtwotypeService.saves(sd);
+            model.setStatus(200);
+            return model;
+        }catch (Exception e){
+            e.printStackTrace();
+            model.setStatus(500);
+            return model;
+        }
+    }
+
+    /**
+     * 二级类删除
+     *
+     * @param ids
+     * @return
+     */
+    @RequestMapping(value = "/tdelete", method = { RequestMethod.POST })
+    @ResponseBody
+    public ResponseModel tdelete(String ids) {
+        ResponseModel model = new ResponseModel();
+        try {
+            sdtwotypeService.tDelete(ids);
+            model.setStatus(200);
+            model.setMsg(HttpJsonMsg.SUCCESS);
+        } catch (Exception e) {
+            e.printStackTrace();
+            model.setStatus(500);
+            model.setMsg(HttpJsonMsg.ERROR);
+            logger.error("系统异常 >>", e);
+        }
+        return model;
+    }
+
+
+    /**
+     * 二级类修改跳转
+     * @param model
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/tedit")
+    public String tedit(Model model, Long id){
+
+        SDTWOTYPEEntity one = sdtwotypeService.findOne(id);
+        // 一级类名称
+        List<SDBIGTYPEEntity> alls = sdbigtypeService.findAlls();
+        // 二级类名称
+        List<String> alls1 = sdCargoNameService.findAlls();
+        model.addAttribute("big", alls);
+        model.addAttribute("one", one);
+        return "sdtype/tedit";
+    }
+
+
+    /**
+     * 二级类修改修改
+     * @param sd
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/tupdate")
+    @ResponseBody
+    public ResponseModel tupdate(SDTWOTYPEEntity sd, HttpServletRequest request){
+        ResponseModel responseModel = new ResponseModel();
+        // 如果为空 默认为0
+        if (sd.getTwo_type_order() == null){
+            sd.setTwo_type_order("0");
+        }
+        if (sdtwotypeService.tUpdate(sd) > 0){
+            responseModel.setStatus(200);
+        }else {
+            responseModel.setStatus(500);
+        }
+
+        return responseModel;
+    }
+
+
+}

+package com.agent.entity.system;
+
+import com.agent.entity.BasicEntity;
+import com.agent.entity.IdEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/8/8 15:52
+ */
+
+@Entity
+@Table(name = "SD_BIG_TYPE")
+public class SDBIGTYPEEntity extends IdEntity {
+
+    /**
+     * 类型名称
+     */
+    private String type_name;
+
+    /**
+     * 排序字段  默认为0
+     */
+    private String type_order;
+
+    public String getType_name() {
+        return type_name;
+    }
+
+    public void setType_name(String type_name) {
+        this.type_name = type_name;
+    }
+
+    public String getType_order() {
+        return type_order;
+    }
+
+    public void setType_order(String type_order) {
+        this.type_order = type_order;
+    }
+}

+package com.agent.entity.system;
+
+import com.agent.entity.BasicEntity;
+import com.agent.entity.IdEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/8/8 15:54
+ */
+@Entity
+@Table(name = "SD_TWO_TYPE")
+public class SDTWOTYPEEntity extends IdEntity{
+
+    /**
+     * 二级类名称
+     */
+    private String two_type_name;
+
+    /**
+     * 大类ID
+     */
+    private Long big_type_id;
+
+    /**
+     * 排序字段
+     */
+    private String two_type_order;
+
+    /**
+     * 货物品名
+     */
+    private String cargo_name;
+
+    /**
+     * 货物id
+     * @return
+     */
+    private Long cargo_name_id;
+
+    public String getTwo_type_name() {
+        return two_type_name;
+    }
+
+    public void setTwo_type_name(String two_type_name) {
+        this.two_type_name = two_type_name;
+    }
+
+    public Long getBig_type_id() {
+        return big_type_id;
+    }
+
+    public void setBig_type_id(Long big_type_id) {
+        this.big_type_id = big_type_id;
+    }
+
+    public String getTwo_type_order() {
+        return two_type_order;
+    }
+
+    public void setTwo_type_order(String two_type_order) {
+        this.two_type_order = two_type_order;
+    }
+
+    public String getCargo_name() {
+        return cargo_name;
+    }
+
+    public void setCargo_name(String cargo_name) {
+        this.cargo_name = cargo_name;
+    }
+
+    public Long getCargo_name_id() {
+        return cargo_name_id;
+    }
+
+    public void setCargo_name_id(Long cargo_name_id) {
+        this.cargo_name_id = cargo_name_id;
+    }
+}

+package com.agent.repository.system;
+
+import com.agent.entity.system.SDBIGTYPEEntity;
+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;
+
+import java.util.List;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/6/18 19:15
+ */
+public interface SDBIGTYPERepository extends PagingAndSortingRepository<SDBIGTYPEEntity, Long>,
+        JpaSpecificationExecutor<SDBIGTYPEEntity> {
+
+    @Transactional
+    @Modifying(clearAutomatically=true)
+    @Query(value = "insert into SD_BIG_TYPE(TYPE_NAME, TYPE_ORDER) values(?1, ?2)", nativeQuery = true)
+    int saves(String typename, String typeorder);
+
+    @Transactional
+    @Modifying(clearAutomatically=true)
+    @Query(value = "update SD_BIG_TYPE set TYPE_NAME = ?2, TYPE_ORDER = ?3 where id = ?1", nativeQuery = true)
+    int typeUpdate(Long id, String name, String order);
+
+    @Transactional
+    @Modifying
+    @Query(value = "DELETE FROM SD_BIG_TYPE WHERE ID = ?1", nativeQuery = true)
+    int bigTypeDelete(Long id);
+
+    @Query(value = "select * from SD_BIG_TYPE", nativeQuery = true)
+    List<SDBIGTYPEEntity> findAlls();
+
+    @Query(value = "select count(*) from SD_BIG_TYPE where TYPE_NAME = ?1", nativeQuery = true)
+    int findName(String type_name);
+
+
+}

@@ -30,4 +30,7 @@ public interface SDCargoNameRepository extends PagingAndSortingRepository<SDCarg
     @Query(value = "delete from SD_CARGO_NAME where sd_waybill = ?1", nativeQuery = true)
     @Query(value = "delete from SD_CARGO_NAME where sd_waybill = ?1", nativeQuery = true)
     int deletes(String waybillnomaster);
     int deletes(String waybillnomaster);
 
 
+    @Query(value = "select distinct SD_CARGO_NAME from SD_CARGO_NAME where SD_CARGO_NAME not in (select CARGO_NAME from SD_TWO_TYPE)", nativeQuery = true)
+    List<String> findAlls();
+
 }
 }

+package com.agent.repository.system;
+
+import com.agent.entity.system.SDBIGTYPEEntity;
+import com.agent.entity.system.SDTWOTYPEEntity;
+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;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/6/18 19:15
+ */
+public interface SDTWOTYPERepository extends PagingAndSortingRepository<SDTWOTYPEEntity, Long>,
+        JpaSpecificationExecutor<SDTWOTYPEEntity> {
+
+
+    @Transactional
+    @Modifying(clearAutomatically=true)
+    @Query(value = "insert into SD_TWO_TYPE(TWO_TYPE_NAME, BIG_TYPE_ID, TWO_TYPE_ORDER, CARGO_NAME) values(?1, ?2, ?3, ?4)", nativeQuery = true)
+    int saves(String typename, Long bigid, String typeorder, String cargoname);
+
+    @Transactional
+    @Modifying
+    @Query(value = "DELETE FROM SD_TWO_TYPE WHERE ID = ?1", nativeQuery = true)
+    int tDelete(Long id);
+
+    @Transactional
+    @Modifying(clearAutomatically=true)
+    @Query(value = "update SD_TWO_TYPE set TWO_TYPE_NAME = ?2, BIG_TYPE_ID = ?3, TWO_TYPE_ORDER = ?4 where id = ?1", nativeQuery = true)
+    int tUpdate(Long id, String name, Long bigid, String order);
+
+
+}

+package com.agent.service.system;
+
+import com.agent.entity.agent.HZSHIPPERINFORMATIONEntity;
+import com.agent.entity.agent.ManifestEntity;
+import com.agent.entity.agent.SecurityDeclarationEntity;
+import com.agent.entity.system.SDBIGTYPEEntity;
+import com.agent.repository.system.SDBIGTYPERepository;
+import com.agent.service.BasicService;
+import com.google.common.base.Splitter;
+import com.plugin.easyui.EasyPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/8/8 16:07
+ */
+@Service
+public class SDBIGTYPEService extends BasicService<SDBIGTYPEEntity> {
+
+    @Autowired
+    SDBIGTYPERepository sdbigtypeRepository;
+
+    /**
+     * 分页查询
+     *
+     * @param pageForm 分页对象
+     * @return 包含分页信息和数据的分页对象
+     */
+    public Page<SDBIGTYPEEntity> getPage(EasyPage<SDBIGTYPEEntity> pageForm) {
+
+        PageRequest pageRequest = buildPageRequest(pageForm);
+        Specification<SDBIGTYPEEntity> spec = buildSpecification(pageForm);
+        Page<SDBIGTYPEEntity> page = sdbigtypeRepository.findAll(spec, pageRequest);
+        return page;
+    }
+
+
+    @Transactional
+    public SDBIGTYPEEntity saves(SDBIGTYPEEntity sd) {
+
+        return sdbigtypeRepository.save(sd);
+    }
+
+    public SDBIGTYPEEntity findOne(Long id) {
+        return sdbigtypeRepository.findOne(id);
+    }
+
+    @Transactional
+    public int typeUpdate(SDBIGTYPEEntity sd){
+        return sdbigtypeRepository.typeUpdate(sd.getId(), sd.getType_name(), sd.getType_order());
+    }
+
+    @Transactional
+    public void bigTypeDelete(String ids) {
+        try {
+            List<String> list = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(ids);
+            for (String id : list) {
+                sdbigtypeRepository.bigTypeDelete(Long.valueOf(id));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
+    public List<SDBIGTYPEEntity> findAlls(){
+
+        return sdbigtypeRepository.findAlls();
+    }
+
+    public int findName(String type_name){
+
+        return  sdbigtypeRepository.findName(type_name);
+    }
+
+}

@@ -37,5 +37,9 @@ public class SDCargoNameService extends BasicService<SDCargoNameEntity> {
         return i;
         return i;
     }
     }
 
 
+    public List<String> findAlls(){
+
+        return sdCargoNameRepository.findAlls();
+    }
 
 
 }
 }

+package com.agent.service.system;
+
+import com.agent.entity.system.SDBIGTYPEEntity;
+import com.agent.entity.system.SDTWOTYPEEntity;
+import com.agent.repository.system.SDBIGTYPERepository;
+import com.agent.repository.system.SDTWOTYPERepository;
+import com.agent.service.BasicService;
+import com.google.common.base.Splitter;
+import com.plugin.easyui.EasyPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/8/8 16:07
+ */
+@Service
+public class SDTWOTYPEService extends BasicService<SDTWOTYPEEntity> {
+
+    @Autowired
+    SDTWOTYPERepository sdtwotypeRepository;
+
+
+
+    /**
+     * 分页查询
+     *
+     * @param pageForm 分页对象
+     * @return 包含分页信息和数据的分页对象
+     */
+    public Page<SDTWOTYPEEntity> getPage(EasyPage<SDTWOTYPEEntity> pageForm) {
+
+        PageRequest pageRequest = buildPageRequest(pageForm);
+        Specification<SDTWOTYPEEntity> spec = buildSpecification(pageForm);
+        Page<SDTWOTYPEEntity> page = sdtwotypeRepository.findAll(spec, pageRequest);
+        return page;
+    }
+
+
+    @Transactional
+    public SDTWOTYPEEntity saves(SDTWOTYPEEntity sd){
+
+        return sdtwotypeRepository.save(sd);
+    }
+
+    @Transactional
+    public void tDelete(String ids) {
+        try {
+            List<String> list = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(ids);
+            for (String id : list) {
+                sdtwotypeRepository.tDelete(Long.valueOf(id));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
+    public SDTWOTYPEEntity findOne(Long id){
+        return sdtwotypeRepository.findOne(id);
+    }
+
+    @Transactional
+    public int tUpdate(SDTWOTYPEEntity sd){
+        return sdtwotypeRepository.tUpdate(sd.getId(), sd.getTwo_type_name(), sd.getBig_type_id(), sd.getTwo_type_order());
+    }
+
+}

+package com.agent.vo.agent;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/8/9 15:30
+ */
+public class SdBigTypeVo {
+
+    private Long id;
+
+    /**
+     * 类型名称
+     */
+    private String type_name;
+
+    /**
+     * 排序字段  默认为0
+     */
+    private String type_order;
+
+    public String getType_name() {
+        return type_name;
+    }
+
+    public void setType_name(String type_name) {
+        this.type_name = type_name;
+    }
+
+    public String getType_order() {
+        return type_order;
+    }
+
+    public void setType_order(String type_order) {
+        this.type_order = type_order;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

+package com.agent.vo.agent;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/8/12 09:34
+ */
+public class SdTwoTypeVo {
+
+    private Long id;
+
+    private String two_type_name;
+
+    private Long big_type_id;
+
+    private String two_type_order;
+
+    private String cargo_name;
+
+    private Long cargo_name_id;
+
+    private String bigName;
+
+    public String getBigName() {
+        return bigName;
+    }
+
+    public void setBigName(String bigName) {
+        this.bigName = bigName;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTwo_type_name() {
+        return two_type_name;
+    }
+
+    public void setTwo_type_name(String two_type_name) {
+        this.two_type_name = two_type_name;
+    }
+
+    public Long getBig_type_id() {
+        return big_type_id;
+    }
+
+    public void setBig_type_id(Long big_type_id) {
+        this.big_type_id = big_type_id;
+    }
+
+    public String getTwo_type_order() {
+        return two_type_order;
+    }
+
+    public void setTwo_type_order(String two_type_order) {
+        this.two_type_order = two_type_order;
+    }
+
+    public String getCargo_name() {
+        return cargo_name;
+    }
+
+    public void setCargo_name(String cargo_name) {
+        this.cargo_name = cargo_name;
+    }
+
+    public Long getCargo_name_id() {
+        return cargo_name_id;
+    }
+
+    public void setCargo_name_id(Long cargo_name_id) {
+        this.cargo_name_id = cargo_name_id;
+    }
+}

@@ -82,6 +82,8 @@
                             <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.wbm" />||wbm/list',this)"><spring:message code="menu.wbm" /></a></li>
                             <li><a href="javascript:void(0);" onclick="addTab('<spring:message code="hz.info" />||hzinfo/list',this)"><spring:message code="hz.info" /></a></li>
                             <li><a href="javascript:void(0);" onclick="addTab('<spring:message code="hz.info" />||hzinfo/list',this)"><spring:message code="hz.info" /></a></li>
                             <li><a href="javascript:void(0);" onclick="addTab('货量统计||cargo/list',this)">货量统计</a></li>
                             <li><a href="javascript:void(0);" onclick="addTab('货量统计||cargo/list',this)">货量统计</a></li>
+                            <li><a href="javascript:void(0);" onclick="addTab('一级类管理||type/list',this)">一级类管理</a></li>
+                            <li><a href="javascript:void(0);" onclick="addTab('二级类管理||type/tlist',this)">二级类管理</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> --%>
                                 <%-- <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>
                         </ul>
                     </li>
                     </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="货主信息管理"
+               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="type_name">名称</th>
+                <%--<th field="type_order">排序字段</th>--%>
+            </tr>
+            </thead>
+        </table>
+        <div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc">
+            <form id="searchForm">
+                <table class="search_form_table">
+                    <a href="javascript:doSave()" 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(){
+        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 %>type/grid.json',
+            //queryParams:$("#searchForm").serializeJson(),
+            pageNumber:getPageNumber(),
+            view: detailview,
+            detailFormatter:function(index,row){
+                return '<div id="ddv-' + index + '"style="padding:5px 0"></div>';
+            }
+        });
+    });
+
+    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="updateType('+row.id+')" lay-event="choose"><i class="iconfont">&#xe65a;</i></a>'
+        return html;
+    }
+
+
+    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 doSave() {
+        layer.open({
+            type : 2,
+            title : '新增',
+            maxmin : true,
+            shadeClose : false, // 点击遮罩关闭层
+            area : [ '700px', '350px' ],
+            content : '<%=basePath %>type/add'
+        });
+    }
+
+    function updateType(id) {
+        // iframe层
+        layer.open({
+            type : 2,
+            title : '修改一级类',
+            maxmin : true,
+            shadeClose : false, // 点击遮罩关闭层
+            area : [ '450px', '300px' ],
+            content : '<%=basePath %>type/edit?id='+id
+        });
+    }
+
+    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 %>hzinfo/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 %>hzinfo/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()+"-")
+        }
+    })
+
+    function getIds() {
+        var ids = [];
+        var rows = $("#dg").datagrid('getChecked');
+        $.each(rows,function(key,v){
+            ids.push(v.id);
+        });
+        return ids;
+    }
+
+    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 %>type/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 %>type/list";
+                    })
+                }else{
+                    layer.open({content:"<spring:message code="opt.delfailed" />!"});
+                }
+            },"json");
+
+        });
+    }
+
+</script>
+</body>
+</html>
+
+

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ 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 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">
+    <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>
+    <link rel="stylesheet" href="<%=basePath %>resource/css/form.css">
+    <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">
+                      <table class="kv-table">
+                          <tbody>
+                          <tr>
+                              <td class="kv-label">名称</td>
+                              <td class="kv-content">
+                                  <input id="type_name" name="type_name" type="text" required/>
+                              </td>
+                          </tr>
+                          <%--<tr>--%>
+                              <%--<td class="kv-label">排序字段</td>--%>
+                              <%--<td class="kv-content">--%>
+                                  <%--<input  id="type_order" name="type_order" type="text" />--%>
+                              <%--</td>--%>
+                          <%--</tr>--%>
+                          <tr>
+                              <td colspan="6">
+                                  <div class="opt-buttons" style="padding-top:20px;">
+                                      <button type="submit" class="easyui-linkbutton l-btn l-btn-small l-btn-selected " data-options="selected:true">
+                                          <span class="l-btn-left"><span class="l-btn-text"><spring:message code="opt.save" /></span></span>
+                                      </button>
+                                  </div>
+                              </td>
+                          </tr>
+                          </tbody>
+                      </table>
+               </form>
+		</div>
+	</div>
+	<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+    <script src="<%=basePath %>resource/js/tools.js"></script>
+	<script type="text/javascript">
+        $("#form").validate({
+            submitHandler:function(form){
+                submit();
+            }
+        });
+
+        var selectFals = false;
+	    function submit(){
+            // if (selectFals == true){
+                var data = $("#form").serialize();
+                $.post("<%=basePath%>type/bigSave",data,function(data){
+                    if(data.status==200){
+                        layer.confirm("<spring:message code="opt.savesuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                            var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                            parent.layer.close(index);
+                            window.parent.location.reload();
+                        })
+                    }else if (data.status == 201){
+                        alert("名称不可以重复")
+                    }else {
+                        alert("网络异常")
+                    }
+                })
+            // }else {
+	         //    alert("货主类型至少选择一项");
+	         //    return false;
+            // }
+	    }
+	</script>
+</body> 
+</html>

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ 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 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">
+    <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>
+    <link rel="stylesheet" href="<%=basePath %>resource/css/form.css">
+    <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">
+                      <table class="kv-table">
+                          <tbody>
+                          <tr>
+                              <td class="kv-label">
+                                  一级类名称<span class="required_span">*</span>
+                              </td>
+                              <td class="kv-content">
+                                  <select  id="big_type_id" name="big_type_id">
+                                      <%--<option value="">无</option>--%>
+                                      <c:forEach items="${big}" var="big">
+                                          <option value="${big.id}">${big.type_name}</option>
+                                      </c:forEach>
+                                  </select>
+                              </td>
+                          </tr>
+                          <tr>
+                              <td class="kv-label">
+                                  二级名称<span class="required_span">*</span>
+                              </td>
+                              <td class="kv-content">
+                                  <input  id="two_type_name" name="two_type_name" type="text" required/>
+                              </td>
+                          </tr>
+                          <tr>
+                              <td class="kv-label">
+                                  货物名称<span class="required_span">*</span>
+                              </td>
+                              <td class="kv-content">
+                                  <select  id="cargo_name" name="cargo_name">
+                                      <%--<option value="">无</option>--%>
+                                      <c:forEach items="${cargo}" var="cargo">
+                                          <option value="${cargo}">${cargo}</option>
+                                      </c:forEach>
+                                  </select>
+                              </td>
+                          </tr>
+                          <%--<tr>--%>
+                              <%--<td class="kv-label">排序字段</td>--%>
+                              <%--<td class="kv-content">--%>
+                                  <%--<input  id="two_type_order" name="two_type_order" type="text"/>--%>
+                              <%--</td>--%>
+                          <%--</tr>--%>
+                          <tr>
+                              <td colspan="6">
+                                  <div class="opt-buttons" style="padding-top:20px;">
+                                      <button type="submit" class="easyui-linkbutton l-btn l-btn-small l-btn-selected " data-options="selected:true">
+                                          <span class="l-btn-left"><span class="l-btn-text"><spring:message code="opt.save" /></span></span>
+                                      </button>
+                                  </div>
+                              </td>
+                          </tr>
+                          </tbody>
+                      </table>
+               </form>
+		</div>
+	</div>
+	<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+    <script src="<%=basePath %>resource/js/tools.js"></script>
+	<script type="text/javascript">
+        $("#form").validate({
+            submitHandler:function(form){
+                submit();
+            }
+        });
+
+        var selectFals = false;
+	    function submit(){
+            // if (selectFals == true){
+                var data = $("#form").serialize();
+                $.post("<%=basePath%>type/twoSave",data,function(data){
+                    if(data.status==200){
+                        layer.confirm("<spring:message code="opt.savesuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                            var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                            parent.layer.close(index);
+                            window.parent.location.reload();
+                        })
+                    }else {
+                        alert("网络异常")
+                    }
+                })
+
+	    }
+	</script>
+</body> 
+</html>

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ 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 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">
+    <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>
+    <link rel="stylesheet" href="<%=basePath %>resource/css/form.css">
+    <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="${one.id}">
+                      <table class="kv-table">
+                          <tbody>
+                              <tr>
+                                  <td class="kv-label">
+                                      一级类名称<span class="required_span">*</span>
+                                  </td>
+                                  <td class="kv-content">
+                                      <select  id="big_type_id" name="big_type_id">
+                                          <%--<option value="">无</option>--%>
+                                          <c:forEach items="${big}" var="big">
+                                              <option value="${big.id}" ${big.id eq one.big_type_id?"selected":""} >${big.type_name}</option>
+                                          </c:forEach>
+                                      </select>
+                                  </td>
+                              </tr>
+
+                              <tr>
+                                  <td class="kv-label">
+                                      二级名称<span class="required_span">*</span>
+                                  </td>
+                                  <td class="kv-content">
+                                      <input  id="two_type_name" name="two_type_name" value="${one.two_type_name}" type="text" required/>
+                                  </td>
+                              </tr>
+                              <%--<tr>--%>
+                                  <%--<td class="kv-label">排序字段</td>--%>
+                                  <%--<td class="kv-content">--%>
+                                      <%--<input  id="two_type_order" name="two_type_order" value="${one.two_type_order}" type="text" required/>--%>
+                                  <%--</td>--%>
+                              <%--</tr>--%>
+                              <tr>
+                                  <td colspan="6">
+                                      <div class="opt-buttons" style="padding-top:20px;">
+                                          <button type="submit" class="easyui-linkbutton l-btn l-btn-small l-btn-selected " data-options="selected:true">
+                                              <span class="l-btn-left"><span class="l-btn-text"><spring:message code="opt.save" /></span></span>
+                                          </button>
+                                      </div>
+                                  </td>
+                              </tr>
+                          </tbody>
+                      </table>
+               </form>
+		</div>
+	</div>
+	<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+    <script src="<%=basePath %>resource/js/tools.js"></script>
+	<script type="text/javascript">
+        $("#form").validate({
+            submitHandler:function(form){
+                submit();
+            }
+        });
+
+        $(function () {
+            $("#form").find("input[type=checkbox]").bind("click", function () {
+                //当前checkbox是否选中
+                if (this.checked){
+                    //除当前的checkbox其他不选中
+                    $("#form").find("input[type=checkbox]").not(this).attr("checked", false);
+                }
+            })
+        })
+
+
+        function submit(){
+
+            var data = $("#form").serialize();
+            $.post("<%=basePath%>type/tupdate",data,function(data){
+                if(data.status==200){
+                    layer.confirm("修改成功!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                        var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(index);
+                        window.parent.location.reload();
+                    })
+                }else if (data.status == 201){
+                    layer.open({content:"名称不能重复"});
+                }else {
+                    layer.open({content:"网络异常!"});
+                }
+            })
+
+        }
+	</script>
+</body> 
+</html>

+<%--
+  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="货主信息管理"
+               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="bigName">一级类名称</th>
+                <th field="two_type_name">二级类名称</th>
+                <th field="cargo_name">货物品名</th>
+                <%--<th field="two_type_order">排序字段</th>--%>
+            </tr>
+            </thead>
+        </table>
+        <div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc">
+            <form id="searchForm">
+                <table class="search_form_table">
+                    <a href="javascript:doSave()" 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(){
+        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 %>type/twogrid.json',
+            //queryParams:$("#searchForm").serializeJson(),
+            pageNumber:getPageNumber(),
+            view: detailview,
+            detailFormatter:function(index,row){
+                return '<div id="ddv-' + index + '"style="padding:5px 0"></div>';
+            }
+        });
+    });
+
+    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="tUpdate('+row.id+')" lay-event="choose"><i class="iconfont">&#xe65a;</i></a>'
+        return html;
+    }
+
+
+    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 doSave() {
+        layer.open({
+            type : 2,
+            title : '新增',
+            maxmin : true,
+            shadeClose : false, // 点击遮罩关闭层
+            area : [ '1000px', '500px' ],
+            content : '<%=basePath %>type/tadd'
+        });
+    }
+
+    function tUpdate(id) {
+        // iframe层
+        layer.open({
+            type : 2,
+            title : '修改一级类',
+            maxmin : true,
+            shadeClose : false, // 点击遮罩关闭层
+            area : [ '1000px', '500px' ],
+            content : '<%=basePath %>type/tedit?id='+id
+        });
+    }
+
+
+    $("#manifnum").keyup(function(){
+        var leng =  $("#manifnum").val().length;
+        if (leng == 3)
+        {
+            $("#manifnum").val( $("#manifnum").val()+"-")
+        }
+    })
+
+    function getIds() {
+        var ids = [];
+        var rows = $("#dg").datagrid('getChecked');
+        $.each(rows,function(key,v){
+            ids.push(v.id);
+        });
+        return ids;
+    }
+
+    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 %>type/tdelete",{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 %>type/tlist";
+                    })
+                }else{
+                    layer.open({content:"<spring:message code="opt.delfailed" />!"});
+                }
+            },"json");
+
+        });
+    }
+
+</script>
+</body>
+</html>
+
+

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ 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 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">
+    <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>
+    <link rel="stylesheet" href="<%=basePath %>resource/css/form.css">
+    <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="${big.id}">
+                      <table class="kv-table">
+                          <tbody>
+                              <tr>
+                                  <td class="kv-label">名称</td>
+                                  <td class="kv-content">
+                                      <input id="type_name" name="type_name" type="text" value="${big.type_name}" required/>
+                                  </td>
+                              </tr>
+
+                              <%--<tr>--%>
+                                  <%--<td class="kv-label">排序字段</td>--%>
+                                  <%--<td class="kv-content">--%>
+                                      <%--<input  id="type_order" name="type_order" type="text" value="${big.type_order}"/>--%>
+                                  <%--</td>--%>
+                              <%--</tr>--%>
+                              <tr>
+                                  <td colspan="6">
+                                      <div class="opt-buttons" style="padding-top:20px;">
+                                          <button type="submit" class="easyui-linkbutton l-btn l-btn-small l-btn-selected " data-options="selected:true">
+                                              <span class="l-btn-left"><span class="l-btn-text"><spring:message code="opt.save" /></span></span>
+                                          </button>
+                                      </div>
+                                  </td>
+                              </tr>
+                          </tbody>
+                      </table>
+               </form>
+		</div>
+	</div>
+	<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+    <script src="<%=basePath %>resource/js/tools.js"></script>
+	<script type="text/javascript">
+        $("#form").validate({
+            submitHandler:function(form){
+                submit();
+            }
+        });
+
+        $(function () {
+            $("#form").find("input[type=checkbox]").bind("click", function () {
+                //当前checkbox是否选中
+                if (this.checked){
+                    //除当前的checkbox其他不选中
+                    $("#form").find("input[type=checkbox]").not(this).attr("checked", false);
+                }
+            })
+        })
+
+
+        function submit(){
+
+            var data = $("#form").serialize();
+            $.post("<%=basePath%>type/update",data,function(data){
+                if(data.status==200){
+                    layer.confirm("修改成功!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                        var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(index);
+                        window.parent.location.reload();
+                    })
+                }else if (data.status == 201){
+                    layer.open({content:"名称不能重复"});
+                }else {
+                    layer.open({content:"网络异常!"});
+                }
+            })
+
+        }
+	</script>
+</body> 
+</html>