朱兆平 / agent · 提交

转到一个项目

作者 Kevin
提交 766f4b9a2b733ade00d5e686648dfd8826d2a36e 1 个父辈 6f1bce26

收发货人按用户查询，预配按账户查询，管理员可以查看所有预配运单；预配列表增加海关关区字段。

内嵌 并排对比
正在显示 38 个修改的文件 包含 1727 行增加 和 633 行删除
1 package com.agent.controller.agent; 1 package com.agent.controller.agent;
2 2
3 import java.util.List; 3 import java.util.List;
4 -import java.util.Map;  
5 4
6 import javax.annotation.Resource; 5 import javax.annotation.Resource;
7 import javax.servlet.http.HttpServletRequest; 6 import javax.servlet.http.HttpServletRequest;
@@ -16,10 +15,12 @@ import com.agent.entity.agent.ConsigneeEntity; @@ -16,10 +15,12 @@ import com.agent.entity.agent.ConsigneeEntity;
16 import com.agent.service.agent.ConsigneeService; 15 import com.agent.service.agent.ConsigneeService;
17 import com.agent.util.HttpJsonMsg; 16 import com.agent.util.HttpJsonMsg;
18 import com.agent.vo.ResponseModel; 17 import com.agent.vo.ResponseModel;
19 -import com.framework.core.Servlets;  
20 import com.plugin.easyui.DataGrid; 18 import com.plugin.easyui.DataGrid;
21 import com.plugin.easyui.EasyPage; 19 import com.plugin.easyui.EasyPage;
22 20
  21 +import tools.NumKit;
  22 +import tools.Tools;
  23 +
23 @Controller 24 @Controller
24 public class ConsigneeController extends BasicController{ 25 public class ConsigneeController extends BasicController{
25 26
@@ -30,9 +31,23 @@ public class ConsigneeController extends BasicController{ @@ -30,9 +31,23 @@ public class ConsigneeController extends BasicController{
30 @RequestMapping(value = "consignee/grid.json") 31 @RequestMapping(value = "consignee/grid.json")
31 @ResponseBody 32 @ResponseBody
32 public DataGrid<ConsigneeEntity> consignee_grid_json(HttpServletRequest request, EasyPage<ConsigneeEntity> pageForm){ 33 public DataGrid<ConsigneeEntity> consignee_grid_json(HttpServletRequest request, EasyPage<ConsigneeEntity> pageForm){
33 - Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");  
34 - pageForm.setSearchParams(searchParams);  
35 - pageForm.parseData(consigneeService.getPage(pageForm)); 34 +// Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
  35 +// pageForm.setSearchParams(searchParams);
  36 +// pageForm.parseData(consigneeService.getPage(pageForm));
  37 +// return pageForm.getData();
  38 +
  39 + int page = NumKit.parseString2Int(request.getParameter("page"));
  40 + page = page<1?1:page;
  41 + int rows = NumKit.parseString2Int(request.getParameter("rows"));
  42 + rows = rows<1?10:rows;
  43 +
  44 + List<ConsigneeEntity> list = consigneeService.list(page, rows);
  45 + pageForm.setPage(page);
  46 + pageForm.setRows(rows);
  47 + DataGrid<ConsigneeEntity> data = new DataGrid<>();
  48 + data.setRows(list);
  49 + data.setTotal(consigneeService.total(Tools.getUserId()));
  50 + pageForm.setData(data );
36 return pageForm.getData(); 51 return pageForm.getData();
37 } 52 }
38 @RequestMapping(value="consignee/edit") 53 @RequestMapping(value="consignee/edit")
@@ -80,7 +95,6 @@ public class ConsigneeController extends BasicController{ @@ -80,7 +95,6 @@ public class ConsigneeController extends BasicController{
80 public ResponseModel consignee_save(HttpServletRequest request, ConsigneeEntity consignee){ 95 public ResponseModel consignee_save(HttpServletRequest request, ConsigneeEntity consignee){
81 ResponseModel model = new ResponseModel(200, "", null); 96 ResponseModel model = new ResponseModel(200, "", null);
82 consigneeService.save(consignee); 97 consigneeService.save(consignee);
83 -  
84 return model; 98 return model;
85 } 99 }
86 100
@@ -75,7 +75,7 @@ public class ConsignorController extends BasicController { @@ -75,7 +75,7 @@ public class ConsignorController extends BasicController {
75 } else { 75 } else {
76 model = new ResponseModel(200, "", null); 76 model = new ResponseModel(200, "", null);
77 } 77 }
78 - model.setCount(service.count()); 78 + model.setCount(service.total(Tools.getUserId()));
79 model.setData(dataList); 79 model.setData(dataList);
80 return model; 80 return model;
81 } 81 }
@@ -117,6 +117,8 @@ public class ConsignorController extends BasicController { @@ -117,6 +117,8 @@ public class ConsignorController extends BasicController {
117 if (consignor != null) { 117 if (consignor != null) {
118 ConsignorEntity old = service.findByCompanyAndUserId(consignor.getCo_company(),Tools.getUserId()); 118 ConsignorEntity old = service.findByCompanyAndUserId(consignor.getCo_company(),Tools.getUserId());
119 if (old == null) { 119 if (old == null) {
  120 + consignor.setCreator(Tools.getUserEntity());
  121 + consignor.setModifier(Tools.getUserEntity());
120 service.save(consignor); 122 service.save(consignor);
121 model = new ResponseModel(200, "操作成功", null); 123 model = new ResponseModel(200, "操作成功", null);
122 } else { 124 } else {
  1 +package com.agent.controller.agent;
  2 +
  3 +import java.util.List;
  4 +
  5 +import javax.annotation.Resource;
  6 +import javax.servlet.http.HttpServletRequest;
  7 +
  8 +import org.springframework.stereotype.Controller;
  9 +import org.springframework.web.bind.annotation.RequestMapping;
  10 +import org.springframework.web.bind.annotation.ResponseBody;
  11 +
  12 +import com.agent.controller.BasicController;
  13 +import com.agent.entity.agent.EnterpriseEntity;
  14 +import com.agent.service.agent.EnterpriseService;
  15 +import com.agent.vo.ResponseModel;
  16 +import com.plugin.easyui.DataGrid;
  17 +
  18 +@Controller
  19 +@RequestMapping(value = "/enterprise")
  20 +public class EnterpriseController extends BasicController {
  21 +
  22 + @Resource
  23 + private EnterpriseService service;
  24 +
  25 + @RequestMapping(value = "/search")
  26 + @ResponseBody
  27 + public DataGrid<EnterpriseEntity> search(HttpServletRequest request, String start) {
  28 + DataGrid<EnterpriseEntity> dg = new DataGrid<>();
  29 + List<EnterpriseEntity> dataList = service.search(start);
  30 + dg.setRows(dataList);
  31 + return dg;
  32 + }
  33 +
  34 + @RequestMapping(value = "/list")
  35 + @ResponseBody
  36 + public ResponseModel list(HttpServletRequest request, String countryCode) {
  37 + ResponseModel model = new ResponseModel(200, "", null);
  38 +
  39 + List<EnterpriseEntity> dataList = service.findTypeByCountryCode(countryCode);
  40 + if (dataList == null || dataList.size() == 0) {
  41 + model = new ResponseModel(404, "", null);
  42 + } else {
  43 + model = new ResponseModel(200, "", null);
  44 + }
  45 + model.setData(dataList);
  46 +
  47 + return model;
  48 + }
  49 +
  50 +}
@@ -50,6 +50,7 @@ import com.agent.service.agent.PubDgService; @@ -50,6 +50,7 @@ import com.agent.service.agent.PubDgService;
50 import com.agent.service.agent.TBasCarrierService; 50 import com.agent.service.agent.TBasCarrierService;
51 import com.agent.service.agent.WaybillReceiptService; 51 import com.agent.service.agent.WaybillReceiptService;
52 import com.agent.service.system.RoleService; 52 import com.agent.service.system.RoleService;
  53 +import com.agent.smb.RemoteFileKit;
53 import com.agent.util.HttpJsonMsg; 54 import com.agent.util.HttpJsonMsg;
54 import com.agent.vo.ResponseModel; 55 import com.agent.vo.ResponseModel;
55 import com.agent.vo.agent.CommodityVo; 56 import com.agent.vo.agent.CommodityVo;
@@ -78,6 +79,7 @@ import com.alibaba.fastjson.JSONArray; @@ -78,6 +79,7 @@ import com.alibaba.fastjson.JSONArray;
78 import com.alibaba.fastjson.JSONObject; 79 import com.alibaba.fastjson.JSONObject;
79 import com.framework.core.Servlets; 80 import com.framework.core.Servlets;
80 import com.framework.shiro.SessionUtil; 81 import com.framework.shiro.SessionUtil;
  82 +import com.framework.util.CustomMessageKit;
81 import com.plugin.easyui.DataGrid; 83 import com.plugin.easyui.DataGrid;
82 import com.plugin.easyui.EasyPage; 84 import com.plugin.easyui.EasyPage;
83 85
@@ -155,9 +157,12 @@ public class ManifestController extends BasicController { @@ -155,9 +157,12 @@ public class ManifestController extends BasicController {
155 // response.setDateHeader("Expires", 0); 157 // response.setDateHeader("Expires", 0);
156 158
157 Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_"); 159 Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
  160 + if (Tools.getUserId() != null && Tools.getUserId() != 1) {
  161 + // 不是管理员,添加用户id的条件
158 searchParams.put("EQ_USER_ID", Tools.getUserId()); 162 searchParams.put("EQ_USER_ID", Tools.getUserId());
  163 + }
159 pageForm.setSearchParams(searchParams); 164 pageForm.setSearchParams(searchParams);
160 - // 添加用户id的条件 165 +
161 pageForm.parseData(manifestService.getPage(pageForm)); 166 pageForm.parseData(manifestService.getPage(pageForm));
162 return pageForm.getData(); 167 return pageForm.getData();
163 } 168 }
@@ -434,8 +439,12 @@ public class ManifestController extends BasicController { @@ -434,8 +439,12 @@ public class ManifestController extends BasicController {
434 if (ue != null) { 439 if (ue != null) {
435 Long u = ue.getId(); 440 Long u = ue.getId();
436 Set<String> sk = pageForm.getSearchParams().keySet(); 441 Set<String> sk = pageForm.getSearchParams().keySet();
  442 +
  443 + if (Tools.getUserId() != null && Tools.getUserId() != 1) {
  444 + // 不是管理员,添加用户id的条件
437 pageForm.getSearchParams().put("EQ_USER_ID", u); 445 pageForm.getSearchParams().put("EQ_USER_ID", u);
438 } 446 }
  447 + }
439 448
440 pageForm.parseData(manifestService.getPage(pageForm)); 449 pageForm.parseData(manifestService.getPage(pageForm));
441 return pageForm.getData(); 450 return pageForm.getData();
@@ -451,7 +460,13 @@ public class ManifestController extends BasicController { @@ -451,7 +460,13 @@ public class ManifestController extends BasicController {
451 @RequestMapping(value = "/infor") 460 @RequestMapping(value = "/infor")
452 @ResponseBody 461 @ResponseBody
453 public List<ManifestEntity> infor(String id, Model model) { 462 public List<ManifestEntity> infor(String id, Model model) {
454 - List<ManifestEntity> li = manifestService.queryByUserId(Tools.getUserId()); 463 + List<ManifestEntity> li = null;
  464 + if(Tools.getUserId()!=null&&Tools.getUserId().longValue()==1) {
  465 + li = manifestService.queryAll();
  466 + }else {
  467 + li = manifestService.queryByUserId(Tools.getUserId());
  468 + }
  469 +
455 List<ManifestEntity> result = new FemyList(); 470 List<ManifestEntity> result = new FemyList();
456 for (ManifestEntity me : li) { 471 for (ManifestEntity me : li) {
457 if (result.contains(me)) { 472 if (result.contains(me)) {
@@ -751,7 +766,7 @@ public class ManifestController extends BasicController { @@ -751,7 +766,7 @@ public class ManifestController extends BasicController {
751 @RequestMapping(value = "/save", method = { RequestMethod.POST }) 766 @RequestMapping(value = "/save", method = { RequestMethod.POST })
752 @ResponseBody 767 @ResponseBody
753 public ResponseModel save(ManifestEntity manifest, HttpServletRequest reuqest) { 768 public ResponseModel save(ManifestEntity manifest, HttpServletRequest reuqest) {
754 - consignorService.saveFromManifest(manifest,Tools.getUserId()); 769 + consignorService.saveFromManifest(manifest, Tools.getUserId());
755 770
756 ResponseModel model = new ResponseModel(); 771 ResponseModel model = new ResponseModel();
757 try { 772 try {
@@ -759,12 +774,15 @@ public class ManifestController extends BasicController { @@ -759,12 +774,15 @@ public class ManifestController extends BasicController {
759 if (manifestService.isExistsByWaybill(manifest)) { 774 if (manifestService.isExistsByWaybill(manifest)) {
760 model.setMsg("该订单已存在！"); 775 model.setMsg("该订单已存在！");
761 model.setStatus(500); 776 model.setStatus(500);
  777 +
  778 + System.err.println("before manifest--> 该订单已存在！");
762 } else { 779 } else {
763 String stowagedate = reuqest.getParameter("stowagedate"); 780 String stowagedate = reuqest.getParameter("stowagedate");
764 manifest.setStowagedate(manifest.getStowagedate(stowagedate)); 781 manifest.setStowagedate(manifest.getStowagedate(stowagedate));
765 manifest.setSave_time(new Long(System.currentTimeMillis())); 782 manifest.setSave_time(new Long(System.currentTimeMillis()));
766 // 处理预配时间 783 // 处理预配时间
767 manifest = manifestService.save(manifest); 784 manifest = manifestService.save(manifest);
  785 +
768 model.setData(manifest); 786 model.setData(manifest);
769 model.setStatus(200); 787 model.setStatus(200);
770 model.setMsg(HttpJsonMsg.SUCCESS); 788 model.setMsg(HttpJsonMsg.SUCCESS);
@@ -835,7 +853,7 @@ public class ManifestController extends BasicController { @@ -835,7 +853,7 @@ public class ManifestController extends BasicController {
835 @RequestMapping(value = "/savesend", method = { RequestMethod.POST }) 853 @RequestMapping(value = "/savesend", method = { RequestMethod.POST })
836 @ResponseBody 854 @ResponseBody
837 public ResponseModel savesend(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) { 855 public ResponseModel savesend(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) {
838 - consignorService.saveFromManifest(manifest,Tools.getUserId()); 856 + consignorService.saveFromManifest(manifest, Tools.getUserId());
839 857
840 ResponseModel model = new ResponseModel(); 858 ResponseModel model = new ResponseModel();
841 try { 859 try {
@@ -859,22 +877,28 @@ public class ManifestController extends BasicController { @@ -859,22 +877,28 @@ public class ManifestController extends BasicController {
859 manifestService.save(manifest); 877 manifestService.save(manifest);
860 receiptService.saveFromManifest(manifest, type); 878 receiptService.saveFromManifest(manifest, type);
861 879
862 - System.out.println("收货人名称：" + manifest.getSh_name());  
863 - System.out.println("发货人名称：" + manifest.getCo_name());  
864 - System.out.println("-----------------id:" + manifest.getId());  
865 // 生成报文并且发送 880 // 生成报文并且发送
866 - String rootPath = request.getSession().getServletContext().getRealPath("/");  
867 - String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";  
868 - String ndlrxml = XmlUtil.convertToXml2(manifestService.sendNDLRXml(manifest), path);  
869 - String dlcfxml = XmlUtil.convertToXml2(manifestService.sendDLCFXml(manifest), path);  
870 - String slifxml = XmlUtil.convertToXml(FSXmlKit.sliXml(manifest));  
871 -// System.err.println("===================ndlrxml===================");  
872 -// System.err.println(ndlrxml);  
873 -// System.err.println();  
874 -//  
875 -// System.err.println("===================dlcfxml===================");  
876 -// System.err.println(dlcfxml);  
877 -// System.err.println(); 881 + // String rootPath = request.getSession().getServletContext().getRealPath("/");
  882 + // String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
  883 + String ndlrPath = CustomMessageKit.getMessagePath("ndlr");
  884 + String dlcPath = CustomMessageKit.getMessagePath("dlc");
  885 + String sliPath = CustomMessageKit.getMessagePath("sli");
  886 +
  887 + String ndlrxml = XmlUtil.convertToXml2(manifestService.sendNDLRXml(manifest), ndlrPath);
  888 + String dlcfxml = XmlUtil.convertToXml2(manifestService.sendDLCFXml(manifest), dlcPath);
  889 + String slifxml = XmlUtil.convertToXml2(FSXmlKit.sliXml(manifest), sliPath);
  890 +
  891 + RemoteFileKit.putFile(ndlrPath);
  892 + RemoteFileKit.putFile(dlcPath);
  893 + RemoteFileKit.putFile(sliPath);
  894 +
  895 + // System.err.println("===================ndlrxml===================");
  896 + // System.err.println(ndlrxml);
  897 + // System.err.println();
  898 + //
  899 + // System.err.println("===================dlcfxml===================");
  900 + // System.err.println(dlcfxml);
  901 + // System.err.println();
878 902
879 System.err.println("===================slifxml==================="); 903 System.err.println("===================slifxml===================");
880 System.err.println(slifxml); 904 System.err.println(slifxml);
@@ -884,6 +908,7 @@ public class ManifestController extends BasicController { @@ -884,6 +908,7 @@ public class ManifestController extends BasicController {
884 new RedisSaveMessage().saveMessage(dlcfxml); 908 new RedisSaveMessage().saveMessage(dlcfxml);
885 new RedisSaveMessage().saveMessage(slifxml); 909 new RedisSaveMessage().saveMessage(slifxml);
886 910
  911 + model.setData(manifest);
887 model.setStatus(200); 912 model.setStatus(200);
888 model.setMsg(HttpJsonMsg.SUCCESS); 913 model.setMsg(HttpJsonMsg.SUCCESS);
889 } 914 }
@@ -967,7 +992,7 @@ public class ManifestController extends BasicController { @@ -967,7 +992,7 @@ public class ManifestController extends BasicController {
967 @RequestMapping(value = "/sub_save", method = { RequestMethod.POST }) 992 @RequestMapping(value = "/sub_save", method = { RequestMethod.POST })
968 @ResponseBody 993 @ResponseBody
969 public ResponseModel sub_save(PreparesecondaryEntity preparesecondary) { 994 public ResponseModel sub_save(PreparesecondaryEntity preparesecondary) {
970 - consignorService.saveFromPreparesecondary(preparesecondary,Tools.getUserId()); 995 + consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
971 996
972 ResponseModel model = new ResponseModel(); 997 ResponseModel model = new ResponseModel();
973 try { 998 try {
@@ -1035,7 +1060,7 @@ public class ManifestController extends BasicController { @@ -1035,7 +1060,7 @@ public class ManifestController extends BasicController {
1035 @RequestMapping(value = "/presavesend", method = { RequestMethod.POST }) 1060 @RequestMapping(value = "/presavesend", method = { RequestMethod.POST })
1036 @ResponseBody 1061 @ResponseBody
1037 public ResponseModel presavesend(PreparesecondaryEntity preparesecondary, HttpServletRequest request) { 1062 public ResponseModel presavesend(PreparesecondaryEntity preparesecondary, HttpServletRequest request) {
1038 - consignorService.saveFromPreparesecondary(preparesecondary,Tools.getUserId()); 1063 + consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
1039 1064
1040 ResponseModel model = new ResponseModel(); 1065 ResponseModel model = new ResponseModel();
1041 try { 1066 try {
@@ -1050,39 +1075,47 @@ public class ManifestController extends BasicController { @@ -1050,39 +1075,47 @@ public class ManifestController extends BasicController {
1050 1075
1051 String stowagedate = request.getParameter("stowagedate"); 1076 String stowagedate = request.getParameter("stowagedate");
1052 preparesecondary.setStowagedate(preparesecondary.getStowagedate(stowagedate)); 1077 preparesecondary.setStowagedate(preparesecondary.getStowagedate(stowagedate));
  1078 + preparesecondary.setIsdelete(1);
  1079 + preparesecondary.setResponse_code(String.valueOf(type.getValue()));
  1080 + preparesecondary.setResponse_text("分单——" + type.getName());
  1081 + preparesecondaryServer.save(preparesecondary);
  1082 + receiptService.saveFromPreparesecondary(preparesecondary, type);
  1083 +
1053 // 生成报文并且发送 1084 // 生成报文并且发送
1054 - String rootPath = request.getSession().getServletContext().getRealPath("/");  
1055 - String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";  
1056 - String ndlrxml = XmlUtil.convertToXml2(manifestService.presenddlcfNdlrXml(preparesecondary), path);  
1057 - String dlcfxml = XmlUtil.convertToXml2(manifestService.presenddlcfdlcfXml(preparesecondary), path);  
1058 - String fhlfxml = XmlUtil.convertToXml(FSXmlKit.fhlXml(preparesecondary)); 1085 + // String rootPath = request.getSession().getServletContext().getRealPath("/");
  1086 + // String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
  1087 + String ndlrPath = CustomMessageKit.getMessagePath("ndlr");
  1088 + String dlcPath = CustomMessageKit.getMessagePath("dlc");
  1089 + String fhlPath = CustomMessageKit.getMessagePath("fhl");
  1090 +
  1091 + String ndlrxml = XmlUtil.convertToXml2(manifestService.presenddlcfNdlrXml(preparesecondary), ndlrPath);
  1092 + String dlcfxml = XmlUtil.convertToXml2(manifestService.presenddlcfdlcfXml(preparesecondary), dlcPath);
  1093 + String fhlfxml = XmlUtil.convertToXml2(FSXmlKit.fhlXml(preparesecondary), fhlPath);
  1094 +
  1095 + RemoteFileKit.putFile(ndlrPath);
  1096 + RemoteFileKit.putFile(dlcPath);
  1097 + RemoteFileKit.putFile(fhlPath);
  1098 +
1059 // 发送redis储存数据 1099 // 发送redis储存数据
1060 - // System.out.println(ndlrxml);  
1061 new RedisSaveMessage().saveMessage(ndlrxml); 1100 new RedisSaveMessage().saveMessage(ndlrxml);
1062 new RedisSaveMessage().saveMessage(dlcfxml); 1101 new RedisSaveMessage().saveMessage(dlcfxml);
1063 new RedisSaveMessage().saveMessage(fhlfxml); 1102 new RedisSaveMessage().saveMessage(fhlfxml);
1064 1103
1065 - model.setData(preparesecondary);  
1066 - model.setStatus(200);  
1067 - model.setMsg(HttpJsonMsg.SUCCESS); 1104 + System.out.println("===================ndlrxml===================");
  1105 + System.out.println(ndlrxml);
  1106 + System.out.println();
1068 1107
1069 -// System.out.println("===================ndlrxml===================");  
1070 -// System.out.println(ndlrxml);  
1071 -// System.out.println();  
1072 -//  
1073 -// System.out.println("===================dlcfxml===================");  
1074 -// System.err.println(dlcfxml);  
1075 -// System.out.println(); 1108 + System.out.println("===================dlcfxml===================");
  1109 + System.err.println(dlcfxml);
  1110 + System.out.println();
1076 1111
1077 System.out.println("===================fhlfxml==================="); 1112 System.out.println("===================fhlfxml===================");
1078 System.err.println(fhlfxml); 1113 System.err.println(fhlfxml);
1079 System.out.println(); 1114 System.out.println();
1080 1115
1081 - preparesecondary.setIsdelete(1);  
1082 - preparesecondary.setResponse_code(String.valueOf(type.getValue()));  
1083 - preparesecondary.setResponse_text("分单——" + type.getName());  
1084 - preparesecondaryServer.save(preparesecondary);  
1085 - receiptService.saveFromPreparesecondary(preparesecondary, type); 1116 + model.setData(preparesecondary);
  1117 + model.setStatus(200);
  1118 + model.setMsg(HttpJsonMsg.SUCCESS);
1086 1119
1087 } 1120 }
1088 } catch (Exception e) { 1121 } catch (Exception e) {
1 package com.agent.controller.agent; 1 package com.agent.controller.agent;
2 2
  3 +import java.util.Date;
3 import java.util.List; 4 import java.util.List;
4 5
5 import javax.annotation.Resource; 6 import javax.annotation.Resource;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
13 import org.springframework.web.bind.annotation.RequestMethod; 14 import org.springframework.web.bind.annotation.RequestMethod;
14 import org.springframework.web.bind.annotation.ResponseBody; 15 import org.springframework.web.bind.annotation.ResponseBody;
15 16
  17 +import com.agent.entity.Constant;
16 import com.agent.entity.agent.ManifestEntity; 18 import com.agent.entity.agent.ManifestEntity;
17 import com.agent.entity.agent.PreparesecondaryEntity; 19 import com.agent.entity.agent.PreparesecondaryEntity;
18 import com.agent.entity.agent.WaybillReceiprtEntity; 20 import com.agent.entity.agent.WaybillReceiprtEntity;
@@ -56,7 +58,7 @@ public class ReceiptController { @@ -56,7 +58,7 @@ public class ReceiptController {
56 WaybillReceiprtEntity wre = null; 58 WaybillReceiprtEntity wre = null;
57 if (StringUtils.isNoneBlank(waybillNo) && StringUtils.isBlank(waybillNoSub)) { 59 if (StringUtils.isNoneBlank(waybillNo) && StringUtils.isBlank(waybillNoSub)) {
58 // 主单报文 60 // 主单报文
59 - List<ManifestEntity> list = manifestService.findByMawbNo(waybillNo); 61 + List<ManifestEntity> list = manifestService.findByManifestNo(waybillNo);
60 if (list != null && list.size() > 0) { 62 if (list != null && list.size() > 0) {
61 ManifestEntity bean = list.get(0); 63 ManifestEntity bean = list.get(0);
62 bean.setResponse_code(response_code); 64 bean.setResponse_code(response_code);
@@ -70,7 +72,7 @@ public class ReceiptController { @@ -70,7 +72,7 @@ public class ReceiptController {
70 wre.setMessage_type("MT2201"); 72 wre.setMessage_type("MT2201");
71 wre.setResponse_code(response_code); 73 wre.setResponse_code(response_code);
72 wre.setResponse_text(response_text); 74 wre.setResponse_text(response_text);
73 - wre.setSendtime(sendTime); 75 + wre.setSendtime(sendTime!=null?sendTime:Constant.dateTimeFormat.format(new Date()));
74 wre.setWaybill_no(bean.getWaybillnomaster()); 76 wre.setWaybill_no(bean.getWaybillnomaster());
75 wre.setCreator(Tools.getUserEntity()); 77 wre.setCreator(Tools.getUserEntity());
76 wre.setModifier(Tools.getUserEntity()); 78 wre.setModifier(Tools.getUserEntity());
@@ -100,7 +102,7 @@ public class ReceiptController { @@ -100,7 +102,7 @@ public class ReceiptController {
100 wre.setMessage_type("MT2201"); 102 wre.setMessage_type("MT2201");
101 wre.setResponse_code(response_code); 103 wre.setResponse_code(response_code);
102 wre.setResponse_text(response_text); 104 wre.setResponse_text(response_text);
103 - wre.setSendtime(sendTime); 105 + wre.setSendtime(sendTime!=null?sendTime:Constant.dateTimeFormat.format(new Date()));
104 wre.setWaybill_no(bean.getWaybillnomaster()); 106 wre.setWaybill_no(bean.getWaybillnomaster());
105 wre.setSub_waybill_no(bean.getWaybillnosecondary()); 107 wre.setSub_waybill_no(bean.getWaybillnosecondary());
106 wre.setCreator(Tools.getUserEntity()); 108 wre.setCreator(Tools.getUserEntity());
@@ -14,7 +14,6 @@ import com.agent.entity.system.UserEntity; @@ -14,7 +14,6 @@ import com.agent.entity.system.UserEntity;
14 @MappedSuperclass 14 @MappedSuperclass
15 public abstract class BasicEntity extends IdEntity{ 15 public abstract class BasicEntity extends IdEntity{
16 16
17 -  
18 /** 17 /**
19 * 创建时间 18 * 创建时间
20 */ 19 */
1 package com.agent.entity; 1 package com.agent.entity;
2 2
  3 +import java.text.DateFormat;
3 import java.text.SimpleDateFormat; 4 import java.text.SimpleDateFormat;
  5 +import java.util.Date;
  6 +import java.util.Locale;
4 7
5 /** 8 /**
6 * Created by cohesion on 2017/3/31. 9 * Created by cohesion on 2017/3/31.
7 */ 10 */
8 public class Constant { 11 public class Constant {
9 12
10 - //日期格式化 13 + // 日期格式化
11 public final static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); 14 public final static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
12 15
13 - //日期格式化 16 + // 日期格式化
14 public final static SimpleDateFormat dateFormatYYYYMM = new SimpleDateFormat("yyyyMM"); 17 public final static SimpleDateFormat dateFormatYYYYMM = new SimpleDateFormat("yyyyMM");
15 18
16 - //日期格式化 19 + // 日期格式化
17 public final static SimpleDateFormat dateFormatMonth = new SimpleDateFormat("yyyy-MM"); 20 public final static SimpleDateFormat dateFormatMonth = new SimpleDateFormat("yyyy-MM");
18 21
19 - //日期格式化 22 + // 日期格式化
20 public final static SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 23 public final static SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
21 24
22 - //日期格式化 25 + // 日期格式化
23 public final static SimpleDateFormat dateTimeFormatnumber = new SimpleDateFormat("yyyyMMddHHmmssSSS"); 26 public final static SimpleDateFormat dateTimeFormatnumber = new SimpleDateFormat("yyyyMMddHHmmssSSS");
24 27
25 - //包装尺寸类型 - 交运 28 + // 包装尺寸类型 - 交运
26 public final static String packageSizeDelivery = "DELIVERY"; 29 public final static String packageSizeDelivery = "DELIVERY";
27 30
28 - //包装尺寸类型 - 主单 31 + // 包装尺寸类型 - 主单
29 public final static String packageSizeBill = "BILL"; 32 public final static String packageSizeBill = "BILL";
30 33
31 - //包装尺寸类型 - 分单 34 + // 包装尺寸类型 - 分单
32 public final static String packageSizeSubBill = "SUB_BILL"; 35 public final static String packageSizeSubBill = "SUB_BILL";
33 36
  37 + public final static String getDateEnglish(Date date) {
  38 + DateFormat df = new SimpleDateFormat("MMM",Locale.ENGLISH);
  39 + String monthEn = df.format(date);
  40 +
  41 + SimpleDateFormat sdf = new SimpleDateFormat("dd");
  42 + String day = sdf.format(date);
  43 +
  44 + return monthEn+day;
  45 + }
34 } 46 }
1 package com.agent.entity; 1 package com.agent.entity;
2 2
3 -import javax.persistence.*; 3 +import javax.persistence.Column;
  4 +import javax.persistence.GeneratedValue;
  5 +import javax.persistence.GenerationType;
  6 +import javax.persistence.Id;
  7 +import javax.persistence.MappedSuperclass;
4 8
5 @MappedSuperclass 9 @MappedSuperclass
6 -public class IdEntity { 10 +public class IdEntity{
7 protected Long id; 11 protected Long id;
8 12
9 @Id 13 @Id
  1 +package com.agent.entity.agent;
  2 +
  3 +import javax.persistence.Entity;
  4 +import javax.persistence.Table;
  5 +
  6 +import com.agent.entity.IdEntity;
  7 +
  8 +/**
  9 + *
  10 + * Depiction: 企业类型以及国家代码
  11 + * <p>
  12 + * Modify:
  13 + * <p>
  14 + * Author: William Lynn
  15 + * <p>
  16 + * Create Date：2018年5月28日 下午2:05:28
  17 + *
  18 + */
  19 +@Entity
  20 +@Table(name = "T_BAS_ENTERPRISE")
  21 +public class EnterpriseEntity extends IdEntity {
  22 + private String name_cn;
  23 + private String name_en;
  24 + private String country_code;
  25 + private String enterprise_type;
  26 +
  27 + public EnterpriseEntity() {
  28 + }
  29 +
  30 + public String getName_cn() {
  31 + return name_cn;
  32 + }
  33 +
  34 + public void setName_cn(String name_cn) {
  35 + this.name_cn = name_cn;
  36 + }
  37 +
  38 + public String getName_en() {
  39 + return name_en;
  40 + }
  41 +
  42 + public void setName_en(String name_en) {
  43 + this.name_en = name_en;
  44 + }
  45 +
  46 + public String getCountry_code() {
  47 + return country_code;
  48 + }
  49 +
  50 + public void setCountry_code(String country_code) {
  51 + this.country_code = country_code;
  52 + }
  53 +
  54 + public String getEnterprise_type() {
  55 + return enterprise_type;
  56 + }
  57 +
  58 + public void setEnterprise_type(String enterprise_type) {
  59 + this.enterprise_type = enterprise_type;
  60 + }
  61 +
  62 + @Override
  63 + public String toString() {
  64 + return "EnterpriseEntity [name_cn=" + name_cn + ", name_en=" + name_en + ", country_code=" + country_code
  65 + + ", enterprise_type=" + enterprise_type + "]";
  66 + }
  67 +
  68 +}
1 -//package com.agent.entity.agent;  
2 -//  
3 -//import com.agent.entity.BasicEntity;  
4 -//  
5 -//import javax.persistence.Column;  
6 -//import javax.persistence.Entity;  
7 -//import javax.persistence.Table;  
8 -//import java.util.Date;  
9 -//  
10 -///**  
11 -// * Created by cohesion on 2017/4/19.  
12 -// * <p/>  
13 -// * 预配舱单表  
14 -// */  
15 -//@Entity  
16 -//@Table(name = "MANIFEST")  
17 -//public class ManifestEntity extends BasicEntity {  
18 -//  
19 -// /**  
20 -// * 航班航次编号  
21 -// */  
22 -// private String voyageNo;  
23 -//  
24 -// /**  
25 -// * 运输工具代码  
26 -// */  
27 -// private String toolCode;  
28 -//  
29 -// /**  
30 -// * 运输工具名称  
31 -// */  
32 -// private String toolName;  
33 -//  
34 -// /**  
35 -// * 运输方式代码  
36 -// */  
37 -// private String modeCode;  
38 -//  
39 -// /**  
40 -// * 舱单传输人名称  
41 -// */  
42 -// private String transferName;  
43 -//  
44 -// /**  
45 -// * 离境地海关代码  
46 -// */  
47 -// private String leaveCode;  
48 -//  
49 -// /**  
50 -// * 代理企业代码  
51 -// */  
52 -// private String agentCompanyCode;  
53 -//  
54 -// /**  
55 -// * 承运人代码  
56 -// */  
57 -// private String carrierCode;  
58 -//  
59 -// /**  
60 -// * 境外海关第一停靠港代码  
61 -// */  
62 -// private String firstPortCode;  
63 -//  
64 -// /**  
65 -// * 境外海关第一停靠港日期  
66 -// */  
67 -// private Date firstPortDate;  
68 -//  
69 -// /**  
70 -// * 启运日期  
71 -// */  
72 -// private Date departureDate;  
73 -//  
74 -// /**  
75 -// * 申报企业关区号  
76 -// */  
77 -// private String enterpriseNumber;  
78 -//  
79 -// /**  
80 -// * 申报企业组织机构代码  
81 -// */  
82 -// private String enterpriseCode;  
83 -//  
84 -// /**  
85 -// * 备注  
86 -// */  
87 -// private String remark;  
88 -//  
89 -// /**  
90 -// * 报文发送状态  
91 -// */  
92 -// private Integer sendXml = 0;  
93 -//  
94 -//  
95 -// @Column(name = "VOYAGE_NUMBER")  
96 -// public String getVoyageNo() {  
97 -// return voyageNo;  
98 -// }  
99 -//  
100 -// public void setVoyageNo(String voyageNo) {  
101 -// this.voyageNo = voyageNo;  
102 -// }  
103 -//  
104 -// @Column(name = "TOOL_CODE")  
105 -// public String getToolCode() {  
106 -// return toolCode;  
107 -// }  
108 -//  
109 -// public void setToolCode(String toolCode) {  
110 -// this.toolCode = toolCode;  
111 -// }  
112 -//  
113 -// @Column(name = "TOOL_NAME")  
114 -// public String getToolName() {  
115 -// return toolName;  
116 -// }  
117 -//  
118 -// public void setToolName(String toolName) {  
119 -// this.toolName = toolName;  
120 -// }  
121 -//  
122 -// @Column(name = "MODE_CODE")  
123 -// public String getModeCode() {  
124 -// return modeCode;  
125 -// }  
126 -//  
127 -// public void setModeCode(String modeCode) {  
128 -// this.modeCode = modeCode;  
129 -// }  
130 -//  
131 -// @Column(name = "TRANSFER_NAME")  
132 -// public String getTransferName() {  
133 -// return transferName;  
134 -// }  
135 -//  
136 -// public void setTransferName(String transferName) {  
137 -// this.transferName = transferName;  
138 -// }  
139 -//  
140 -// @Column(name = "CUSTOMS_LEAVE_CODE")  
141 -// public String getLeaveCode() {  
142 -// return leaveCode;  
143 -// }  
144 -//  
145 -// public void setLeaveCode(String leaveCode) {  
146 -// this.leaveCode = leaveCode;  
147 -// }  
148 -//  
149 -// @Column(name = "AGENT_COMPANY_CODE")  
150 -// public String getAgentCompanyCode() {  
151 -// return agentCompanyCode;  
152 -// }  
153 -//  
154 -// public void setAgentCompanyCode(String agentCompanyCode) {  
155 -// this.agentCompanyCode = agentCompanyCode;  
156 -// }  
157 -//  
158 -// @Column(name = "CARRIER_CODE")  
159 -// public String getCarrierCode() {  
160 -// return carrierCode;  
161 -// }  
162 -//  
163 -// public void setCarrierCode(String carrierCode) {  
164 -// this.carrierCode = carrierCode;  
165 -// }  
166 -//  
167 -// @Column(name = "FIRST_PORT_CODE")  
168 -// public String getFirstPortCode() {  
169 -// return firstPortCode;  
170 -// }  
171 -//  
172 -// public void setFirstPortCode(String firstPortCode) {  
173 -// this.firstPortCode = firstPortCode;  
174 -// }  
175 -//  
176 -// @Column(name = "FIRST_PORT_DATE")  
177 -// public Date getFirstPortDate() {  
178 -// return firstPortDate;  
179 -// }  
180 -//  
181 -// public void setFirstPortDate(Date firstPortDate) {  
182 -// this.firstPortDate = firstPortDate;  
183 -// }  
184 -//  
185 -// @Column(name = "DEPARTURE_DATE")  
186 -// public Date getDepartureDate() {  
187 -// return departureDate;  
188 -// }  
189 -//  
190 -// public void setDepartureDate(Date departureDate) {  
191 -// this.departureDate = departureDate;  
192 -// }  
193 -//  
194 -// @Column(name = "ENTERPRISE_NUMBER")  
195 -// public String getEnterpriseNumber() {  
196 -// return enterpriseNumber;  
197 -// }  
198 -//  
199 -// public void setEnterpriseNumber(String enterpriseNumber) {  
200 -// this.enterpriseNumber = enterpriseNumber;  
201 -// }  
202 -//  
203 -// @Column(name = "ENTERPRISE_CODE")  
204 -// public String getEnterpriseCode() {  
205 -// return enterpriseCode;  
206 -// }  
207 -//  
208 -// public void setEnterpriseCode(String enterpriseCode) {  
209 -// this.enterpriseCode = enterpriseCode;  
210 -// }  
211 -//  
212 -// @Column(name = "REMARK")  
213 -// public String getRemark() {  
214 -// return remark;  
215 -// }  
216 -//  
217 -// public void setRemark(String remark) {  
218 -// this.remark = remark;  
219 -// }  
220 -//  
221 -// @Column(name = "SEND_XML")  
222 -// public Integer getSendXml() {  
223 -// return sendXml;  
224 -// }  
225 -//  
226 -// public void setSendXml(Integer sendXml) {  
227 -// this.sendXml = sendXml;  
228 -// }  
229 -//}  
230 -  
231 package com.agent.entity.agent; 1 package com.agent.entity.agent;
232 2
  3 +import java.io.Serializable;
233 import java.util.Calendar; 4 import java.util.Calendar;
234 import java.util.Date; 5 import java.util.Date;
235 6
@@ -240,6 +11,7 @@ import javax.persistence.Table; @@ -240,6 +11,7 @@ import javax.persistence.Table;
240 import org.apache.commons.lang.StringUtils; 11 import org.apache.commons.lang.StringUtils;
241 12
242 import com.agent.entity.BasicEntity; 13 import com.agent.entity.BasicEntity;
  14 +import com.agent.entity.Constant;
243 15
244 /** 16 /**
245 * Created by cohesion on 2017/8/9. 17 * Created by cohesion on 2017/8/9.
@@ -248,7 +20,9 @@ import com.agent.entity.BasicEntity; @@ -248,7 +20,9 @@ import com.agent.entity.BasicEntity;
248 */ 20 */
249 @Entity 21 @Entity
250 @Table(name = "MANIFEST") 22 @Table(name = "MANIFEST")
251 -public class ManifestEntity extends BasicEntity { 23 +public class ManifestEntity extends BasicEntity implements Serializable {
  24 + private static final long serialVersionUID = 1L;
  25 +
252 private String unlodingcode;// 卸货地代码 26 private String unlodingcode;// 卸货地代码
253 private String cnecusid;// 收货人代码 27 private String cnecusid;// 收货人代码
254 private String shpcusid;// 发货人代码 28 private String shpcusid;// 发货人代码
@@ -790,7 +564,8 @@ public class ManifestEntity extends BasicEntity { @@ -790,7 +564,8 @@ public class ManifestEntity extends BasicEntity {
790 564
791 @Column(name = "STOWAGEDATE") 565 @Column(name = "STOWAGEDATE")
792 public Date getStowagedate() { 566 public Date getStowagedate() {
793 - return stowagedate; 567 +// return stowagedate;
  568 + return new Date();
794 } 569 }
795 570
796 public void setStowagedate(Date stowagedate) { 571 public void setStowagedate(Date stowagedate) {
@@ -1068,7 +843,7 @@ public class ManifestEntity extends BasicEntity { @@ -1068,7 +843,7 @@ public class ManifestEntity extends BasicEntity {
1068 843
1069 @Column(name = "CO_COUNTRY") 844 @Column(name = "CO_COUNTRY")
1070 public String getCo_country() { 845 public String getCo_country() {
1071 - return co_country; 846 + return co_country != null ? co_country.toUpperCase() : "";
1072 } 847 }
1073 848
1074 public void setCo_country(String co_country) { 849 public void setCo_country(String co_country) {
@@ -1187,4 +962,36 @@ public class ManifestEntity extends BasicEntity { @@ -1187,4 +962,36 @@ public class ManifestEntity extends BasicEntity {
1187 } 962 }
1188 return false; 963 return false;
1189 } 964 }
  965 +
  966 + @Override
  967 + public String toString() {
  968 + return "ManifestEntity [unlodingcode=" + unlodingcode + ", cnecusid=" + cnecusid + ", shpcusid=" + shpcusid
  969 + + ", shpaeo=" + shpaeo + ", cneaeo=" + cneaeo + ", flightno=" + flightno + ", flightdate=" + flightdate
  970 + + ", originatingstation=" + originatingstation + ", destinationstation=" + destinationstation
  971 + + ", waybillnomaster=" + waybillnomaster + ", totalweight=" + totalweight + ", totalpiece=" + totalpiece
  972 + + ", preparetotalpiece=" + preparetotalpiece + ", preparetotalweight=" + preparetotalweight
  973 + + ", agentcompanycode=" + agentcompanycode + ", stowagedate=" + stowagedate + ", status=" + status
  974 + + ", carrier=" + carrier + ", customsstatus=" + customsstatus + ", paymode=" + paymode
  975 + + ", specialgoodscode=" + specialgoodscode + ", customscode=" + customscode + ", agentman=" + agentman
  976 + + ", agentcompany=" + agentcompany + ", receiptinformation=" + receiptinformation + ", createdate="
  977 + + createdate + ", productname=" + productname + ", unnumber=" + unnumber + ", category=" + category
  978 + + ", sh_company=" + sh_company + ", sh_address=" + sh_address + ", sh_zipcode=" + sh_zipcode
  979 + + ", sh_city=" + sh_city + ", sh_deltaname=" + sh_deltaname + ", sh_country=" + sh_country
  980 + + ", sh_telephone=" + sh_telephone + ", sh_fax=" + sh_fax + ", sh_name=" + sh_name + ", co_company="
  981 + + co_company + ", co_address=" + co_address + ", co_zipcode=" + co_zipcode + ", co_city=" + co_city
  982 + + ", co_deltaname=" + co_deltaname + ", co_country=" + co_country + ", co_telephone=" + co_telephone
  983 + + ", co_fax=" + co_fax + ", co_name=" + co_name + ", reach_station=" + reach_station + ", carrier1="
  984 + + carrier1 + ", reach_station1=" + reach_station1 + ", carrier2=" + carrier2 + ", reach_station2="
  985 + + reach_station2 + ", name_ofgoods=" + name_ofgoods + ", delivery_station=" + delivery_station
  986 + + ", sh_provincecode=" + sh_provincecode + ", sh_provincename=" + sh_provincename + ", de_number="
  987 + + de_number + ", de_weight=" + de_weight + ", de_chweight=" + de_chweight + ", de_size=" + de_size
  988 + + ", de_volume=" + de_volume + ", de_type=" + de_type + ", de_trstation=" + de_trstation
  989 + + ", de_packing=" + de_packing + ", de_remarks=" + de_remarks + ", de_ids=" + de_ids
  990 + + ", response_code=" + response_code + ", response_text=" + response_text + ", save_time=" + save_time
  991 + + ", USER_ID=" + USER_ID + "]";
  992 + }
  993 +
  994 + public static void main(String[] args) {
  995 + System.out.println(Constant.getDateEnglish(new Date()));
  996 + }
1190 } 997 }
@@ -591,7 +591,8 @@ public class PreparesecondaryEntity extends BasicEntity { @@ -591,7 +591,8 @@ public class PreparesecondaryEntity extends BasicEntity {
591 591
592 @Column(name = "STOWAGEDATE") 592 @Column(name = "STOWAGEDATE")
593 public Date getStowagedate() { 593 public Date getStowagedate() {
594 - return stowagedate; 594 +// return stowagedate;
  595 + return new Date();
595 } 596 }
596 597
597 public void setStowagedate(Date stowagedate) { 598 public void setStowagedate(Date stowagedate) {
@@ -798,7 +799,7 @@ public class PreparesecondaryEntity extends BasicEntity { @@ -798,7 +799,7 @@ public class PreparesecondaryEntity extends BasicEntity {
798 799
799 @Column(name = "SH_COUNTRY") 800 @Column(name = "SH_COUNTRY")
800 public String getSh_country() { 801 public String getSh_country() {
801 - return sh_country; 802 + return sh_country!=null?sh_country.toUpperCase():"";
802 } 803 }
803 804
804 public void setSh_country(String sh_country) { 805 public void setSh_country(String sh_country) {
1 package com.agent.repository.agent; 1 package com.agent.repository.agent;
2 2
3 -import com.agent.entity.agent.ConsigneeEntity;  
4 -import com.agent.entity.agent.ConsigneeInfo; 3 +import java.util.List;
5 4
6 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
7 import org.springframework.data.jpa.repository.Modifying; 6 import org.springframework.data.jpa.repository.Modifying;
@@ -9,22 +8,26 @@ import org.springframework.data.jpa.repository.Query; @@ -9,22 +8,26 @@ import org.springframework.data.jpa.repository.Query;
9 import org.springframework.data.repository.PagingAndSortingRepository; 8 import org.springframework.data.repository.PagingAndSortingRepository;
10 import org.springframework.transaction.annotation.Transactional; 9 import org.springframework.transaction.annotation.Transactional;
11 10
12 -import java.util.List; 11 +import com.agent.entity.agent.ConsigneeEntity;
  12 +import com.agent.entity.agent.ConsigneeInfo;
13 13
14 public interface ConsigneeRepository extends PagingAndSortingRepository<ConsigneeEntity, Long>, 14 public interface ConsigneeRepository extends PagingAndSortingRepository<ConsigneeEntity, Long>,
15 JpaSpecificationExecutor<ConsigneeEntity> { 15 JpaSpecificationExecutor<ConsigneeEntity> {
16 16
17 - @Query(value = "SELECT * FROM PUB_CONSIGNEE WHERE CODE = ?1 AND NAME = ?2 ORDER BY ID DESC", nativeQuery = true)  
18 - public List<ConsigneeEntity> findByName(String code,String name); 17 + @Query(value = "SELECT * FROM(SELECT rownum rn,c.* from PUB_CONSIGNEE c where c.creator=?1) cr where cr.rn between ?2 and ?3", nativeQuery = true)
  18 + public List<ConsigneeEntity> list(long user_id,int start,int end);
  19 +
  20 + @Query(value = "SELECT * FROM PUB_CONSIGNEE WHERE CODE = ?1 AND NAME = ?2 AND CREATOR=?3 ORDER BY ID DESC", nativeQuery = true)
  21 + public List<ConsigneeEntity> findByName(String code,String name,long user_id);
19 22
20 - @Query(value = "SELECT * FROM PUB_CONSIGNEE WHERE CODE = ?1 ORDER BY ID DESC", nativeQuery = true)  
21 - public List<ConsigneeEntity> findByCode(String code); 23 + @Query(value = "SELECT * FROM PUB_CONSIGNEE WHERE CODE = ?1 AND CREATOR=?2 ORDER BY ID DESC", nativeQuery = true)
  24 + public List<ConsigneeEntity> findByCode(String code,long user_id);
22 25
23 - @Query(value = "SELECT * FROM PUB_CONSIGNEE WHERE ID = ?1 ORDER BY ID DESC", nativeQuery = true)  
24 - public List<ConsigneeEntity> findById(String id); 26 + @Query(value = "SELECT * FROM PUB_CONSIGNEE WHERE ID = ?1 AND CREATOR=?2 ORDER BY ID DESC", nativeQuery = true)
  27 + public List<ConsigneeEntity> findById(String id,long user_id);
25 28
26 - @Query(value = "SELECT * FROM PUB_CONSIGNEE ORDER BY ID DESC", nativeQuery = true)  
27 - public List<ConsigneeEntity> findAll2(); 29 + @Query(value = "SELECT * FROM PUB_CONSIGNEE WHERE CREATOR=?1 ORDER BY ID DESC", nativeQuery = true)
  30 + public List<ConsigneeEntity> findAll2(long user_id);
28 31
29 @Modifying 32 @Modifying
30 @Query(value = "DELETE FROM PUB_CONSIGNEE WHERE ID = ?1", nativeQuery = true) 33 @Query(value = "DELETE FROM PUB_CONSIGNEE WHERE ID = ?1", nativeQuery = true)
@@ -19,8 +19,8 @@ public interface ConsignorRepository @@ -19,8 +19,8 @@ public interface ConsignorRepository
19 @Query(value = "SELECT * FROM CONSIGNOR WHERE ID = ?1 ORDER BY ID DESC", nativeQuery = true) 19 @Query(value = "SELECT * FROM CONSIGNOR WHERE ID = ?1 ORDER BY ID DESC", nativeQuery = true)
20 public List<ConsignorEntity> findById(String id); 20 public List<ConsignorEntity> findById(String id);
21 21
22 - @Query(value = "SELECT * FROM(SELECT rownum rn,c.* from CONSIGNOR c) cr where cr.rn between ?1 and ?2", nativeQuery = true)  
23 - public List<ConsignorEntity> list(int start,int end); 22 + @Query(value = "SELECT * FROM(SELECT rownum rn,c.* from CONSIGNOR c where c.creator=?1) cr where cr.rn between ?2 and ?3", nativeQuery = true)
  23 + public List<ConsignorEntity> list(long user_id,int start,int end);
24 24
25 @Query(value = "SELECT * FROM CONSIGNOR WHERE CREATOR = ?1 ORDER BY ID DESC", nativeQuery = true) 25 @Query(value = "SELECT * FROM CONSIGNOR WHERE CREATOR = ?1 ORDER BY ID DESC", nativeQuery = true)
26 public List<ConsignorEntity> getAllByUserId(long user_id); 26 public List<ConsignorEntity> getAllByUserId(long user_id);
  1 +package com.agent.repository.agent;
  2 +
  3 +import java.util.List;
  4 +
  5 +import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  6 +import org.springframework.data.jpa.repository.Query;
  7 +import org.springframework.data.repository.PagingAndSortingRepository;
  8 +
  9 +import com.agent.entity.agent.EnterpriseEntity;
  10 +
  11 +public interface EnterpriseRepository extends PagingAndSortingRepository<EnterpriseEntity, String>, JpaSpecificationExecutor<EnterpriseEntity> {
  12 +
  13 + @Query(value = "SELECT * FROM T_BAS_ENTERPRISE WHERE COUNTRY_CODE like ?1% AND ROWID=ANY(SELECT MAX(ROWID) FROM T_BAS_ENTERPRISE GROUP BY NAME_EN) ORDER BY ID ASC", nativeQuery = true)
  14 + public List<EnterpriseEntity> search(String start);
  15 +
  16 + @Query(value = "SELECT * FROM T_BAS_ENTERPRISE WHERE COUNTRY_CODE = ?1 ORDER BY ID ASC", nativeQuery = true)
  17 + public List<EnterpriseEntity> findTypeByCountryCode(String countryCode);
  18 +}
@@ -25,6 +25,9 @@ public interface ManifestRepository extends PagingAndSortingRepository<ManifestE @@ -25,6 +25,9 @@ public interface ManifestRepository extends PagingAndSortingRepository<ManifestE
25 @Query(value = "SELECT * FROM MANIFEST WHERE WAYBILLNOMASTER = ?1 and USER_ID=?2 ORDER BY ID DESC", nativeQuery = true) 25 @Query(value = "SELECT * FROM MANIFEST WHERE WAYBILLNOMASTER = ?1 and USER_ID=?2 ORDER BY ID DESC", nativeQuery = true)
26 public List<ManifestEntity> findByMawbNo(String mawbNo, Long user_id); 26 public List<ManifestEntity> findByMawbNo(String mawbNo, Long user_id);
27 27
  28 + @Query(value = "SELECT * FROM MANIFEST WHERE WAYBILLNOMASTER = ?1 ORDER BY ID DESC", nativeQuery = true)
  29 + public List<ManifestEntity> findByMawbNo(String mawbNo);
  30 +
28 @Query(value = "SELECT * FROM MANIFEST", nativeQuery = true) 31 @Query(value = "SELECT * FROM MANIFEST", nativeQuery = true)
29 public List<ManifestEntity> queryAll(); 32 public List<ManifestEntity> queryAll();
30 33
@@ -57,6 +57,7 @@ public class BasicService<T> { @@ -57,6 +57,7 @@ public class BasicService<T> {
57 */ 57 */
58 protected Specification<T> buildSpecification(EasyPage<T> pageForm) { 58 protected Specification<T> buildSpecification(EasyPage<T> pageForm) {
59 Map<String, SearchFilter> filters = SearchFilter.parse(pageForm.getSearchParams()); 59 Map<String, SearchFilter> filters = SearchFilter.parse(pageForm.getSearchParams());
  60 +// filters.put("creator", new SearchFilter("creator", Operator.EQ, Tools.getUserId()));
60 Specification<T> spec = DynamicSpecifications.bySearchFilter(filters.values(),entityClass); 61 Specification<T> spec = DynamicSpecifications.bySearchFilter(filters.values(),entityClass);
61 return spec; 62 return spec;
62 } 63 }
1 package com.agent.service.agent; 1 package com.agent.service.agent;
2 2
3 -  
4 import java.util.List; 3 import java.util.List;
5 4
6 import javax.annotation.Resource; 5 import javax.annotation.Resource;
@@ -13,11 +12,13 @@ import org.springframework.stereotype.Service; @@ -13,11 +12,13 @@ import org.springframework.stereotype.Service;
13 import org.springframework.transaction.annotation.Transactional; 12 import org.springframework.transaction.annotation.Transactional;
14 13
15 import com.agent.entity.agent.ConsigneeEntity; 14 import com.agent.entity.agent.ConsigneeEntity;
  15 +import com.agent.entity.agent.ConsignorEntity;
16 import com.agent.repository.agent.ConsigneeRepository; 16 import com.agent.repository.agent.ConsigneeRepository;
17 import com.agent.service.BasicService; 17 import com.agent.service.BasicService;
18 import com.google.common.base.Splitter; 18 import com.google.common.base.Splitter;
19 import com.plugin.easyui.EasyPage; 19 import com.plugin.easyui.EasyPage;
20 20
  21 +import tools.Tools;
21 22
22 @Service 23 @Service
23 public class ConsigneeService extends BasicService<ConsigneeEntity> { 24 public class ConsigneeService extends BasicService<ConsigneeEntity> {
@@ -33,17 +34,17 @@ public class ConsigneeService extends BasicService<ConsigneeEntity> { @@ -33,17 +34,17 @@ public class ConsigneeService extends BasicService<ConsigneeEntity> {
33 } 34 }
34 } 35 }
35 36
36 - public ConsigneeEntity findByCodeAndName(String code,String name){  
37 - List<ConsigneeEntity> consigns = consigneeRepository.findByName(code,name);  
38 - if(CollectionUtils.isNotEmpty(consigns)){ 37 + public ConsigneeEntity findByCodeAndName(String code, String name) {
  38 + List<ConsigneeEntity> consigns = consigneeRepository.findByName(code, name, Tools.getUserId());
  39 + if (CollectionUtils.isNotEmpty(consigns)) {
39 return consigns.get(0); 40 return consigns.get(0);
40 } 41 }
41 return null; 42 return null;
42 } 43 }
43 44
44 - public ConsigneeEntity findByCode(String code){  
45 - List<ConsigneeEntity> consigns = consigneeRepository.findByCode(code);  
46 - if(CollectionUtils.isNotEmpty(consigns)){ 45 + public ConsigneeEntity findByCode(String code) {
  46 + List<ConsigneeEntity> consigns = consigneeRepository.findByCode(code, Tools.getUserId());
  47 + if (CollectionUtils.isNotEmpty(consigns)) {
47 return consigns.get(0); 48 return consigns.get(0);
48 } 49 }
49 return null; 50 return null;
@@ -56,45 +57,33 @@ public class ConsigneeService extends BasicService<ConsigneeEntity> { @@ -56,45 +57,33 @@ public class ConsigneeService extends BasicService<ConsigneeEntity> {
56 return page; 57 return page;
57 } 58 }
58 59
59 - public void save(ConsigneeEntity c){  
60 - consigneeRepository.save(c); 60 + public long total(long user_id) {
  61 + List<ConsigneeEntity> list = consigneeRepository.findAll2(user_id);
  62 + return list!=null?list.size():0;
61 } 63 }
62 - public List<ConsigneeEntity> findAll(){  
63 - return consigneeRepository.findAll2(); 64 +
  65 + public List<ConsigneeEntity> list(int page,int limit) {
  66 + int start = (page-1)*limit+1;
  67 + int end = page*limit;
  68 + long user_id = Tools.getUserId();
  69 + return consigneeRepository.list(user_id,start,end);
64 } 70 }
65 - public void update(ConsigneeEntity c){ 71 +
  72 + public void save(ConsigneeEntity c) {
  73 + c.setCreator(Tools.getUserEntity());
66 consigneeRepository.save(c); 74 consigneeRepository.save(c);
67 } 75 }
68 - public List<ConsigneeEntity> findById(String id){  
69 - return consigneeRepository.findById(id); 76 +
  77 + public List<ConsigneeEntity> findAll() {
  78 + return consigneeRepository.findAll2(Tools.getUserId());
70 } 79 }
71 - /* //保存这个有问题  
72 - public int save(ConsigneeInfo info){  
73 - if(info == null)  
74 - return 0;  
75 - info.setId(MD5Tools.MD5(System.currentTimeMillis() + JSONObject.toJSONString(info)));  
76 - return consigneeRepository.save(info.getId(),  
77 - info.getSh_company(), info.getSh_address(),  
78 - info.getSh_zipcode(), info.getCity(),  
79 - info.getDeltaname(), info.getCountry(),  
80 - info.getTelephone(), info.getSh_fax(),  
81 - info.getSh_name(), info.getSh_provincename(),  
82 - info.getSh_provincecode()); 80 +
  81 + public void update(ConsigneeEntity c) {
  82 + c.setCreator(Tools.getUserEntity());
  83 + consigneeRepository.save(c);
83 } 84 }
84 - public int update(ConsigneeInfo info){  
85 - if(info == null)  
86 - return 0;  
87 - return consigneeRepository.update(info.getId(),  
88 - info.getSh_company(), info.getSh_address(),  
89 - info.getSh_zipcode(), info.getCity(),  
90 - info.getDeltaname(), info.getCountry(),  
91 - info.getTelephone(), info.getSh_fax(),  
92 - info.getSh_name(), info.getSh_provincename(),  
93 - info.getSh_provincecode()); 85 +
  86 + public List<ConsigneeEntity> findById(String id) {
  87 + return consigneeRepository.findById(id, Tools.getUserId());
94 } 88 }
95 - public List<ConsigneeInfo> queryById(String id){  
96 - if(id == null)  
97 - return null;  
98 - return consigneeRepository.queryById(id);  
99 - }*/  
100 } 89 }
@@ -74,10 +74,16 @@ public class ConsignorService extends BasicService<ConsignorEntity> { @@ -74,10 +74,16 @@ public class ConsignorService extends BasicService<ConsignorEntity> {
74 return service.count(); 74 return service.count();
75 } 75 }
76 76
  77 + public long total(long user_id) {
  78 + List<ConsignorEntity> list = service.getAllByUserId(user_id);
  79 + return list!=null?list.size():0;
  80 + }
  81 +
77 public List<ConsignorEntity> list(int page,int limit) { 82 public List<ConsignorEntity> list(int page,int limit) {
78 int start = (page-1)*limit+1; 83 int start = (page-1)*limit+1;
79 int end = page*limit; 84 int end = page*limit;
80 - return service.list(start,end); 85 + long user_id = Tools.getUserId();
  86 + return service.list(user_id,start,end);
81 } 87 }
82 88
83 public List<ConsignorEntity> findAllByUserId(long user_id) { 89 public List<ConsignorEntity> findAllByUserId(long user_id) {
  1 +package com.agent.service.agent;
  2 +
  3 +import java.util.List;
  4 +
  5 +import javax.annotation.Resource;
  6 +
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +import com.agent.entity.agent.EnterpriseEntity;
  10 +import com.agent.repository.agent.EnterpriseRepository;
  11 +
  12 +/**
  13 + * Depiction:
  14 + * <p>
  15 + * Modify:
  16 + * <p>
  17 + * Author: William Lynn
  18 + * <p>
  19 + * Create Date：2018年6月28日 下午4:06:43
  20 + *
  21 + */
  22 +@Service
  23 +public class EnterpriseService {
  24 +
  25 + @Resource
  26 + private EnterpriseRepository service;
  27 +
  28 + public EnterpriseService() {
  29 + }
  30 +
  31 + public List<EnterpriseEntity> search(String start){
  32 + return service.search(start);
  33 + }
  34 +
  35 + public List<EnterpriseEntity> findTypeByCountryCode(String countryCode){
  36 + return service.findTypeByCountryCode(countryCode);
  37 + }
  38 +
  39 +}
@@ -30,6 +30,8 @@ import com.framework.shiro.SessionUtil; @@ -30,6 +30,8 @@ import com.framework.shiro.SessionUtil;
30 import com.google.common.base.Splitter; 30 import com.google.common.base.Splitter;
31 import com.plugin.easyui.EasyPage; 31 import com.plugin.easyui.EasyPage;
32 32
  33 +import tools.Tools;
  34 +
33 35
34 @Service 36 @Service
35 public class MakeHawbService extends BasicService<MakeHawbEntity> { 37 public class MakeHawbService extends BasicService<MakeHawbEntity> {
@@ -78,7 +80,7 @@ public class MakeHawbService extends BasicService<MakeHawbEntity> { @@ -78,7 +80,7 @@ public class MakeHawbService extends BasicService<MakeHawbEntity> {
78 } 80 }
79 //保存收货人 81 //保存收货人
80 if(StringUtils.isNotEmpty(consign.getCode()) && StringUtils.isNotEmpty(consign.getName())){ 82 if(StringUtils.isNotEmpty(consign.getCode()) && StringUtils.isNotEmpty(consign.getName())){
81 - List<ConsigneeEntity> consigns = consigneeRepository.findByName(consign.getCode(),consign.getName()); 83 + List<ConsigneeEntity> consigns = consigneeRepository.findByName(consign.getCode(),consign.getName(),Tools.getUserId());
82 if(CollectionUtils.isEmpty(consigns)){ 84 if(CollectionUtils.isEmpty(consigns)){
83 consign.setCreator(SessionUtil.getUser()); 85 consign.setCreator(SessionUtil.getUser());
84 consign.setCreateDate(new Date()); 86 consign.setCreateDate(new Date());
1 package com.agent.service.agent; 1 package com.agent.service.agent;
2 2
3 3
  4 +import java.util.Date;
  5 +import java.util.List;
  6 +
  7 +import javax.annotation.Resource;
  8 +
  9 +import org.apache.commons.collections.CollectionUtils;
  10 +import org.apache.commons.lang.StringUtils;
  11 +import org.springframework.data.domain.Page;
  12 +import org.springframework.data.domain.PageRequest;
  13 +import org.springframework.data.jpa.domain.Specification;
  14 +import org.springframework.stereotype.Service;
  15 +import org.springframework.transaction.annotation.Transactional;
  16 +
4 import com.agent.entity.Constant; 17 import com.agent.entity.Constant;
5 import com.agent.entity.agent.ConsigneeEntity; 18 import com.agent.entity.agent.ConsigneeEntity;
6 import com.agent.entity.agent.MakeMawbEntity; 19 import com.agent.entity.agent.MakeMawbEntity;
@@ -17,20 +30,6 @@ import com.plugin.easyui.EasyPage; @@ -17,20 +30,6 @@ import com.plugin.easyui.EasyPage;
17 30
18 import tools.Tools; 31 import tools.Tools;
19 32
20 -import org.apache.commons.collections.CollectionUtils;  
21 -import org.apache.commons.lang.StringUtils;  
22 -import org.springframework.data.domain.Page;  
23 -import org.springframework.data.domain.PageRequest;  
24 -import org.springframework.data.jpa.domain.Specification;  
25 -import org.springframework.stereotype.Service;  
26 -import org.springframework.transaction.annotation.Transactional;  
27 -  
28 -import javax.annotation.Resource;  
29 -  
30 -import java.util.ArrayList;  
31 -import java.util.Date;  
32 -import java.util.List;  
33 -  
34 33
35 @Service 34 @Service
36 public class MakeMawbService extends BasicService<MakeMawbEntity> { 35 public class MakeMawbService extends BasicService<MakeMawbEntity> {
@@ -103,7 +102,7 @@ public class MakeMawbService extends BasicService<MakeMawbEntity> { @@ -103,7 +102,7 @@ public class MakeMawbService extends BasicService<MakeMawbEntity> {
103 public MakeMawbEntity save(MakeMawbEntity bill,MawbOtherFeeEntity otherFee,ConsigneeEntity consign,List<PackageSizeEntity> sizeList) { 102 public MakeMawbEntity save(MakeMawbEntity bill,MawbOtherFeeEntity otherFee,ConsigneeEntity consign,List<PackageSizeEntity> sizeList) {
104 //保存收货人 103 //保存收货人
105 if(StringUtils.isNotEmpty(consign.getCode()) && StringUtils.isNotEmpty(consign.getName())){ 104 if(StringUtils.isNotEmpty(consign.getCode()) && StringUtils.isNotEmpty(consign.getName())){
106 - List<ConsigneeEntity> consignees = consigneeRepository.findByName(consign.getCode(),consign.getName()); 105 + List<ConsigneeEntity> consignees = consigneeRepository.findByName(consign.getCode(),consign.getName(),Tools.getUserId());
107 if(CollectionUtils.isEmpty(consignees)){ 106 if(CollectionUtils.isEmpty(consignees)){
108 consign = consigneeRepository.save(consign); 107 consign = consigneeRepository.save(consign);
109 } 108 }
@@ -173,23 +173,6 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -173,23 +173,6 @@ public class ManifestService extends BasicService<ManifestEntity> {
173 if (manifest != null) { 173 if (manifest != null) {
174 // 先删除子表信息 174 // 先删除子表信息
175 preparesecondaryRepository.deleteAll(manifest.getId()); 175 preparesecondaryRepository.deleteAll(manifest.getId());
176 -  
177 - // 以前删除其他表信息  
178 - // List<ManifestBillEntity> bills =  
179 - // billRepository.findByManifestId(manifest.getId());  
180 - // if(!CollectionUtils.isEmpty(bills)){  
181 - // for(ManifestBillEntity bill :bills){  
182 - // List<ManifestCommodityEntity> commodities =  
183 - // commodityRepository.findByBillId(bill.getId());  
184 - // if(!CollectionUtils.isEmpty(commodities)){  
185 - // for(ManifestCommodityEntity commodity :commodities){  
186 - // containerRepository.deleteByCommodityId(commodity.getId());  
187 - // commodityRepository.delete(commodity.getId());  
188 - // }  
189 - // }  
190 - // billRepository.delete(Long.valueOf(id));  
191 - // }  
192 - // }  
193 } 176 }
194 manifestRepository.delete(Long.valueOf(id)); 177 manifestRepository.delete(Long.valueOf(id));
195 } 178 }
@@ -199,6 +182,10 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -199,6 +182,10 @@ public class ManifestService extends BasicService<ManifestEntity> {
199 return manifestRepository.findByMawbNo(mawbNo, Tools.getUserId()); 182 return manifestRepository.findByMawbNo(mawbNo, Tools.getUserId());
200 } 183 }
201 184
  185 + public List<ManifestEntity> findByManifestNo(String mawbNo) {
  186 + return manifestRepository.findByMawbNo(mawbNo);
  187 + }
  188 +
202 public List<ManifestEntity> queryAll() { 189 public List<ManifestEntity> queryAll() {
203 return manifestRepository.queryAll(); 190 return manifestRepository.queryAll();
204 } 191 }
@@ -308,7 +295,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -308,7 +295,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
308 // 装载日期 295 // 装载日期
309 ManifestLoadingLocationXml ml = new ManifestLoadingLocationXml(); 296 ManifestLoadingLocationXml ml = new ManifestLoadingLocationXml();
310 ml.setId("CGO/4604"); 297 ml.setId("CGO/4604");
311 - ml.setLoadingdate(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(manifest.getStowagedate())); 298 + ml.setLoadingdate(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()));
312 mcs.setLoadinglocation(ml); 299 mcs.setLoadinglocation(ml);
313 300
314 ManifestUnloadingLocationXml mu = new ManifestUnloadingLocationXml(); 301 ManifestUnloadingLocationXml mu = new ManifestUnloadingLocationXml();
@@ -335,7 +322,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -335,7 +322,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
335 mcs.setCustomscode(manifest.getCustomscode()); 322 mcs.setCustomscode(manifest.getCustomscode());
336 mcs.setAgentname(manifest.getAgentman()); 323 mcs.setAgentname(manifest.getAgentman());
337 mcs.setAgentCompany(manifest.getAgentcompany()); 324 mcs.setAgentCompany(manifest.getAgentcompany());
338 - mcs.setName_ofgoods(manifest.getName_ofgoods() != null ? manifest.getName_ofgoods() : ""); 325 + mcs.setName_ofgoods(manifest.getProductname() != null ? manifest.getProductname() : "");
339 mcs.setDelivery_station(manifest.getDelivery_station() != null ? manifest.getDelivery_station() : ""); 326 mcs.setDelivery_station(manifest.getDelivery_station() != null ? manifest.getDelivery_station() : "");
340 mcs.setUnnumber(manifest.getUnnumber() != null ? manifest.getUnnumber() : ""); 327 mcs.setUnnumber(manifest.getUnnumber() != null ? manifest.getUnnumber() : "");
341 mcs.setCategory(manifest.getCategory() != null ? manifest.getCategory() : ""); 328 mcs.setCategory(manifest.getCategory() != null ? manifest.getCategory() : "");
@@ -484,8 +471,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -484,8 +471,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
484 // 装载日期 471 // 装载日期
485 ManifestLoadingLocationXml ml = new ManifestLoadingLocationXml(); 472 ManifestLoadingLocationXml ml = new ManifestLoadingLocationXml();
486 ml.setId("CGO/4604"); 473 ml.setId("CGO/4604");
487 - // ml.setLoadingdate(Constant.dateTimeFormatnumber.format(pre.getStowagedate()));  
488 - ml.setLoadingdate(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(pre.getStowagedate())); 474 + ml.setLoadingdate(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()));
489 mcs.setLoadinglocation(ml); 475 mcs.setLoadinglocation(ml);
490 476
491 ManifestUnloadingLocationXml mu = new ManifestUnloadingLocationXml(); 477 ManifestUnloadingLocationXml mu = new ManifestUnloadingLocationXml();
@@ -512,7 +498,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -512,7 +498,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
512 mcs.setCustomscode(pre.getCustomscode()); 498 mcs.setCustomscode(pre.getCustomscode());
513 mcs.setAgentname(pre.getAgentman()); 499 mcs.setAgentname(pre.getAgentman());
514 mcs.setAgentCompany(pre.getAgentcompany()); 500 mcs.setAgentCompany(pre.getAgentcompany());
515 - mcs.setName_ofgoods(pre.getName_ofgoods() != null ? pre.getName_ofgoods() : ""); 501 + mcs.setName_ofgoods(pre.getProductname() != null ? pre.getProductname() : "");
516 mcs.setDelivery_station(pre.getDelivery_station() != null ? pre.getDelivery_station() : ""); 502 mcs.setDelivery_station(pre.getDelivery_station() != null ? pre.getDelivery_station() : "");
517 mcs.setUnnumber(pre.getUnnumber() != null ? pre.getUnnumber() : ""); 503 mcs.setUnnumber(pre.getUnnumber() != null ? pre.getUnnumber() : "");
518 mcs.setCategory(pre.getCategory() != null ? pre.getCategory() : ""); 504 mcs.setCategory(pre.getCategory() != null ? pre.getCategory() : "");
@@ -658,7 +644,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -658,7 +644,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
658 inc.setPiecequantity(manifest.getDe_number()); 644 inc.setPiecequantity(manifest.getDe_number());
659 645
660 NatureIdentificationTransportCargoXml nat = new NatureIdentificationTransportCargoXml(); 646 NatureIdentificationTransportCargoXml nat = new NatureIdentificationTransportCargoXml();
661 - nat.setIdentification(manifest.getName_ofgoods()); 647 + nat.setIdentification(manifest.getProductname());
662 inc.setNatureidentificationtransportcargo(nat); 648 inc.setNatureidentificationtransportcargo(nat);
663 mas.setIncludedmasterconsignmentitem(inc); 649 mas.setIncludedmasterconsignmentitem(inc);
664 650
@@ -47,7 +47,6 @@ public class PreparesecondaryService extends BasicService<PreparesecondaryEntity @@ -47,7 +47,6 @@ public class PreparesecondaryService extends BasicService<PreparesecondaryEntity
47 47
48 // 判断是否存在 48 // 判断是否存在
49 public boolean isExists(PreparesecondaryEntity pe) { 49 public boolean isExists(PreparesecondaryEntity pe) {
50 - System.out.println(pe.getId());  
51 if (pe == null) 50 if (pe == null)
52 return false; 51 return false;
53 else if (pe.getId() == null) { 52 else if (pe.getId() == null) {
@@ -115,7 +115,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> { @@ -115,7 +115,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
115 115
116 ManifestService mbs = new ManifestService(); 116 ManifestService mbs = new ManifestService();
117 DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(manifest, type, null); 117 DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(manifest, type, null);
118 - String dpxbPath = CustomMessageKit.getMessagePath(); 118 + String dpxbPath = CustomMessageKit.getMessagePath("manifest");
119 XmlUtil.convertToXml2(dpxb, dpxbPath); 119 XmlUtil.convertToXml2(dpxb, dpxbPath);
120 RemoteFileKit.putFile(dpxbPath); 120 RemoteFileKit.putFile(dpxbPath);
121 } 121 }
@@ -147,7 +147,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> { @@ -147,7 +147,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
147 147
148 ManifestService mbs = new ManifestService(); 148 ManifestService mbs = new ManifestService();
149 DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(prepare, type, null); 149 DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(prepare, type, null);
150 - String dpxbPath = CustomMessageKit.getMessagePath(); 150 + String dpxbPath = CustomMessageKit.getMessagePath("secondary");
151 XmlUtil.convertToXml2(dpxb, dpxbPath); 151 XmlUtil.convertToXml2(dpxb, dpxbPath);
152 RemoteFileKit.putFile(dpxbPath); 152 RemoteFileKit.putFile(dpxbPath);
153 }else { 153 }else {
@@ -4,24 +4,32 @@ import java.text.SimpleDateFormat; @@ -4,24 +4,32 @@ import java.text.SimpleDateFormat;
4 import java.util.Date; 4 import java.util.Date;
5 import java.util.Locale; 5 import java.util.Locale;
6 6
  7 +import org.apache.commons.lang.StringUtils;
  8 +
7 import com.agent.entity.Constant; 9 import com.agent.entity.Constant;
8 import com.agent.entity.agent.ManifestEntity; 10 import com.agent.entity.agent.ManifestEntity;
9 import com.agent.entity.agent.PreparesecondaryEntity; 11 import com.agent.entity.agent.PreparesecondaryEntity;
10 import com.agent.xml.fhlsli.common.ApplicableFreightRateServiceCharge; 12 import com.agent.xml.fhlsli.common.ApplicableFreightRateServiceCharge;
  13 +import com.agent.xml.fhlsli.common.ArrivalEvent;
11 import com.agent.xml.fhlsli.common.AssociatedParty; 14 import com.agent.xml.fhlsli.common.AssociatedParty;
12 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument; 15 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument;
13 import com.agent.xml.fhlsli.common.ChargeableWeightMeasure; 16 import com.agent.xml.fhlsli.common.ChargeableWeightMeasure;
14 import com.agent.xml.fhlsli.common.ConsigneeParty; 17 import com.agent.xml.fhlsli.common.ConsigneeParty;
15 import com.agent.xml.fhlsli.common.ConsignorParty; 18 import com.agent.xml.fhlsli.common.ConsignorParty;
  19 +import com.agent.xml.fhlsli.common.DepartureEvent;
16 import com.agent.xml.fhlsli.common.FinalDestinationLocation; 20 import com.agent.xml.fhlsli.common.FinalDestinationLocation;
17 import com.agent.xml.fhlsli.common.FreightForwarderParty; 21 import com.agent.xml.fhlsli.common.FreightForwarderParty;
18 import com.agent.xml.fhlsli.common.GrossWeightMeasure; 22 import com.agent.xml.fhlsli.common.GrossWeightMeasure;
19 import com.agent.xml.fhlsli.common.HandlingInstructions; 23 import com.agent.xml.fhlsli.common.HandlingInstructions;
20 import com.agent.xml.fhlsli.common.IncludedCustomsNote; 24 import com.agent.xml.fhlsli.common.IncludedCustomsNote;
21 import com.agent.xml.fhlsli.common.IncludedTareGrossWeightMeasure; 25 import com.agent.xml.fhlsli.common.IncludedTareGrossWeightMeasure;
  26 +import com.agent.xml.fhlsli.common.NatureIdentificationTransportCargo;
  27 +import com.agent.xml.fhlsli.common.OccurrenceArrivalLocation;
  28 +import com.agent.xml.fhlsli.common.OccurrenceDepartureLocation;
22 import com.agent.xml.fhlsli.common.OriginLocation; 29 import com.agent.xml.fhlsli.common.OriginLocation;
23 import com.agent.xml.fhlsli.common.PostalStructuredAddress; 30 import com.agent.xml.fhlsli.common.PostalStructuredAddress;
24 import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement; 31 import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement;
  32 +import com.agent.xml.fhlsli.common.UsedLogisticsTransportMeans;
25 import com.agent.xml.fhlsli.fhl.ApplicableLogisticsAllowanceCharge; 33 import com.agent.xml.fhlsli.fhl.ApplicableLogisticsAllowanceCharge;
26 import com.agent.xml.fhlsli.fhl.ApplicableTradeCurrencyExchange; 34 import com.agent.xml.fhlsli.fhl.ApplicableTradeCurrencyExchange;
27 import com.agent.xml.fhlsli.fhl.AssociatedUnitLoadTransportEquipment; 35 import com.agent.xml.fhlsli.fhl.AssociatedUnitLoadTransportEquipment;
@@ -88,12 +96,14 @@ public class FSXmlKit { @@ -88,12 +96,14 @@ public class FSXmlKit {
88 SliMain dflt = new SliMain(); 96 SliMain dflt = new SliMain();
89 SliMasterConsignment sliMasterConsignment = new SliMasterConsignment(); 97 SliMasterConsignment sliMasterConsignment = new SliMasterConsignment();
90 sliMasterConsignment.setID(me.getWaybillnomaster()); 98 sliMasterConsignment.setID(me.getWaybillnomaster());
91 - sliMasterConsignment.setNilCustomsValueIndicator("true");  
92 - sliMasterConsignment.setNilInsuranceValueIndicator("true"); 99 + sliMasterConsignment.setNilCarriageValueIndicator("false");
  100 + sliMasterConsignment.setNilInsuranceValueIndicator("false");
  101 + sliMasterConsignment.setNilCustomsValueIndicator("false");
  102 + sliMasterConsignment.setNilInsuranceValueIndicator("false");
93 sliMasterConsignment.setDeclaredValueForCarriageAmount(""); 103 sliMasterConsignment.setDeclaredValueForCarriageAmount("");
94 sliMasterConsignment.setInsuranceValueAmount(""); 104 sliMasterConsignment.setInsuranceValueAmount("");
95 - sliMasterConsignment.setTotalChargePrepaidIndicator("true");  
96 - sliMasterConsignment.setTotalDisbursementPrepaidIndicator("true"); 105 + sliMasterConsignment.setTotalChargePrepaidIndicator("false");
  106 + sliMasterConsignment.setTotalDisbursementPrepaidIndicator("false");
97 107
98 IncludedTareGrossWeightMeasure IncludedTareGrossWeightMeasure = new IncludedTareGrossWeightMeasure(); 108 IncludedTareGrossWeightMeasure IncludedTareGrossWeightMeasure = new IncludedTareGrossWeightMeasure();
99 IncludedTareGrossWeightMeasure.setIncludedTareGrossWeightMeasure(me.getTotalweight()); 109 IncludedTareGrossWeightMeasure.setIncludedTareGrossWeightMeasure(me.getTotalweight());
@@ -139,8 +149,37 @@ public class FSXmlKit { @@ -139,8 +149,37 @@ public class FSXmlKit {
139 sliMasterConsignment.setFinalDestinationLocation(destinationLocation); 149 sliMasterConsignment.setFinalDestinationLocation(destinationLocation);
140 150
141 SpecifiedLogisticsTransportMovement transport = new SpecifiedLogisticsTransportMovement(); 151 SpecifiedLogisticsTransportMovement transport = new SpecifiedLogisticsTransportMovement();
142 - transport.setStageCode(  
143 - me.getCarrier() + me.getFlightno() + "/" + Constant.dateFormat.format(me.getFlightdate())); 152 + UsedLogisticsTransportMeans meas = new UsedLogisticsTransportMeans();
  153 + meas.setName("");
  154 + transport.setUsedLogisticsTransportMeans(meas);
  155 +
  156 + ArrivalEvent arrivalEvent = new ArrivalEvent();
  157 + OccurrenceArrivalLocation occurrenceArrivalLocation = new OccurrenceArrivalLocation();
  158 + occurrenceArrivalLocation.setID(me.getDestinationstation());
  159 + occurrenceArrivalLocation.setName("");
  160 + occurrenceArrivalLocation.setTypeCode("");
  161 + arrivalEvent.setOccurrenceArrivalLocation(occurrenceArrivalLocation);
  162 + transport.setArrivalEvent(arrivalEvent);
  163 +
  164 + DepartureEvent departureEvent = new DepartureEvent();
  165 + OccurrenceDepartureLocation occurrenceDepartureLocation = new OccurrenceDepartureLocation();
  166 + occurrenceDepartureLocation.setID(me.getOriginatingstation());
  167 + occurrenceDepartureLocation.setName("");
  168 + occurrenceDepartureLocation.setTypeCode("");
  169 + departureEvent.setOccurrenceDepartureLocation(occurrenceDepartureLocation);
  170 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.CHINA);
  171 + departureEvent.setScheduledOccurrenceDateTime(sdf.format(me.getFlightdate()));
  172 + transport.setDepartureEvent(departureEvent);
  173 +
  174 + String flight = me.getCarrier() + me.getFlightno();
  175 + String date = Constant.getDateEnglish(me.getFlightdate());// 英文月日，eg：Jul01
  176 + transport.setStageCode(flight + "/" + date);
  177 +
  178 + transport.setModeCode("4");
  179 + transport.setMode("Air Transport");
  180 + transport.setID(flight);
  181 + transport.setSequenceNumeric("1");
  182 +
144 sliMasterConsignment.setSpecifiedLogisticsTransportMovement(transport); 183 sliMasterConsignment.setSpecifiedLogisticsTransportMovement(transport);
145 184
146 HandlingInstructions handlingInstructions = new HandlingInstructions(); 185 HandlingInstructions handlingInstructions = new HandlingInstructions();
@@ -173,6 +212,13 @@ public class FSXmlKit { @@ -173,6 +212,13 @@ public class FSXmlKit {
173 applicableFreightRateServiceCharge.setAppliedRate(""); 212 applicableFreightRateServiceCharge.setAppliedRate("");
174 applicableFreightRateServiceCharge.setAppliedAmount(""); 213 applicableFreightRateServiceCharge.setAppliedAmount("");
175 includedMasterConsignmentItem.setApplicableFreightRateServiceCharge(applicableFreightRateServiceCharge); 214 includedMasterConsignmentItem.setApplicableFreightRateServiceCharge(applicableFreightRateServiceCharge);
  215 +
  216 + NatureIdentificationTransportCargo natureIdentificationTransportCargo = new NatureIdentificationTransportCargo();
  217 + String productName = StringUtils.isNotBlank(me.getProductname()) ? me.getProductname() : "";
  218 + natureIdentificationTransportCargo.setIdentification(productName);
  219 + natureIdentificationTransportCargo.setExtraIdentification(productName);
  220 +
  221 + includedMasterConsignmentItem.setNatureIdentificationTransportCargo(natureIdentificationTransportCargo);
176 sliMasterConsignment.setIncludedMasterConsignmentItem(includedMasterConsignmentItem); 222 sliMasterConsignment.setIncludedMasterConsignmentItem(includedMasterConsignmentItem);
177 223
178 ReportedStatus reportedStatus = new ReportedStatus(); 224 ReportedStatus reportedStatus = new ReportedStatus();
@@ -226,6 +272,7 @@ public class FSXmlKit { @@ -226,6 +272,7 @@ public class FSXmlKit {
226 FhlMain dflt = new FhlMain(); 272 FhlMain dflt = new FhlMain();
227 HouseWaybill houseWaybill = new HouseWaybill(); 273 HouseWaybill houseWaybill = new HouseWaybill();
228 FhlMasterConsignment fhlMasterConsignment = new FhlMasterConsignment(); 274 FhlMasterConsignment fhlMasterConsignment = new FhlMasterConsignment();
  275 +
229 fhlMasterConsignment.setIncludedTareGrossWeightMeasure(pe.getTotalweight()); 276 fhlMasterConsignment.setIncludedTareGrossWeightMeasure(pe.getTotalweight());
230 fhlMasterConsignment.setTotalPieceQuantity(pe.getTotalpiece()); 277 fhlMasterConsignment.setTotalPieceQuantity(pe.getTotalpiece());
231 278
@@ -242,6 +289,17 @@ public class FSXmlKit { @@ -242,6 +289,17 @@ public class FSXmlKit {
242 fhlMasterConsignment.setFinalDestinationLocation(destinationLocation); 289 fhlMasterConsignment.setFinalDestinationLocation(destinationLocation);
243 290
244 IncludedHouseConsignment includedHouseConsignment = new IncludedHouseConsignment(); 291 IncludedHouseConsignment includedHouseConsignment = new IncludedHouseConsignment();
  292 +
  293 +// includedHouseConsignment.setID();
  294 +// includedHouseConsignment.setNilCarriageValueIndicator("false");
  295 +// includedHouseConsignment.setNilInsuranceValueIndicator("false");
  296 +// includedHouseConsignment.setNilCustomsValueIndicator("false");
  297 +// includedHouseConsignment.setNilInsuranceValueIndicator("false");
  298 +// includedHouseConsignment.setDeclaredValueForCarriageAmount("");
  299 +// includedHouseConsignment.setInsuranceValueAmount("");
  300 +// includedHouseConsignment.setTotalChargePrepaidIndicator("false");
  301 +// includedHouseConsignment.setTotalDisbursementPrepaidIndicator("false");
  302 +
245 TransportContractDocument transportContractDocumentSub = new TransportContractDocument(); 303 TransportContractDocument transportContractDocumentSub = new TransportContractDocument();
246 transportContractDocumentSub.setID(pe.getWaybillnosecondary()); 304 transportContractDocumentSub.setID(pe.getWaybillnosecondary());
247 includedHouseConsignment.setTransportContractDocument(transportContractDocumentSub); 305 includedHouseConsignment.setTransportContractDocument(transportContractDocumentSub);
@@ -306,6 +364,39 @@ public class FSXmlKit { @@ -306,6 +364,39 @@ public class FSXmlKit {
306 includedDestinationLocation.setID(pe.getDestinationstation()); 364 includedDestinationLocation.setID(pe.getDestinationstation());
307 includedHouseConsignment.setFinalDestinationLocation(includedDestinationLocation); 365 includedHouseConsignment.setFinalDestinationLocation(includedDestinationLocation);
308 366
  367 + SpecifiedLogisticsTransportMovement transport = new SpecifiedLogisticsTransportMovement();
  368 + UsedLogisticsTransportMeans meas = new UsedLogisticsTransportMeans();
  369 + meas.setName("");
  370 + transport.setUsedLogisticsTransportMeans(meas);
  371 +
  372 + ArrivalEvent arrivalEvent = new ArrivalEvent();
  373 + OccurrenceArrivalLocation occurrenceArrivalLocation = new OccurrenceArrivalLocation();
  374 + occurrenceArrivalLocation.setID(pe.getDestinationstation());
  375 + occurrenceArrivalLocation.setName("");
  376 + occurrenceArrivalLocation.setTypeCode("");
  377 + arrivalEvent.setOccurrenceArrivalLocation(occurrenceArrivalLocation);
  378 + transport.setArrivalEvent(arrivalEvent);
  379 +
  380 + DepartureEvent departureEvent = new DepartureEvent();
  381 + OccurrenceDepartureLocation occurrenceDepartureLocation = new OccurrenceDepartureLocation();
  382 + occurrenceDepartureLocation.setID(pe.getOriginatingstation());
  383 + occurrenceDepartureLocation.setName("");
  384 + occurrenceDepartureLocation.setTypeCode("");
  385 + departureEvent.setOccurrenceDepartureLocation(occurrenceDepartureLocation);
  386 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.CHINA);
  387 + departureEvent.setScheduledOccurrenceDateTime(sdf.format(pe.getFlightdate()));
  388 + transport.setDepartureEvent(departureEvent);
  389 +
  390 + String flight = pe.getCarrier() + pe.getFlightno();
  391 + String date = Constant.getDateEnglish(pe.getFlightdate());// 英文月日，eg：Jul01
  392 + transport.setStageCode(flight + "/" + date);
  393 +
  394 + transport.setModeCode("4");
  395 + transport.setMode("Air Transport");
  396 + transport.setID(flight);
  397 + transport.setSequenceNumeric("1");
  398 + includedHouseConsignment.setSpecifiedLogisticsTransportMovement(transport);
  399 +
309 HandlingInstructions handlingInstructions = new HandlingInstructions(); 400 HandlingInstructions handlingInstructions = new HandlingInstructions();
310 handlingInstructions.setDescriptionCode(pe.getProductname()); 401 handlingInstructions.setDescriptionCode(pe.getProductname());
311 handlingInstructions.setDescription(pe.getSpecialgoodscode()); 402 handlingInstructions.setDescription(pe.getSpecialgoodscode());
@@ -39,10 +39,14 @@ public class CustomMessageKit { @@ -39,10 +39,14 @@ public class CustomMessageKit {
39 return dirPath; 39 return dirPath;
40 } 40 }
41 41
42 - public static String getMessagePath() {  
43 - return getMessageLocalDir() + "/" + getMessageName(); 42 + public static String getMessagePath(String prefix) {
  43 + return getMessageLocalDir() + "/" + prefix + "_" + getMessageName();
44 } 44 }
45 45
  46 +// public static String getMessagePath() {
  47 +// return getMessageLocalDir() + "/" + getMessageName();
  48 +// }
  49 +
46 public static String getMessageName() { 50 public static String getMessageName() {
47 return "CN_MT2201_1P0_4604_70678920X_" + TimeUtils.getDate(new Date(), "yyyyMMddHHmmssSSS") + ".xml"; 51 return "CN_MT2201_1P0_4604_70678920X_" + TimeUtils.getDate(new Date(), "yyyyMMddHHmmssSSS") + ".xml";
48 } 52 }
@@ -374,6 +374,8 @@ handlebill.password=Password @@ -374,6 +374,8 @@ handlebill.password=Password
374 track.no=Freight Waybill No 374 track.no=Freight Waybill No
375 375
376 ### 376 ###
  377 +manifest.enterprise.code=Enterprise Code
  378 +manifest.enterprise.code.type=Select Code Type
377 manifest.list=Manifest List 379 manifest.list=Manifest List
378 manifest.flight=Flight No 380 manifest.flight=Flight No
379 manifest.agent=Agent Code 381 manifest.agent=Agent Code
@@ -376,6 +376,8 @@ handlebill.password=\u8BBE\u7F6E\u63D0\u8D27\u5BC6\u7801 @@ -376,6 +376,8 @@ handlebill.password=\u8BBE\u7F6E\u63D0\u8D27\u5BC6\u7801
376 track.no=\u8D27\u8FD0\u5355\u53F7 376 track.no=\u8D27\u8FD0\u5355\u53F7
377 377
378 ### 378 ###
  379 +manifest.enterprise.code=\u4F01\u4E1A\u4EE3\u7801
  380 +manifest.enterprise.code.type=\u8BF7\u9009\u62E9\u4EE3\u7801\u7C7B\u578B
379 manifest.list=\u9884\u914D\u8231\u5355\u5217\u8868 381 manifest.list=\u9884\u914D\u8231\u5355\u5217\u8868
380 manifest.flight=\u822A\u73ED\u822A\u6B21\u7F16\u53F7 382 manifest.flight=\u822A\u73ED\u822A\u6B21\u7F16\u53F7
381 manifest.agent=\u4EE3\u7406\u4F01\u4E1A\u4EE3\u7801 383 manifest.agent=\u4EE3\u7406\u4F01\u4E1A\u4EE3\u7801
@@ -589,7 +591,7 @@ manifest.transfer.station=\u4e2d\u8f6c\u7ad9 @@ -589,7 +591,7 @@ manifest.transfer.station=\u4e2d\u8f6c\u7ad9
589 manifest.packing.information=\u5305\u88c5\u4fe1\u606f 591 manifest.packing.information=\u5305\u88c5\u4fe1\u606f
590 manifest.Remarks=\u5907\u6ce8 592 manifest.Remarks=\u5907\u6ce8
591 manifest.delivery=\u4fdd\u5b58\u5e76\u53d1\u9001\u5230\u4ea4\u8fd0 593 manifest.delivery=\u4fdd\u5b58\u5e76\u53d1\u9001\u5230\u4ea4\u8fd0
592 -manifest.response_text=\u8FD0\u5355\u72B6\u6001; 594 +manifest.response_text=\u8FD0\u5355\u72B6\u6001
593 595
594 manifest.customs_status_001 = \u666E\u901A\u8D27\u7269 596 manifest.customs_status_001 = \u666E\u901A\u8D27\u7269
595 manifest.customs_status_002 = \u56FD\u9645\u8F6C\u8FD0\u8D27\u7269 597 manifest.customs_status_002 = \u56FD\u9645\u8F6C\u8FD0\u8D27\u7269
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 field : 'co_country', 97 field : 'co_country',
98 title : '国家代码', 98 title : '国家代码',
99 sort : true, 99 sort : true,
100 - width : 80 100 + width : 100
101 }, { 101 }, {
102 field : 'co_telephone', 102 field : 'co_telephone',
103 title : '电话' 103 title : '电话'
  1 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  2 +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
  3 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  4 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  5 +<%
  6 + String path = request.getContextPath();
  7 + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
  8 + + path + "/";
  9 +%>
  10 +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
  11 +<html>
  12 +<head>
  13 +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  14 +<meta name="viewport" content="width=device-width, initial-scale=1">
  15 +<title><spring:message code="menu.consignor_info_set" /></title>
  16 +<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
  17 +<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
  18 +<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
  19 +<!-- validate 验证中英文 -->
  20 +<script type="text/javascript"
  21 + src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
  22 +<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
  23 +<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
  24 +<script type="text/javascript" src="<%=basePath%>resource/js/tools.js"></script>
  25 +</head>
  26 +<body>
  27 + <div class="layui-collapse">
  28 + <div class="layui-colla-item">
  29 + <h2 class="layui-colla-title">
  30 + <spring:message code="consignor.list" />
  31 + </h2>
  32 + <div class="layui-colla-content layui-show">
  33 + <div class="layui-row">
  34 + <div class="layui-col-md12">
  35 + <button class="layui-btn" onclick="edit()">新增</button>
  36 + <button class="layui-btn layui-btn-danger" onclick="onDelete()">删除</button>
  37 + </div>
  38 + </div>
  39 + <table id="consignor-table" class="layui-hide" lay-filter="consignor-table"></table>
  40 + </div>
  41 + </div>
  42 + </div>
  43 +
  44 + <script type="text/html" id="opt-bar">
  45 + <i class="layui-icon layui-icon-edit" style="font-size: 14px; color: #1E9FFF;" lay-event="edit">编辑</i>
  46 + </script>
  47 +
  48 + <script>
  49 + var layer;
  50 + layui.use('layer', function() {
  51 + layer = layui.layer;
  52 + });
  53 +
  54 + layui.use('element', function() {
  55 + var element = layui.element;
  56 + });
  57 +
  58 + $(window).load(function() {
  59 + doSearch();
  60 + });
  61 +
  62 + var table;
  63 + function doSearch() {
  64 + var api = "<%=basePath%>consignor/search";
  65 + layui.use('table', function() {
  66 + table = layui.table;
  67 + table.on('checkbox(consignor-table)', function(obj) {
  68 + /* console.log(JSON.stringify(obj)) */
  69 + });
  70 +
  71 + table.render({
  72 + elem : '#consignor-table',
  73 + url : api,
  74 + limit : 10,
  75 + page : true,
  76 + loading : true,
  77 + limits : [ 10, 15, 20, 25, 30, 35, 40, 45, 50 ],
  78 + text : '暂无数据',
  79 + cols : [ [ //表头
  80 + {
  81 + type : 'checkbox',
  82 + fixed : 'left',
  83 + width : 60
  84 + }, {
  85 + field : '',
  86 + title : '操作',
  87 + toolbar : '#opt-bar',
  88 + width : 80
  89 + }, {
  90 + field : 'co_company',
  91 + title : '发货人公司',
  92 + }, {
  93 + field : 'co_city',
  94 + title : '发货人城市',
  95 + sort : true
  96 + }, {
  97 + field : 'co_country',
  98 + title : '国家代码',
  99 + sort : true,
  100 + width : 80
  101 + }, {
  102 + field : 'co_telephone',
  103 + title : '电话'
  104 + } ] ]
  105 + });
  106 + });
  107 + }
  108 +
  109 + function onDelete() {
  110 + var checkStatus = table.checkStatus('consignor-table');
  111 + var data = checkStatus.data;
  112 + if(data&&data.length){
  113 + var ids="";
  114 + for (var i = 0; i < data.length; i++) {
  115 + var item = data[i];
  116 + var id = item.id;
  117 + ids+=id;
  118 + ids+=","
  119 + }
  120 +
  121 + parent.layer.confirm('确定删除吗？', function(index) {
  122 + layer.close(index);
  123 + doDelete(ids);
  124 + });
  125 + }
  126 + }
  127 +
  128 + function doDelete(ids) {
  129 + var api = "<%=basePath%>consignor/delete";
  130 + $.post(api, "ids="+ids, function(response, status) {
  131 + if(response.status==200){
  132 + layer.msg('删除成功');
  133 + window.location.reload();
  134 + }else{
  135 + layer.msg("操作失败");
  136 + console.log("response-->"+JSON.stringify(response));
  137 + }
  138 + });
  139 + }
  140 +
  141 + layui.use('table', function() {
  142 + var table = layui.table;
  143 + table.on('tool(consignor-table)', function(obj) { //注：tool是工具条事件名，test是table原始容器的属性 lay-filter="对应的值"
  144 + var data = obj.data; //获得当前行数据
  145 + var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
  146 + var tr = obj.tr; //获得当前行 tr 的DOM对象
  147 +
  148 + if (layEvent === 'edit') { //编辑
  149 + window.location.href = "<%=basePath%>/consignor/edit?id="+data.id;
  150 + }
  151 + });
  152 + });
  153 +
  154 + function edit(){
  155 + window.location.href = "<%=basePath%>/consignor/edit";
  156 + }
  157 +
  158 + </script>
  159 +</body>
  160 +</html>
1 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> 1 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  2 +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> 3 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
3 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> 4 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
4 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> 5 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
@@ -13,7 +14,7 @@ @@ -13,7 +14,7 @@
13 <head> 14 <head>
14 <meta charset="utf-8"> 15 <meta charset="utf-8">
15 <meta name="viewport" content="width=device-width, initial-scale=1"> 16 <meta name="viewport" content="width=device-width, initial-scale=1">
16 -<link href="<%=basePath%>resource/css/base.css" rel="stylesheet"> 17 +<link href="<%=basePath%>resource/css/base.css?ver=1.0" rel="stylesheet">
17 <link href="<%=basePath%>resource/css/basic_info.css" rel="stylesheet"> 18 <link href="<%=basePath%>resource/css/basic_info.css" rel="stylesheet">
18 <link rel="stylesheet" type="text/css" href="<%=basePath%>resource/easyui/uimaker/icon.css"> 19 <link rel="stylesheet" type="text/css" href="<%=basePath%>resource/easyui/uimaker/icon.css">
19 <link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css"> 20 <link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css">
@@ -21,6 +22,10 @@ @@ -21,6 +22,10 @@
21 <script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script> 22 <script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
22 <script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script> 23 <script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
23 <script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script> 24 <script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
  25 +
  26 +<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
  27 +<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
  28 +
24 <style type="text/css"> 29 <style type="text/css">
25 .required_span { 30 .required_span {
26 color: red; 31 color: red;
@@ -43,15 +48,32 @@ @@ -43,15 +48,32 @@
43 <table class="kv-table"> 48 <table class="kv-table">
44 <tbody> 49 <tbody>
45 <tr> 50 <tr>
46 - <td class="kv-label" colspan="6"><spring:message code="manifest.bill.number" /></td> 51 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  52 + code="manifest.bill.number" /></td>
47 </tr> 53 </tr>
48 <tr> 54 <tr>
49 <td class="kv-label"><spring:message code="manifest.bill.number" /><span 55 <td class="kv-label"><spring:message code="manifest.bill.number" /><span
50 class="required_span">*</span></td> 56 class="required_span">*</span></td>
51 - <td class="kv-content" colspan="5"><input required id="waybill" minlength="12"  
52 - maxlength="12" type="text" onblur="input_change(this)"> <input required  
53 - id="waybillnomaster" minlength="12" maxlength="12" name="waybillnomaster" type="hidden" 57 + <td class="kv-content"><input required id="waybill" minlength="12" maxlength="12"
  58 + type="text" onblur="input_change(this)"> <input required id="waybillnomaster"
  59 + minlength="12" maxlength="12" name="waybillnomaster" type="hidden"
54 value="${manifest.waybillnomaster }"></td> 60 value="${manifest.waybillnomaster }"></td>
  61 + <td class="kv-label"><spring:message code="delivery.delivery.station" /><span
  62 + class="required_span">*</span></td>
  63 + <td class="kv-content"><select id="delivery_station" name="delivery_station">
  64 + <option value="001"
  65 + <c:if test = "${manifest.delivery_station ==001 }">selected="selected"</c:if>><spring:message
  66 + code="delivery.ground.handling" /></option>
  67 + </select></td>
  68 + <td class="kv-label"><spring:message code="delivery.delivery.type" /></td>
  69 + <td class="kv-content"><select class="delivery" id="de_type" name="de_type">
  70 + <option value="001" <c:if test = "${manifest.de_type ==001 }">selected="selected"</c:if>><spring:message
  71 + code="manifest.general.delivery" /></option>
  72 + <option value="002" <c:if test = "${manifest.de_type ==002 }">selected="selected"</c:if>><spring:message
  73 + code="manifest.mail.delivery" /></option>
  74 + <option value="003" <c:if test = "${manifest.de_type ==003 }">selected="selected"</c:if>><spring:message
  75 + code="manifest.International" /></option>
  76 + </select></td>
55 <script> 77 <script>
56 function input_change(obj){ 78 function input_change(obj){
57 var val = $(obj).val(); 79 var val = $(obj).val();
@@ -73,48 +95,48 @@ @@ -73,48 +95,48 @@
73 } 95 }
74 </script> 96 </script>
75 </tr> 97 </tr>
76 - <tr>  
77 - <td class="kv-label"><spring:message code="delivery.name.of.goods" /></td> 98 + <!-- <tr> -->
  99 + <%-- <td class="kv-label"><spring:message code="delivery.name.of.goods" /></td>
78 <td class="kv-content"><input id="name_ofgoods" name="name_ofgoods" type="text" 100 <td class="kv-content"><input id="name_ofgoods" name="name_ofgoods" type="text"
79 - value="${manifest.name_ofgoods }"></td>  
80 - <td class="kv-label"><spring:message code="delivery.delivery.station" /><span 101 + value="${manifest.name_ofgoods }"></td> --%>
  102 + <%-- <td class="kv-label"><spring:message code="delivery.delivery.station" /><span
81 class="required_span">*</span></td> 103 class="required_span">*</span></td>
82 <td class="kv-content"><select id="delivery_station" name="delivery_station"> 104 <td class="kv-content"><select id="delivery_station" name="delivery_station">
83 - <%-- <option value=""><spring:message code="opt.select"/></option> --%>  
84 <option value="001" 105 <option value="001"
85 <c:if test = "${manifest.delivery_station ==001 }">selected="selected"</c:if>><spring:message 106 <c:if test = "${manifest.delivery_station ==001 }">selected="selected"</c:if>><spring:message
86 code="delivery.ground.handling" /></option> 107 code="delivery.ground.handling" /></option>
87 </select></td> 108 </select></td>
88 <td class="kv-label"><spring:message code="delivery.delivery.type" /></td> 109 <td class="kv-label"><spring:message code="delivery.delivery.type" /></td>
89 <td class="kv-content"><select class="delivery" id="de_type" name="de_type"> 110 <td class="kv-content"><select class="delivery" id="de_type" name="de_type">
90 - <%-- <option value=""><spring:message code="opt.select"/></option> --%>  
91 <option value="001" <c:if test = "${manifest.de_type ==001 }">selected="selected"</c:if>><spring:message 111 <option value="001" <c:if test = "${manifest.de_type ==001 }">selected="selected"</c:if>><spring:message
92 code="manifest.general.delivery" /></option> 112 code="manifest.general.delivery" /></option>
93 <option value="002" <c:if test = "${manifest.de_type ==002 }">selected="selected"</c:if>><spring:message 113 <option value="002" <c:if test = "${manifest.de_type ==002 }">selected="selected"</c:if>><spring:message
94 code="manifest.mail.delivery" /></option> 114 code="manifest.mail.delivery" /></option>
95 <option value="003" <c:if test = "${manifest.de_type ==003 }">selected="selected"</c:if>><spring:message 115 <option value="003" <c:if test = "${manifest.de_type ==003 }">selected="selected"</c:if>><spring:message
96 code="manifest.International" /></option> 116 code="manifest.International" /></option>
97 - </select></td>  
98 - </tr> 117 + </select></td> --%>
  118 + <!-- </tr> -->
99 <tr> 119 <tr>
100 - <td class="kv-label" colspan="6"><spring:message code="manifest.flight.information" /></td> 120 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  121 + code="manifest.flight.information" /></td>
101 </tr> 122 </tr>
102 <tr> 123 <tr>
103 <td class="kv-label"><spring:message code="manifest.carrier" /><span 124 <td class="kv-label"><spring:message code="manifest.carrier" /><span
104 class="required_span">*</span></td> 125 class="required_span">*</span></td>
105 <td class="kv-content"><input required id="carrier_new" name="carrier" type="text" 126 <td class="kv-content"><input required id="carrier_new" name="carrier" type="text"
106 - value="${manifest.carrier}"  
107 - oninput="onInputChange(event,'carrier_new','oninput')" 127 + value="${manifest.carrier}" oninput="onInputChange(event,'carrier_new','oninput')"
108 onpropertychange="onInputChange(event,'carrier_new','onpropertychange')"></td> 128 onpropertychange="onInputChange(event,'carrier_new','onpropertychange')"></td>
109 129
110 <td class="kv-label"><spring:message code="manifest.flight.number" /><span 130 <td class="kv-label"><spring:message code="manifest.flight.number" /><span
111 class="required_span">*</span></td> 131 class="required_span">*</span></td>
112 <td class="kv-content"><input required id="flightno" name="flightno" type="text" 132 <td class="kv-content"><input required id="flightno" name="flightno" type="text"
113 - value="${manifest.flightno }"></td> 133 + value="${manifest.flightno }" oninput="onInputChange(event,'flightno','oninput')"
  134 + onpropertychange="onInputChange(event,'flightno','onpropertychange')"></td>
114 135
115 - <td class="kv-label"><spring:message code="manifest.flight.date" /></td>  
116 - <td class="kv-content"><input type="text" class="date bill Wdate" id="flightdate"  
117 - name="flightdate" required 136 + <td class="kv-label"><spring:message code="manifest.flight.date" /><span
  137 + class="required_span">*</span></td>
  138 + <td class="kv-content"><input type="text" class="date bill Wdate"
  139 + id="flightdate" name="flightdate" required autocomplete="off"
118 value="<fmt:formatDate pattern='yyyy-MM-dd' value='${manifest.flightdate }'></fmt:formatDate>"> 140 value="<fmt:formatDate pattern='yyyy-MM-dd' value='${manifest.flightdate }'></fmt:formatDate>">
119 </td> 141 </td>
120 </tr> 142 </tr>
@@ -133,18 +155,19 @@ @@ -133,18 +155,19 @@
133 onpropertychange="onInputChange(event,'destinationstation','onpropertychange')" /></td> 155 onpropertychange="onInputChange(event,'destinationstation','onpropertychange')" /></td>
134 </tr> 156 </tr>
135 <tr> 157 <tr>
136 - <td class="kv-label" colspan="6"><spring:message code="manifest.cargo.information" /></td> 158 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  159 + code="manifest.cargo.information" /></td>
137 160
138 </tr> 161 </tr>
139 <tr> 162 <tr>
140 - <td class="kv-label"><spring:message code="manifest.number.of.consignment.note" /><span 163 + <td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
141 class="required_span">*</span></td> 164 class="required_span">*</span></td>
142 <td class="kv-content"><input required class="delivery number" id="totalpiece" 165 <td class="kv-content"><input required class="delivery number" id="totalpiece"
143 name="totalpiece" type="text" value="${manifest.totalpiece}" 166 name="totalpiece" type="text" value="${manifest.totalpiece}"
144 oninput="onInputChange(event,'totalpiece','oninput')" 167 oninput="onInputChange(event,'totalpiece','oninput')"
145 onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"></td> 168 onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"></td>
146 169
147 - <td class="kv-label"><spring:message code="manifest.waybill.weight" /><span 170 + <td class="kv-label"><spring:message code="manifest.pre.weight" /><span
148 class="required_span">*</span></td> 171 class="required_span">*</span></td>
149 <td class="kv-content"><input required class="delivery number" id="totalweight" 172 <td class="kv-content"><input required class="delivery number" id="totalweight"
150 name="totalweight" type="text" value="${manifest.totalweight}" 173 name="totalweight" type="text" value="${manifest.totalweight}"
@@ -171,10 +194,10 @@ @@ -171,10 +194,10 @@
171 <option value="CC" <c:if test = "${manifest.paymode == 'CC' }">selected="selected"</c:if>><spring:message 194 <option value="CC" <c:if test = "${manifest.paymode == 'CC' }">selected="selected"</c:if>><spring:message
172 code="manifest.to.pay" /></option> 195 code="manifest.to.pay" /></option>
173 </select></td> 196 </select></td>
174 - <td class="kv-label"><spring:message code="manifest.fitting.time" /><span 197 + <td style="display: none;" class="kv-label"><spring:message code="manifest.fitting.time" /><span
175 class="required_span">*</span></td> 198 class="required_span">*</span></td>
176 - <td class="kv-content"><input required type="text" class=" bill "  
177 - id="stowagedate" name="stowagedate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" 199 + <td style="display: none;" class="kv-content"><input required type="text" class=" bill " id="stowagedate"
  200 + name="stowagedate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})"
178 value="<fmt:formatDate pattern='yyyy-MM-dd HH:mm:ss' value='${manifest.stowagedate }'></fmt:formatDate>"> 201 value="<fmt:formatDate pattern='yyyy-MM-dd HH:mm:ss' value='${manifest.stowagedate }'></fmt:formatDate>">
179 </td> 202 </td>
180 <td class="kv-label"><spring:message code="manifest.customs.status" /><span 203 <td class="kv-label"><spring:message code="manifest.customs.status" /><span
@@ -205,8 +228,9 @@ @@ -205,8 +228,9 @@
205 name="preparetotalpiece" type="text" value="${manifest.preparetotalpiece}"></td> 228 name="preparetotalpiece" type="text" value="${manifest.preparetotalpiece}"></td>
206 <td class="kv-label"><spring:message code="manifest.pre.weight" /><span 229 <td class="kv-label"><spring:message code="manifest.pre.weight" /><span
207 class="required_span">*</span></td> 230 class="required_span">*</span></td>
208 - <td class="kv-content" colspan="3"><input required class="delivery number" id="preparetotalweight"  
209 - name="preparetotalweight" type="text" value="${manifest.preparetotalweight}"></td> 231 + <td class="kv-content" colspan="3"><input required class="delivery number"
  232 + id="preparetotalweight" name="preparetotalweight" type="text"
  233 + value="${manifest.preparetotalweight}"></td>
210 </tr> 234 </tr>
211 <tr> 235 <tr>
212 <td class="kv-label"><spring:message code="manifest.description.of.the.goods" /><span 236 <td class="kv-label"><spring:message code="manifest.description.of.the.goods" /><span
@@ -214,7 +238,7 @@ @@ -214,7 +238,7 @@
214 <td class="kv-content" colspan="5"><textarea required id="productname" 238 <td class="kv-content" colspan="5"><textarea required id="productname"
215 name="productname" maxlength="200">${manifest.productname}</textarea></td> 239 name="productname" maxlength="200">${manifest.productname}</textarea></td>
216 </tr> 240 </tr>
217 - <tr> 241 + <%-- <tr>
218 <td class="kv-label"><spring:message code="manifest.agent.name" /></td> 242 <td class="kv-label"><spring:message code="manifest.agent.name" /></td>
219 <td class="kv-content"><input id="agentman" name="agentman" type="text" 243 <td class="kv-content"><input id="agentman" name="agentman" type="text"
220 value="${manifest.agentman}" 244 value="${manifest.agentman}"
@@ -224,12 +248,13 @@ @@ -224,12 +248,13 @@
224 <input id="agentcompany" name="agentcompany" type="text" value="${manifest.agentcompany}" 248 <input id="agentcompany" name="agentcompany" type="text" value="${manifest.agentcompany}"
225 placeholder="<spring:message code="agent.companyPlaceholder"/>"> 249 placeholder="<spring:message code="agent.companyPlaceholder"/>">
226 </td> 250 </td>
227 - </tr> 251 + </tr> --%>
228 <!-- 发货人信息 start --> 252 <!-- 发货人信息 start -->
229 - <tr>  
230 - <td class="kv-label" colspan="1"><spring:message code="manifest.shipper.information" />  
231 - </td>  
232 - <td class="kv-content" colspan="5"><select onchange="changeConsignorSelect()" 253 + <tr style="background-color: #EBEDF4; color: black;">
  254 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="1"><spring:message
  255 + code="manifest.shipper.information" /></td>
  256 + <!-- <td class="kv-label"> <button type="button" class="layui-btn layui-btn-normal layui-icon layui-icon-user" onclick="showDialog()">弹出选择框</button> </td> -->
  257 + <td class="kv-content" colspan="4"><select onchange="changeConsignorSelect()"
233 id="fh_select"> 258 id="fh_select">
234 <option value="-1">请选择</option> 259 <option value="-1">请选择</option>
235 </select> <script> 260 </select> <script>
@@ -242,7 +267,15 @@ @@ -242,7 +267,15 @@
242 { 267 {
243 var consignor = consignorList[index]; 268 var consignor = consignorList[index];
244 $("#co_company").val(consignor.co_company?consignor.co_company:""); 269 $("#co_company").val(consignor.co_company?consignor.co_company:"");
245 - $("#co_address").val(consignor.co_address?consignor.co_address:""); 270 + var address = consignor.co_address;
  271 + if(notEmpty(address)){
  272 + if(address.length>70){
  273 + address = address.substring(0,70);
  274 + }
  275 + }else{
  276 + address = "";
  277 + }
  278 + $("#co_address").val(address);
246 $("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:""); 279 $("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
247 $("#co_country").val(consignor.co_country?consignor.co_country:""); 280 $("#co_country").val(consignor.co_country?consignor.co_country:"");
248 $("#co_city").val(consignor.co_city?consignor.co_city:""); 281 $("#co_city").val(consignor.co_city?consignor.co_city:"");
@@ -251,7 +284,14 @@ @@ -251,7 +284,14 @@
251 $("#co_fax").val(consignor.co_fax?consignor.co_fax:""); 284 $("#co_fax").val(consignor.co_fax?consignor.co_fax:"");
252 $("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:""); 285 $("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
253 $("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:""); 286 $("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
254 - $("#shpcusid").val(consignor.shpcusid?consignor.shpcusid:""); 287 +
  288 + if(notEmpty(consignor.shpcusid)){
  289 + var temp = consignor.shpcusid.split("+")[1];
  290 + if(notEmpty(temp)){
  291 + $("#shpcusid").val(temp);
  292 + }
  293 + }
  294 +
255 } 295 }
256 } 296 }
257 } 297 }
@@ -273,39 +313,37 @@ @@ -273,39 +313,37 @@
273 } 313 }
274 } 314 }
275 }); 315 });
276 - </script></td>  
277 - 316 + </script>
  317 + </td>
278 </tr> 318 </tr>
279 <tr> 319 <tr>
280 <td class="kv-label"><spring:message code="manifest.company" /><span 320 <td class="kv-label"><spring:message code="manifest.company" /><span
281 class="required_span">*</span></td> 321 class="required_span">*</span></td>
282 - <td class="kv-content">  
283 - <input required id="co_company" name="co_company" type="text" value="${manifest.co_company}"  
284 - oninput="onInputChange(event,'co_company','oninput')"  
285 - onpropertychange="onInputChange(event,'co_company','onpropertychange')">  
286 - </td> 322 + <td class="kv-content"><input required id="co_company" name="co_company" type="text"
  323 + value="${manifest.co_company}" oninput="onInputChange(event,'co_company','oninput')"
  324 + onpropertychange="onInputChange(event,'co_company','onpropertychange')"></td>
287 <td class="kv-label"><spring:message code="manifest.address" /><span 325 <td class="kv-label"><spring:message code="manifest.address" /><span
288 class="required_span">*</span></td> 326 class="required_span">*</span></td>
289 <td class="kv-content"><input required id="co_address" name="co_address" type="text" 327 <td class="kv-content"><input required id="co_address" name="co_address" type="text"
290 value="${manifest.co_address}" maxlength="70"></td> 328 value="${manifest.co_address}" maxlength="70"></td>
291 - <td class="kv-label"><spring:message code="manifest.zip.code" /></td>  
292 - <td class="kv-content" colspan="5"><input id="co_zipcode" name="co_zipcode" type="text"  
293 - value="${manifest.co_zipcode }"></td> 329 + <td class="kv-label"><spring:message code="manifest.country" /><span
  330 + class="required_span">*</span></td>
  331 + <td class="kv-content"><input required id="co_country" name="co_country" maxlength="2"
  332 + type="text" value="${manifest.co_country }"
  333 + oninput="onInputChange(event,'co_country','oninput')"
  334 + onpropertychange="onInputChange(event,'co_country','onpropertychange')"></td>
294 </tr> 335 </tr>
295 <tr> 336 <tr>
296 - <td class="kv-label"><spring:message code="manifest.city" /></td> 337 + <%-- <td class="kv-label"><spring:message code="manifest.city" /></td>
297 <td class="kv-content"><input id="co_city" name="co_city" type="text" 338 <td class="kv-content"><input id="co_city" name="co_city" type="text"
298 value="${manifest.co_city }" oninput="onInputChange(event,'co_city','oninput')" 339 value="${manifest.co_city }" oninput="onInputChange(event,'co_city','oninput')"
299 - onpropertychange="onInputChange(event,'co_city','onpropertychange')"></td> 340 + onpropertychange="onInputChange(event,'co_city','onpropertychange')"></td> --%>
300 <td class="kv-label"><spring:message code="manifest.state" /></td> 341 <td class="kv-label"><spring:message code="manifest.state" /></td>
301 <td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text" 342 <td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text"
302 value="${manifest.co_deltaname}"></td> 343 value="${manifest.co_deltaname}"></td>
303 - <td class="kv-label"><spring:message code="manifest.country" /><span  
304 - class="required_span">*</span></td>  
305 - <td class="kv-content" colspan="5"><input required id="co_country" name="co_country"  
306 - type="text" value="${manifest.co_country }"  
307 - oninput="onInputChange(event,'co_country','oninput')"  
308 - onpropertychange="onInputChange(event,'co_country','onpropertychange')"></td> 344 + <td class="kv-label"><spring:message code="manifest.zip.code" /></td>
  345 + <td class="kv-content" colspan="3"><input id="co_zipcode" name="co_zipcode" type="text"
  346 + value="${manifest.co_zipcode }"></td>
309 </tr> 347 </tr>
310 <tr> 348 <tr>
311 <td class="kv-label"><spring:message code="manifest.telephone" /></td> 349 <td class="kv-label"><spring:message code="manifest.telephone" /></td>
@@ -316,28 +354,48 @@ @@ -316,28 +354,48 @@
316 <td class="kv-content"><input id="co_fax" name="co_fax" type="text" 354 <td class="kv-content"><input id="co_fax" name="co_fax" type="text"
317 value="${manifest.co_fax }" 355 value="${manifest.co_fax }"
318 placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td> 356 placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
319 - <td style="display: none;" class="kv-label"><spring:message code="manifest.send_name" /><span  
320 - class="required_span">*</span></td>  
321 - <td style="display: none;" class="kv-content" colspan="5"><input required id="co_name" name="co_name" type="text"  
322 - value="${manifest.co_name }"></td>  
323 - </tr>  
324 - <tr>  
325 <td class="kv-label"><spring:message code="manifest.fhr.shpaeo" /></td> 357 <td class="kv-label"><spring:message code="manifest.fhr.shpaeo" /></td>
326 <td class="kv-content"><input id="shpaeo" name="shpaeo" type="text" 358 <td class="kv-content"><input id="shpaeo" name="shpaeo" type="text"
327 value="${manifest.shpaeo }" oninput="onInputChange(event,'shpaeo','oninput')" 359 value="${manifest.shpaeo }" oninput="onInputChange(event,'shpaeo','oninput')"
328 onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td> 360 onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td>
329 - <td class="kv-label"><spring:message code="manifest.fhr.shpcusid" /><span 361 + </tr>
  362 +
  363 + <tr style="display: none;">
  364 + <td style="display: none;" class="kv-label"><spring:message code="manifest.send_name" /><span
330 class="required_span">*</span></td> 365 class="required_span">*</span></td>
331 - <td class="kv-content" colspan="3"><input required id="shpcusid" name="shpcusid"  
332 - type="text" value="${manifest.shpcusid }" 366 + <td style="display: none;" class="kv-content" colspan="5"><input required id="co_name"
  367 + name="co_name" type="text" value="${manifest.co_name }"></td>
  368 + </tr>
  369 + <tr>
  370 + <td class="kv-label" colspan="6">
  371 + <select id="co_cusid" required>
  372 + <c:if test="${not empty manifest.shpcusid}">
  373 + <c:set var="tempShpType" value='${fn:split(manifest.shpcusid,"+")[0]}' />
  374 + <option value="${tempShpType}">${tempShpType}</option>
  375 + </c:if>
  376 +
  377 + <c:if test="${empty manifest.shpcusid}">
  378 + <option value=""><spring:message code="manifest.enterprise.code.type" /></option>
  379 + </c:if>
  380 + </select>
  381 + <span style="color: black; font-size: 16px;">+</span>
  382 + <input id="shpcusid" type="text" required
  383 + <c:if test="${not empty manifest.shpcusid}">
  384 + <c:set var="tempShpValue" value='${fn:split(manifest.shpcusid,"+")[1]}' />
  385 + value="${tempShpValue}"
  386 + </c:if>
  387 +
  388 + placeholder="<spring:message code='manifest.enterprise.code' />"
333 oninput="onInputChange(event,'shpcusid','oninput')" 389 oninput="onInputChange(event,'shpcusid','oninput')"
334 - onpropertychange="onInputChange(event,'shpcusid','onpropertychange')"></td> 390 + onpropertychange="onInputChange(event,'shpcusid','onpropertychange')">
  391 + </td>
335 </tr> 392 </tr>
336 <!-- 发货人信息 end --> 393 <!-- 发货人信息 end -->
337 394
338 <!-- 收货人信息 start --> 395 <!-- 收货人信息 start -->
339 - <tr>  
340 - <td class="kv-label" colspan="1"><spring:message code="manifest.consignee" /></td> 396 + <tr style="background-color: #EBEDF4; color: black;">
  397 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="1"><spring:message
  398 + code="manifest.consignee" /></td>
341 <td class="kv-content" colspan="5"><select onchange="changeConsigneeSelect()" 399 <td class="kv-content" colspan="5"><select onchange="changeConsigneeSelect()"
342 id="consignee_select"> 400 id="consignee_select">
343 <option value="-1">请选择</option> 401 <option value="-1">请选择</option>
@@ -351,9 +409,20 @@ @@ -351,9 +409,20 @@
351 { 409 {
352 var consignee = consigneeList[index]; 410 var consignee = consigneeList[index];
353 $("#sh_company").val(consignee.code?consignee.code:""); 411 $("#sh_company").val(consignee.code?consignee.code:"");
354 - $("#sh_address").val(consignee.address?consignee.address:""); 412 +
  413 + var address = consignee.co_address;
  414 + if(notEmpty(address)){
  415 + if(address.length>70){
  416 + address = address.substring(0,70);
  417 + }
  418 + }else{
  419 + address = "";
  420 + }
  421 +
  422 + $("#sh_address").val(address);
355 $("#sh_telephone").val(consignee.tel?consignee.tel:""); 423 $("#sh_telephone").val(consignee.tel?consignee.tel:"");
356 $("#sh_country").val(consignee.name?consignee.name:""); 424 $("#sh_country").val(consignee.name?consignee.name:"");
  425 + $("#sh_name").val(consignee.code?consignee.code:"");
357 } 426 }
358 } 427 }
359 } 428 }
@@ -381,16 +450,18 @@ @@ -381,16 +450,18 @@
381 <td class="kv-label"><spring:message code="manifest.company" /><span 450 <td class="kv-label"><spring:message code="manifest.company" /><span
382 class="required_span">*</span></td> 451 class="required_span">*</span></td>
383 <td class="kv-content"><input required id="sh_company" name="sh_company" type="text" 452 <td class="kv-content"><input required id="sh_company" name="sh_company" type="text"
384 - value="${manifest.sh_company }"  
385 - oninput="onInputChange(event,'sh_company','oninput')" 453 + value="${manifest.sh_company }" oninput="onInputChange(event,'sh_company','oninput')"
386 onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td> 454 onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td>
387 <td class="kv-label"><spring:message code="manifest.address" /><span 455 <td class="kv-label"><spring:message code="manifest.address" /><span
388 class="required_span">*</span></td> 456 class="required_span">*</span></td>
389 - <td class="kv-content"><input required id="sh_address" name="sh_address" maxlength="70" type="text"  
390 - value="${manifest.sh_address }"></td>  
391 - <td class="kv-label"><spring:message code="manifest.zip.code" /></td>  
392 - <td class="kv-content" colspan="5"><input id="sh_zipcode" name="sh_zipcode" type="text"  
393 - value="${manifest.sh_zipcode }"></td> 457 + <td class="kv-content"><input required id="sh_address" name="sh_address" maxlength="70"
  458 + type="text" value="${manifest.sh_address }"></td>
  459 + <td class="kv-label"><spring:message code="manifest.country" /><span
  460 + class="required_span">*</span></td>
  461 + <td class="kv-content"><input required id="sh_country" name="sh_country" maxlength="2"
  462 + type="text" value="${manifest.sh_country }"
  463 + oninput="onInputChange(event,'sh_country','oninput')"
  464 + onpropertychange="onInputChange(event,'sh_country','onpropertychange')"></td>
394 </tr> 465 </tr>
395 <tr> 466 <tr>
396 <td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td> 467 <td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td>
@@ -400,12 +471,9 @@ @@ -400,12 +471,9 @@
400 <td class="kv-label"><spring:message code="manifest.state" /></td> 471 <td class="kv-label"><spring:message code="manifest.state" /></td>
401 <td class="kv-content"><input id="sh_deltaname" name="sh_deltaname" type="text" 472 <td class="kv-content"><input id="sh_deltaname" name="sh_deltaname" type="text"
402 value="${manifest.sh_deltaname}"></td> 473 value="${manifest.sh_deltaname}"></td>
403 - <td class="kv-label"><spring:message code="manifest.country.code" /><span  
404 - class="required_span">*</span></td>  
405 - <td class="kv-content" colspan="5"><input required id="sh_country" name="sh_country"  
406 - type="text" value="${manifest.sh_country }"  
407 - oninput="onInputChange(event,'sh_country','oninput')"  
408 - onpropertychange="onInputChange(event,'sh_country','onpropertychange')"></td> 474 + <td class="kv-label"><spring:message code="manifest.zip.code" /></td>
  475 + <td class="kv-content"><input id="sh_zipcode" name="sh_zipcode" type="text"
  476 + value="${manifest.sh_zipcode }"></td>
409 </tr> 477 </tr>
410 <tr> 478 <tr>
411 <td class="kv-label"><spring:message code="manifest.telephone" /></td> 479 <td class="kv-label"><spring:message code="manifest.telephone" /></td>
@@ -414,12 +482,18 @@ @@ -414,12 +482,18 @@
414 <td class="kv-label"><spring:message code="manifest.fax" /></td> 482 <td class="kv-label"><spring:message code="manifest.fax" /></td>
415 <td class="kv-content"><input id="sh_fax" name="sh_fax" type="text" 483 <td class="kv-content"><input id="sh_fax" name="sh_fax" type="text"
416 value="${manifest.sh_fax }"></td> 484 value="${manifest.sh_fax }"></td>
  485 + <td class="kv-label"><spring:message code="manifest.shr.cneaeo" /></td>
  486 + <td class="kv-content"><input id="cneaeo" name="cneaeo" type="text"
  487 + value="${manifest.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"
  488 + onpropertychange="onInputChange(event,'cneaeo','onpropertychange')"></td>
  489 + </tr>
  490 + <tr style="display: none;">
417 <td style="display: none;" class="kv-label"><spring:message code="manifest.receive_name" /><span 491 <td style="display: none;" class="kv-label"><spring:message code="manifest.receive_name" /><span
418 class="required_span">*</span></td> 492 class="required_span">*</span></td>
419 - <td style="display: none;" class="kv-content" colspan="5"><input required id="sh_name" name="sh_name"  
420 - type="text" value="${manifest.sh_name }"></td> 493 + <td style="display: none;" class="kv-content" colspan="5"><input required id="sh_name"
  494 + name="sh_name" type="text" value="${manifest.sh_name }"></td>
421 </tr> 495 </tr>
422 - <tr> 496 + <%-- <tr>
423 <td class="kv-label"><spring:message code="manifest.province.code" /></td> 497 <td class="kv-label"><spring:message code="manifest.province.code" /></td>
424 <td class="kv-content"><input id="sh_provincecode" name="sh_provincecode" type="text" 498 <td class="kv-content"><input id="sh_provincecode" name="sh_provincecode" type="text"
425 value="${manifest.sh_provincecode }" 499 value="${manifest.sh_provincecode }"
@@ -428,21 +502,37 @@ @@ -428,21 +502,37 @@
428 <td class="kv-label"><spring:message code="manifest.province.name" /></td> 502 <td class="kv-label"><spring:message code="manifest.province.name" /></td>
429 <td class="kv-content" colspan="3"><input id="sh_provincename" name="sh_provincename" type="text" 503 <td class="kv-content" colspan="3"><input id="sh_provincename" name="sh_provincename" type="text"
430 value="${manifest.sh_provincename }"></td> 504 value="${manifest.sh_provincename }"></td>
431 - </tr> 505 + </tr> --%>
432 506
433 <tr> 507 <tr>
434 - <td class="kv-label"><spring:message code="manifest.shr.cneaeo" /></td>  
435 - <td class="kv-content"><input id="cneaeo" name="cneaeo" type="text"  
436 - value="${manifest.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"  
437 - onpropertychange="onInputChange(event,'cneaeo','onpropertychange')"></td>  
438 - <td class="kv-label"><spring:message code="manifest.shr.cnecusid" /></td>  
439 - <td class="kv-content"><input id="cnecusid" name="cnecusid" type="text"  
440 - value="${manifest.cnecusid }" oninput="onInputChange(event,'cnecusid','oninput')" 508 + <td class="kv-label" colspan="6">
  509 + <select id="sh_cusid" required>
  510 + <c:if test="${not empty manifest.cnecusid}">
  511 + <c:set var="tempCneType" value='${fn:split(manifest.cnecusid,"+")[0]}' />
  512 + <option value="${tempCneType}">${tempCneType}</option>
  513 + </c:if>
  514 +
  515 + <c:if test="${empty manifest.cnecusid}">
  516 + <option value=""><spring:message code="manifest.enterprise.code.type" /></option>
  517 + </c:if>
  518 + </select>
  519 + <span style="color: black; font-size: 16px;">+</span>
  520 + <input id="cnecusid" type="text" required
  521 + <c:if test="${not empty manifest.cnecusid}">
  522 + <c:set var="tempCneValue" value='${fn:split(manifest.cnecusid,"+")[1]}' />
  523 + value="${tempCneValue }"
  524 + </c:if>
  525 +
  526 + placeholder="<spring:message code='manifest.enterprise.code' />"
  527 + oninput="onInputChange(event,'cnecusid','oninput')"
441 onpropertychange="onInputChange(event,'cnecusid','onpropertychange')"></td> 528 onpropertychange="onInputChange(event,'cnecusid','onpropertychange')"></td>
442 - <td style="display: none;" class="kv-label"><spring:message code="manifest.shr.unlodingcode" /><span  
443 - class="required_span">*</span></td>  
444 - <td style="display: none;" class="kv-content"><input required id="unlodingcode" name="unlodingcode"  
445 - type="text" value="${manifest.unlodingcode }" 529 + </tr>
  530 +
  531 + <tr style="display: none;">
  532 + <td style="display: none;" class="kv-label"><spring:message
  533 + code="manifest.shr.unlodingcode" /><span class="required_span">*</span></td>
  534 + <td style="display: none;" class="kv-content"><input required id="unlodingcode"
  535 + name="unlodingcode" type="text" value="${manifest.unlodingcode }"
446 oninput="onInputChange(event,'unlodingcode','oninput')" 536 oninput="onInputChange(event,'unlodingcode','oninput')"
447 onpropertychange="onInputChange(event,'unlodingcode','onpropertychange')"></td> 537 onpropertychange="onInputChange(event,'unlodingcode','onpropertychange')"></td>
448 </tr> 538 </tr>
@@ -450,7 +540,7 @@ @@ -450,7 +540,7 @@
450 540
451 <!-- 危险品信息 start --> 541 <!-- 危险品信息 start -->
452 <tr> 542 <tr>
453 - <td class="kv-label" colspan="6"><spring:message 543 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
454 code="manifest.dangerous.goods.information" /></td> 544 code="manifest.dangerous.goods.information" /></td>
455 </tr> 545 </tr>
456 <tr> 546 <tr>
@@ -469,7 +559,8 @@ @@ -469,7 +559,8 @@
469 559
470 <!-- 承运到达信息 start --> 560 <!-- 承运到达信息 start -->
471 <tr> 561 <tr>
472 - <td class="kv-label" colspan="6"><spring:message code="manifest.carriage.arrival" /></td> 562 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  563 + code="manifest.carriage.arrival" /></td>
473 </tr> 564 </tr>
474 <tr> 565 <tr>
475 <td class="kv-label"><spring:message code="manifest.carrier" /><span 566 <td class="kv-label"><spring:message code="manifest.carrier" /><span
@@ -514,7 +605,8 @@ @@ -514,7 +605,8 @@
514 605
515 <!-- 交运信息 start --> 606 <!-- 交运信息 start -->
516 <tr> 607 <tr>
517 - <td class="kv-label" colspan="6"><spring:message code="menu.delivery" /></td> 608 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  609 + code="menu.delivery" /></td>
518 </tr> 610 </tr>
519 <tr> 611 <tr>
520 <td class="kv-label"><spring:message code="manifest.transfer.station" /></td> 612 <td class="kv-label"><spring:message code="manifest.transfer.station" /></td>
@@ -594,7 +686,7 @@ @@ -594,7 +686,7 @@
594 <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script> 686 <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
595 <script type="text/javascript" src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script> 687 <script type="text/javascript" src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script>
596 <script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script> 688 <script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script>
597 - <script src="<%=basePath%>/resource/js/tools.js?version=0.8"></script> 689 + <script src="<%=basePath%>/resource/js/tools.js?version=1.2"></script>
598 <!--弹出层引入的JS--> 690 <!--弹出层引入的JS-->
599 <script type="text/javascript"> 691 <script type="text/javascript">
600 $(function(){ 692 $(function(){
@@ -689,6 +781,25 @@ $(function(){ @@ -689,6 +781,25 @@ $(function(){
689 function submit(){ 781 function submit(){
690 var id3 = $("#waybillnomaster").val($("#waybill").val()); 782 var id3 = $("#waybillnomaster").val($("#waybill").val());
691 var data = $("#form").serialize(); 783 var data = $("#form").serialize();
  784 +
  785 + var shp_cusid_type = getSelectedValue("co_cusid");
  786 + var sh_cusid = $("#shpcusid").val();
  787 +
  788 + if(notEmpty(shp_cusid_type)&&notEmpty(sh_cusid)){
  789 + shpcusid = shp_cusid_type+"+"+sh_cusid;
  790 + data+="&shpcusid="+encodeURIComponent(shpcusid);
  791 + }
  792 +
  793 + var cne_cusid_type = getSelectedValue("sh_cusid");
  794 + var cne_cusid = $("#cnecusid").val();
  795 +
  796 + if(notEmpty(cne_cusid_type)&&notEmpty(cne_cusid)){
  797 + cnecusid = cne_cusid_type+"+"+cne_cusid;
  798 + data+="&cnecusid="+encodeURIComponent(cnecusid);
  799 + }
  800 +
  801 + console.log("form-->"+data);
  802 +
692 $.post("<%=basePath%>manifest/save",data,function (data) { 803 $.post("<%=basePath%>manifest/save",data,function (data) {
693 if (data.status == 200) { 804 if (data.status == 200) {
694 // layer.confirm("<spring:message code="opt.savesuccess"/>", {btn: ['<spring:message code="opt.confirm"/>', '<spring:message code="opt.cancel"/>']}, function () { 805 // layer.confirm("<spring:message code="opt.savesuccess"/>", {btn: ['<spring:message code="opt.confirm"/>', '<spring:message code="opt.cancel"/>']}, function () {
@@ -719,22 +830,39 @@ $(function(){ @@ -719,22 +830,39 @@ $(function(){
719 830
720 //发送报文并且保存 831 //发送报文并且保存
721 function savesend(){ 832 function savesend(){
  833 + var isValid = $("#form").valid();
  834 + if(isValid){
722 var id3 = $("#waybillnomaster").val($("#waybill").val()); 835 var id3 = $("#waybillnomaster").val($("#waybill").val());
723 var data = $("#form").serialize(); 836 var data = $("#form").serialize();
  837 + var shp_cusid_type = getSelectedValue("co_cusid");
  838 + var sh_cusid = $("#shpcusid").val();
  839 +
  840 + if(notEmpty(shp_cusid_type)&&notEmpty(sh_cusid)){
  841 + shpcusid = shp_cusid_type+"+"+sh_cusid;
  842 + data+="&shpcusid="+encodeURIComponent(shpcusid);
  843 + }
  844 +
  845 + var cne_cusid_type = getSelectedValue("sh_cusid");
  846 + var cne_cusid = $("#cnecusid").val();
  847 +
  848 + if(notEmpty(cne_cusid_type)&&notEmpty(cne_cusid)){
  849 + cnecusid = cne_cusid_type+"+"+cne_cusid;
  850 + data+="&cnecusid="+encodeURIComponent(cnecusid);
  851 + }
  852 +
  853 + console.log("form-->"+data);
  854 +
724 $.post("<%=basePath%>manifest/savesend",data,function (data) { 855 $.post("<%=basePath%>manifest/savesend",data,function (data) {
725 if (data.status == 200) { 856 if (data.status == 200) {
726 -// layer.confirm("<spring:message code="opt.savesuccess"/>", {btn: ['<spring:message code="opt.confirm"/>', '<spring:message code="opt.cancel"/>']}, function () {  
727 -<%-- window.location.href = "<%=basePath %>manifest/list" ; --%>  
728 $("#xmlContent").val(data.data); 857 $("#xmlContent").val(data.data);
729 $("#DialogShunt").window('open'); 858 $("#DialogShunt").window('open');
730 window.location.href = "<%=basePath%>manifest/list"; 859 window.location.href = "<%=basePath%>manifest/list";
731 -// })  
732 } else { 860 } else {
733 - //layer.open({content: "<spring:message code="opt.savefailed"/>"});  
734 layer.open({content:data.msg}); 861 layer.open({content:data.msg});
735 } 862 }
736 }) 863 })
737 } 864 }
  865 + }
738 //发送交运报文 866 //发送交运报文
739 function sendDelivery(){ 867 function sendDelivery(){
740 var id3 = $("#waybillnomaster").val($("#waybill").val()); 868 var id3 = $("#waybillnomaster").val($("#waybill").val());
@@ -775,6 +903,141 @@ $(function(){ @@ -775,6 +903,141 @@ $(function(){
775 // } 903 // }
776 // }) 904 // })
777 // } 905 // }
  906 +
  907 + var api = "<%=basePath %>enterprise/search";
  908 +
  909 + $('#co_country').combogrid({
  910 + panelWidth:212,
  911 + url: api,
  912 + idField:'country_code',
  913 + textField:'start',
  914 + mode:'remote',
  915 + fitColumns:true,
  916 + onBeforeLoad: function (parm) { //在请求加载数据之前触发，返回 false 则取消加载动作
  917 + var value = $('#co_country').combobox('getValue');
  918 + if (value) {
  919 + var upper = value.toUpperCase();
  920 + $('#co_country').combogrid('setValue',upper);
  921 + parm.start = upper;
  922 +
  923 + onGetData('co_cusid','co_country');
  924 + return true;
  925 + }
  926 + return false;
  927 + },
  928 + onSelect: function(row,rowData){
  929 + //当用户选择一个列表项时触发。
  930 + $('#co_country').combogrid('setValue',rowData.country_code);
  931 +
  932 + onGetData('co_cusid','co_country');
  933 + },
  934 + columns:[[
  935 + {field:'name_cn',title:'名称',width:106},
  936 + {field:'country_code',title:'代码',width:106}
  937 + ]]
  938 + });
  939 +
  940 + $('#sh_country').combogrid({
  941 + panelWidth:220,
  942 + url: api,
  943 + idField:'country_code',
  944 + textField:'start',
  945 + mode:'remote',
  946 + fitColumns:true,
  947 + onBeforeLoad: function (parm) { //在请求加载数据之前触发，返回 false 则取消加载动作
  948 + var value = $('#sh_country').combobox('getValue');
  949 + if (value) {
  950 + var upper = value.toUpperCase();
  951 + $('#sh_country').combogrid('setValue',upper);
  952 + parm.start = upper;
  953 +
  954 + onGetData('sh_cusid','sh_country')
  955 + return true;
  956 + }
  957 + return false;
  958 + },
  959 + onSelect: function(row,rowData){
  960 + //当用户选择一个列表项时触发。
  961 + $('#sh_country').val(rowData.country_code);
  962 + onGetData('sh_cusid','sh_country')
  963 + },
  964 + columns:[[
  965 + {field:'name_cn',title:'名称',width:106},
  966 + {field:'country_code',title:'代码',width:106}
  967 + ]]
  968 + });
  969 +
  970 + function onGetData(selectId,inputId) {
  971 + console.log("onGetData()");
  972 + var cneType = "";
  973 + var shpType = "";
  974 + if(selectId=="co_cusid"){
  975 + //发货的
  976 + var shp_cusid = "${manifest.shpcusid}";
  977 + if(notEmpty(shp_cusid)){
  978 + shpType = shp_cusid.split("+")[0];
  979 + }
  980 + }
  981 +
  982 + if(selectId=="sh_cusid"){
  983 + //收货的
  984 + var cnecusid = "${manifest.cnecusid}";
  985 + if(notEmpty(cnecusid)){
  986 + cneType = cnecusid.split("+")[0];
  987 + }
  988 + }
  989 +
  990 + var select = $("#"+selectId);
  991 + select.html("");
  992 + select.append("<option value=''><spring:message code='manifest.enterprise.code.type' /></option>");
  993 +
  994 + var countryCode = $('#'+inputId).combobox('getValue');
  995 +
  996 + $.ajax({
  997 + url:"<%=basePath%>/enterprise/list?countryCode="+countryCode,
  998 + success:function(data){
  999 + if(data.status == 200){
  1000 + if(data.data){
  1001 + for(var i = 0; i < data.data.length; i++){
  1002 + var type = data.data[i].enterprise_type;
  1003 +
  1004 + if(selectId=="co_cusid"){
  1005 + if(notEmpty(shpType)&&type&&(type==shpType)){
  1006 + select.append("<option selected value='"+type+"'>"+type+"</option>");
  1007 + }else{
  1008 + select.append("<option value='"+type+"'>"+type+"</option>");
  1009 + }
  1010 + }else if(selectId=="sh_cusid"){
  1011 + if(notEmpty(cneType)&&type&&(type==cneType)){
  1012 + select.append("<option selected value='"+type+"'>"+type+"</option>");
  1013 + }else{
  1014 + select.append("<option value='"+type+"'>"+type+"</option>");
  1015 + }
  1016 + }else{
  1017 + select.append("<option value='"+type+"'>"+type+"</option>");
  1018 + }
  1019 +
  1020 + }
  1021 + }
  1022 + }
  1023 + }
  1024 + });
  1025 + }
  1026 +
  1027 + function showDialog() {
  1028 + layui.use('layer', function(){
  1029 + var layer = layui.layer;
  1030 + var viewUrl="<%=basePath%>consignor/list";
  1031 + parent.layer.open({
  1032 + type: 2,
  1033 + title: '',
  1034 + shadeClose: true,
  1035 + shade: 0.8,
  1036 + area: ['50%', '90%'],
  1037 + content: viewUrl
  1038 + });
  1039 + });
  1040 + }
778 </script> 1041 </script>
779 </body> 1042 </body>
780 </html> 1043 </html>
@@ -31,17 +31,17 @@ @@ -31,17 +31,17 @@
31 <thead> 31 <thead>
32 <tr> 32 <tr>
33 <!-- <th field="id" checkbox="true"></th> --> 33 <!-- <th field="id" checkbox="true"></th> -->
34 - <th field="." formatter="editFormat" width="120"><spring:message code="opt.edit" /></th>  
35 - <th field="waybillnomaster" sortable="true" width="110"><spring:message code="manifest.bill.number"/></th>  
36 - <th field="flightno" width="120"><spring:message code="manifest.flight.number"/></th>  
37 - <th field="originatingstation" width="112"><spring:message code="manifest.starting.point"/></th>  
38 - <th field="destinationstation" width="112"><spring:message code="manifest.destination"/></th>  
39 - <th field="totalpiece" width="50"><spring:message code="manifest.number.of.consignment.note"/></th>  
40 - <th field="totalweight" width="50"><spring:message code="manifest.waybill.weight"/></th>  
41 - <th field="preparetotalweight" width="50"><spring:message code="manifest.pre.weight"/></th>  
42 - <th field="preparetotalpiece" width="50"><spring:message code="manifest.number.of.fittings"/></th>  
43 - <th field="response_text" widht="50"><spring:message code="manifest.response_text" /></th>  
44 - <th field=".." width="50" formatter="operatorFormat"><spring:message code="opt.operator" /></th> 34 + <th field="." formatter="editFormat" width="40"><spring:message code="opt.edit" /></th>
  35 + <th field="waybillnomaster" sortable="true" width="30"><spring:message code="manifest.bill.number"/></th>
  36 + <th field="customscode" width="15"><spring:message code="manifest.customs"/></th>
  37 + <th field="flightno" width="20"><spring:message code="manifest.flight.number"/></th>
  38 + <th field="originatingstation" width="20"><spring:message code="manifest.starting.point"/></th>
  39 + <th field="destinationstation" width="20"><spring:message code="manifest.destination"/></th>
  40 + <%-- <th field="totalpiece" width="50"><spring:message code="manifest.number.of.consignment.note"/></th>--%>
  41 + <th field="preparetotalweight" width="20"><spring:message code="manifest.pre.weight"/></th>
  42 + <th field="preparetotalpiece" width="20"><spring:message code="manifest.number.of.fittings"/></th>
  43 + <th field="response_text" widht="260"><spring:message code="manifest.response_text" /></th>
  44 + <th field=".." width="20" formatter="operatorFormat"><spring:message code="opt.operator" /></th>
45 <%-- <th field="flightdate" width="130"><spring:message code="manifest.flight.date"/></th> --%> 45 <%-- <th field="flightdate" width="130"><spring:message code="manifest.flight.date"/></th> --%>
46 </tr> 46 </tr>
47 </thead> 47 </thead>
@@ -113,17 +113,16 @@ @@ -113,17 +113,16 @@
113 loadMsg:'正在加载中……', 113 loadMsg:'正在加载中……',
114 height:'auto', 114 height:'auto',
115 columns:[[ 115 columns:[[
116 - {field:'.',title:'<spring:message code="opt.name"/>',formatter:editHbillFormat,width:80},  
117 - {field:'waybillnosecondary',title:'<spring:message code="manifest.odd.number"/>',width:100},  
118 - {field:'originatingstation',title:'<spring:message code="manifest.starting.point"/>',width:100},  
119 - {field:'destinationstation',title:'<spring:message code="manifest.destination"/>',width:100},  
120 - {field:'totalpiece',title:'<spring:message code="manifest.number.of.consignment.note"/>',width:100},  
121 - {field:'totalweight',title:'<spring:message code="manifest.waybill.weight"/>',width:100},  
122 - {field:'prepareweight',title:'<spring:message code="manifest.pre.weight"/>',width:100},  
123 -  
124 - {field:'preparepiece',title:'<spring:message code="manifest.number.of.fittings"/>',width:100},  
125 - {field:'response_text',title:'<spring:message code="manifest.response_text"/>', width:100},  
126 - {field:'..', title:'<spring:message code="opt.operator" />', formatter:preoperatorFormat, width:100} 116 + {field:'.',title:'<spring:message code="opt.name"/>',formatter:editHbillFormat,width:30},
  117 + {field:'waybillnosecondary',title:'<spring:message code="manifest.odd.number"/>',width:40},
  118 + {field:'originatingstation',title:'<spring:message code="manifest.starting.point"/>',width:40},
  119 + {field:'destinationstation',title:'<spring:message code="manifest.destination"/>',width:40},
  120 + /* {field:'totalpiece',title:'<spring:message code="manifest.number.of.consignment.note"/>',width:60},
  121 + {field:'totalweight',title:'<spring:message code="manifest.waybill.weight"/>',width:60}, */
  122 + {field:'prepareweight',title:'<spring:message code="manifest.pre.weight"/>',width:30},
  123 + {field:'preparepiece',title:'<spring:message code="manifest.number.of.fittings"/>',width:30},
  124 + {field:'response_text',title:'<spring:message code="manifest.response_text"/>', width:160},
  125 + {field:'..', title:'<spring:message code="opt.operator" />', formatter:preoperatorFormat, width:40}
127 ]], 126 ]],
128 onResize:function(){ 127 onResize:function(){
129 $('#dg').datagrid('fixDetailRowHeight',index); 128 $('#dg').datagrid('fixDetailRowHeight',index);
1 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> 1 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  2 +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> 3 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
3 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> 4 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
4 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> 5 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
@@ -12,7 +13,7 @@ @@ -12,7 +13,7 @@
12 <head> 13 <head>
13 <meta charset="utf-8"> 14 <meta charset="utf-8">
14 <meta name="viewport" content="width=device-width, initial-scale=1"> 15 <meta name="viewport" content="width=device-width, initial-scale=1">
15 -<link href="<%=basePath%>resource/css/base.css" rel="stylesheet"> 16 +<link href="<%=basePath%>resource/css/base.css?ver=1.0" rel="stylesheet">
16 <link href="<%=basePath%>resource/css/basic_info.css" rel="stylesheet"> 17 <link href="<%=basePath%>resource/css/basic_info.css" rel="stylesheet">
17 <link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css"> 18 <link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css">
18 <link href="<%=basePath%>resource/css/form.css" rel="stylesheet"> 19 <link href="<%=basePath%>resource/css/form.css" rel="stylesheet">
@@ -20,7 +21,6 @@ @@ -20,7 +21,6 @@
20 <script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script> 21 <script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
21 <script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script> 22 <script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
22 <link rel="stylesheet" href="<%=basePath%>resource/css/form.css"> 23 <link rel="stylesheet" href="<%=basePath%>resource/css/form.css">
23 -<script type="text/javascript" src="<%=basePath%>resource/js/tools.js"></script>  
24 <style type="text/css"> 24 <style type="text/css">
25 .required_span { 25 .required_span {
26 color: red; 26 color: red;
@@ -39,7 +39,8 @@ @@ -39,7 +39,8 @@
39 <table class="kv-table"> 39 <table class="kv-table">
40 <tbody> 40 <tbody>
41 <tr> 41 <tr>
42 - <td class="kv-label" colspan="6"><spring:message code="manifest.bill.number" /></td> 42 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  43 + code="manifest.bill.number" /></td>
43 <input type="hidden" id="id" name="id" value="${pre.id }"> 44 <input type="hidden" id="id" name="id" value="${pre.id }">
44 <input type="hidden" id="isdelete" name="isdelete" value="${pre.isdelete }"> 45 <input type="hidden" id="isdelete" name="isdelete" value="${pre.isdelete }">
45 <input type="hidden" id="de_ids" name="de_ids" value="${pre.de_ids }"> 46 <input type="hidden" id="de_ids" name="de_ids" value="${pre.de_ids }">
@@ -56,18 +57,18 @@ @@ -56,18 +57,18 @@
56 <td class="kv-label"><spring:message code="manifest.odd.number" /><span 57 <td class="kv-label"><spring:message code="manifest.odd.number" /><span
57 class="required_span">*</span></td> 58 class="required_span">*</span></td>
58 <td class="kv-content" colspan="3"><input required id="ways" name="ways" type="text" 59 <td class="kv-content" colspan="3"><input required id="ways" name="ways" type="text"
59 - minlength="11" maxlength="11"> <input required id="waybillnosecondary" 60 + maxlength="35"> <input required id="waybillnosecondary"
60 name="waybillnosecondary" type="hidden" value="${pre.waybillnosecondary }"></td> 61 name="waybillnosecondary" type="hidden" value="${pre.waybillnosecondary }"></td>
61 </tr> 62 </tr>
62 <tr> 63 <tr>
63 - <td class="kv-label"><spring:message code="delivery.name.of.goods" /><span 64 + <%-- <td class="kv-label"><spring:message code="delivery.name.of.goods" /><span
64 class="required_span">*</span></td> 65 class="required_span">*</span></td>
65 <td class="kv-content"><input required id="name_ofgoods" name="name_ofgoods" type="text" 66 <td class="kv-content"><input required id="name_ofgoods" name="name_ofgoods" type="text"
66 - value="${pre.name_ofgoods }"></td> 67 + value="${pre.name_ofgoods }"></td> --%>
67 <td class="kv-label"><spring:message code="delivery.delivery.station" /><span 68 <td class="kv-label"><spring:message code="delivery.delivery.station" /><span
68 class="required_span">*</span></td> 69 class="required_span">*</span></td>
69 <td class="kv-content"><select required id="delivery_station" name="delivery_station"> 70 <td class="kv-content"><select required id="delivery_station" name="delivery_station">
70 - <%-- <option value=""><spring:message code="opt.select"/></option> --%> 71 + <option value=""><spring:message code="opt.select" /></option>
71 <option value="001" 72 <option value="001"
72 <c:if test = "${pre.delivery_station ==001 }">selected="selected"</c:if>><spring:message 73 <c:if test = "${pre.delivery_station ==001 }">selected="selected"</c:if>><spring:message
73 code="delivery.ground.handling" /></option> 74 code="delivery.ground.handling" /></option>
@@ -87,7 +88,8 @@ @@ -87,7 +88,8 @@
87 88
88 <!-- 航班信息 start --> 89 <!-- 航班信息 start -->
89 <tr> 90 <tr>
90 - <td class="kv-label" colspan="6"><spring:message code="manifest.flight.information" /></td> 91 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  92 + code="manifest.flight.information" /></td>
91 </tr> 93 </tr>
92 <tr> 94 <tr>
93 <td class="kv-label"><spring:message code="manifest.carrier" /><span 95 <td class="kv-label"><spring:message code="manifest.carrier" /><span
@@ -99,10 +101,12 @@ @@ -99,10 +101,12 @@
99 <td class="kv-label"><spring:message code="manifest.flight.number" /><span 101 <td class="kv-label"><spring:message code="manifest.flight.number" /><span
100 class="required_span">*</span></td> 102 class="required_span">*</span></td>
101 <td class="kv-content"><input required id="flightno" name="flightno" type="text" 103 <td class="kv-content"><input required id="flightno" name="flightno" type="text"
102 - value="${pre.flightno }"></td>  
103 - <td class="kv-label"><spring:message code="manifest.flight.date" /></td> 104 + value="${pre.flightno }" oninput="onInputChange(event,'flightno','oninput')"
  105 + onpropertychange="onInputChange(event,'flightno','onpropertychange')"></td>
  106 + <td class="kv-label"><spring:message code="manifest.flight.date" /><span
  107 + class="required_span">*</span></td>
104 <td class="kv-content" colspan="3"><input type="text" class="date bill Wdate" 108 <td class="kv-content" colspan="3"><input type="text" class="date bill Wdate"
105 - id="flightdate" name="flightdate" 109 + id="flightdate" name="flightdate" required autocomplete="off"
106 value="<fmt:formatDate pattern='yyyy-MM-dd' value='${pre.flightdate }'></fmt:formatDate>"> 110 value="<fmt:formatDate pattern='yyyy-MM-dd' value='${pre.flightdate }'></fmt:formatDate>">
107 </td> 111 </td>
108 </tr> 112 </tr>
@@ -124,60 +128,56 @@ @@ -124,60 +128,56 @@
124 128
125 <!-- 货物信息 start --> 129 <!-- 货物信息 start -->
126 <tr> 130 <tr>
127 - <td class="kv-label" colspan="6"><spring:message code="manifest.cargo.information" /></td> 131 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  132 + code="manifest.cargo.information" /></td>
128 </tr> 133 </tr>
129 <tr> 134 <tr>
130 - <td class="kv-label"><spring:message code="manifest.number.of.consignment.note" /><span 135 + <td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
131 class="required_span">*</span></td> 136 class="required_span">*</span></td>
132 - <td class="kv-content">  
133 - <input required class="delivery number" id="totalpiece" 137 + <td class="kv-content"><input required class="delivery number" id="totalpiece"
134 name="totalpiece" type="text" value="${pre.totalpiece}" 138 name="totalpiece" type="text" value="${pre.totalpiece}"
135 onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/" 139 onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/"
136 oninput="onInputChange(event,'totalpiece','oninput')" 140 oninput="onInputChange(event,'totalpiece','oninput')"
137 - onpropertychange="onInputChange(event,'totalpiece','onpropertychange')">  
138 - <input id="pie" disabled="disabled"></td>  
139 - <td class="kv-label"><spring:message code="manifest.waybill.weight" /><span 141 + onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"> <input
  142 + id="pie" disabled="disabled"></td>
  143 + <td class="kv-label"><spring:message code="manifest.pre.weight" /><span
140 class="required_span">*</span></td> 144 class="required_span">*</span></td>
141 - <td class="kv-content">  
142 - <input required class="delivery number" id="totalweight" 145 + <td class="kv-content"><input required class="delivery number" id="totalweight"
143 name="totalweight" type="text" value="${pre.totalweight}" 146 name="totalweight" type="text" value="${pre.totalweight}"
144 onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/" 147 onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/"
145 oninput="onInputChange(event,'totalweight','oninput')" 148 oninput="onInputChange(event,'totalweight','oninput')"
146 - onpropertychange="onInputChange(event,'totalweight','onpropertychange')">  
147 - <input id="wei" disabled="disabled">  
148 - </td> 149 + onpropertychange="onInputChange(event,'totalweight','onpropertychange')"> <input
  150 + id="wei" disabled="disabled"></td>
149 <td class="kv-label"><spring:message code="manifest.customs" /><span 151 <td class="kv-label"><spring:message code="manifest.customs" /><span
150 class="required_span">*</span></td> 152 class="required_span">*</span></td>
151 - <td class="kv-content" colspan="3">  
152 - <select required id="customscode" name="customscode"> 153 + <td class="kv-content" colspan="3"><select required id="customscode" name="customscode">
153 <option value=""><spring:message code="opt.select" /></option> 154 <option value=""><spring:message code="opt.select" /></option>
154 <c:forEach items="${CusToms}" var="customsCode"> 155 <c:forEach items="${CusToms}" var="customsCode">
155 <option value="${customsCode}" 156 <option value="${customsCode}"
156 <c:if test="${pre.customscode==customsCode}" >selected="selected" </c:if>>${customsCode} 157 <c:if test="${pre.customscode==customsCode}" >selected="selected" </c:if>>${customsCode}
157 </option> 158 </option>
158 </c:forEach> 159 </c:forEach>
159 - </select>  
160 - </td> 160 + </select></td>
161 </tr> 161 </tr>
162 <tr> 162 <tr>
163 <td class="kv-label"><spring:message code="manifest.payment.method" /><span 163 <td class="kv-label"><spring:message code="manifest.payment.method" /><span
164 class="required_span">*</span></td> 164 class="required_span">*</span></td>
165 <td class="kv-content"><select required id="paymode" name="paymode"> 165 <td class="kv-content"><select required id="paymode" name="paymode">
166 - <option value="001" <c:if test = "${pre.paymode ==001 }">selected="selected "</c:if>><spring:message 166 + <option value="PP" <c:if test = "${pre.paymode =='PP' }">selected="selected "</c:if>><spring:message
167 code="manifest.prepaid" /></option> 167 code="manifest.prepaid" /></option>
168 - <option value="002" <c:if test = "${pre.paymode ==002 }">selected="selected "</c:if>><spring:message 168 + <option value="CC" <c:if test = "${pre.paymode =='CC' }">selected="selected "</c:if>><spring:message
169 code="manifest.to.pay" /></option> 169 code="manifest.to.pay" /></option>
170 </select></td> 170 </select></td>
171 <td class="kv-label"><spring:message code="manifest.fitting.time" /></td> 171 <td class="kv-label"><spring:message code="manifest.fitting.time" /></td>
172 <td class="kv-content"><input type="text" class="date bill" id="stowagedate" 172 <td class="kv-content"><input type="text" class="date bill" id="stowagedate"
173 - name="stowagedate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" 173 + autocomplete="off" name="stowagedate"
  174 + onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})"
174 value="<fmt:formatDate pattern='yyyy-MM-dd HH:mm:ss' value='${pre.stowagedate }'></fmt:formatDate>"> 175 value="<fmt:formatDate pattern='yyyy-MM-dd HH:mm:ss' value='${pre.stowagedate }'></fmt:formatDate>">
175 </td> 176 </td>
176 177
177 <td class="kv-label"><spring:message code="manifest.customs.status" /><span 178 <td class="kv-label"><spring:message code="manifest.customs.status" /><span
178 class="required_span">*</span></td> 179 class="required_span">*</span></td>
179 - <td class="kv-content">  
180 - <select required id="customsstatus" name="customsstatus"> 180 + <td class="kv-content"><select required id="customsstatus" name="customsstatus">
181 <option value="001" <c:if test = "${pre.customsstatus ==001 }">selected="selected"</c:if>><spring:message 181 <option value="001" <c:if test = "${pre.customsstatus ==001 }">selected="selected"</c:if>><spring:message
182 code="manifest.import.and" /></option> 182 code="manifest.import.and" /></option>
183 <option value="002" <c:if test = "${pre.customsstatus ==002 }">selected="selected"</c:if>><spring:message 183 <option value="002" <c:if test = "${pre.customsstatus ==002 }">selected="selected"</c:if>><spring:message
@@ -186,8 +186,7 @@ @@ -186,8 +186,7 @@
186 code="manifest.frontier.goods" /></option> 186 code="manifest.frontier.goods" /></option>
187 <option value="004" <c:if test = "${pre.customsstatus ==004 }">selected="selected"</c:if>><spring:message 187 <option value="004" <c:if test = "${pre.customsstatus ==004 }">selected="selected"</c:if>><spring:message
188 code="manifest.temporary.container" /></option> 188 code="manifest.temporary.container" /></option>
189 - </select>  
190 - </td> 189 + </select></td>
191 </tr> 190 </tr>
192 <tr style="display: none;"> 191 <tr style="display: none;">
193 <td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span 192 <td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
@@ -204,11 +203,12 @@ @@ -204,11 +203,12 @@
204 id="towei" disabled="disabled"></td> 203 id="towei" disabled="disabled"></td>
205 </tr> 204 </tr>
206 <tr> 205 <tr>
207 - <td class="kv-label"><spring:message code="manifest.description.of.the.goods" /></td>  
208 - <td class="kv-content" colspan="5"><textarea id="productname" name="productname"  
209 - maxlength="200">${pre.productname}</textarea></td> 206 + <td class="kv-label"><spring:message code="manifest.description.of.the.goods" /><span
  207 + class="required_span">*</span></td>
  208 + <td class="kv-content" colspan="5"><textarea required id="productname"
  209 + name="productname" maxlength="200">${pre.productname}</textarea></td>
210 </tr> 210 </tr>
211 - <tr> 211 + <%-- <tr>
212 <td class="kv-label"><spring:message code="manifest.agent.name" /></td> 212 <td class="kv-label"><spring:message code="manifest.agent.name" /></td>
213 <td class="kv-content"><input id="agentman" name="agentman" type="text" 213 <td class="kv-content"><input id="agentman" name="agentman" type="text"
214 value="${agent.threeCode}" placeholder="<spring:message code="agent.namePlaceholder"/>"></td> 214 value="${agent.threeCode}" placeholder="<spring:message code="agent.namePlaceholder"/>"></td>
@@ -216,12 +216,13 @@ @@ -216,12 +216,13 @@
216 <td class="kv-content" colspan="3"><input id="agentcompany" name="agentcompany" 216 <td class="kv-content" colspan="3"><input id="agentcompany" name="agentcompany"
217 style="width: 400px;" type="text" value="${agent.nameCn }" 217 style="width: 400px;" type="text" value="${agent.nameCn }"
218 placeholder="<spring:message code="agent.companyPlaceholder"/>"></td> 218 placeholder="<spring:message code="agent.companyPlaceholder"/>"></td>
219 - </tr> 219 + </tr> --%>
220 <!-- 货物信息 end --> 220 <!-- 货物信息 end -->
221 221
222 <!-- 发货信息 start --> 222 <!-- 发货信息 start -->
223 - <tr>  
224 - <td class="kv-label"><spring:message code="manifest.shipper.information" /></td> 223 + <tr style="background-color: #EBEDF4; color: black;">
  224 + <td style="background-color: #EBEDF4; color: black;" class="kv-label"><spring:message
  225 + code="manifest.shipper.information" /></td>
225 <td class="kv-content" colspan="5"><select onchange="changeConsignorSelect()" 226 <td class="kv-content" colspan="5"><select onchange="changeConsignorSelect()"
226 id="fh_select"> 227 id="fh_select">
227 <option value="-1">请选择</option> 228 <option value="-1">请选择</option>
@@ -244,7 +245,13 @@ @@ -244,7 +245,13 @@
244 $("#co_fax").val(consignor.co_fax?consignor.co_fax:""); 245 $("#co_fax").val(consignor.co_fax?consignor.co_fax:"");
245 $("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:""); 246 $("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
246 $("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:""); 247 $("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
247 - $("#shpcusid").val(consignor.shpcusid?consignor.shpcusid:""); 248 +
  249 + if(notEmpty(consignor.shpcusid)){
  250 + var temp = consignor.shpcusid.split("+")[1];
  251 + if(notEmpty(temp)){
  252 + $("#shpcusid").val(temp);
  253 + }
  254 + }
248 } 255 }
249 } 256 }
250 } 257 }
@@ -272,33 +279,31 @@ @@ -272,33 +279,31 @@
272 <tr> 279 <tr>
273 <td class="kv-label"><spring:message code="manifest.company" /><span 280 <td class="kv-label"><spring:message code="manifest.company" /><span
274 class="required_span">*</span></td> 281 class="required_span">*</span></td>
275 - <td class="kv-content">  
276 - <input required id="co_company" name="co_company" type="text" value="${pre.co_company}"  
277 - oninput="onInputChange(event,'co_company','oninput')"  
278 - onpropertychange="onInputChange(event,'co_company','onpropertychange')">  
279 - </td> 282 + <td class="kv-content"><input required id="co_company" name="co_company" type="text"
  283 + value="${pre.co_company}" oninput="onInputChange(event,'co_company','oninput')"
  284 + onpropertychange="onInputChange(event,'co_company','onpropertychange')"></td>
280 <td class="kv-label"><spring:message code="manifest.address" /><span 285 <td class="kv-label"><spring:message code="manifest.address" /><span
281 class="required_span">*</span></td> 286 class="required_span">*</span></td>
282 <td class="kv-content"><input required id="co_address" name="co_address" type="text" 287 <td class="kv-content"><input required id="co_address" name="co_address" type="text"
283 value="${pre.co_address}" maxlength="70"></td> 288 value="${pre.co_address}" maxlength="70"></td>
284 - <td class="kv-label"><spring:message code="manifest.zip.code" /></td>  
285 - <td class="kv-content" colspan="5"><input id="co_zipcode" name="co_zipcode" type="text"  
286 - value="${pre.co_zipcode }"></td> 289 + <td class="kv-label"><spring:message code="manifest.country" /><span
  290 + class="required_span">*</span></td>
  291 + <td class="kv-content"><input required id="co_country" name="co_country" maxlength="2"
  292 + type="text" value="${pre.co_country }"
  293 + oninput="onInputChange(event,'co_country','oninput')"
  294 + onpropertychange="onInputChange(event,'co_country','onpropertychange')"></td>
287 </tr> 295 </tr>
288 <tr> 296 <tr>
289 - <td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td> 297 + <%-- <td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td>
290 <td class="kv-content"><input required id="co_city" name="co_city" type="text" 298 <td class="kv-content"><input required id="co_city" name="co_city" type="text"
291 value="${pre.co_city }" oninput="onInputChange(event,'co_city','oninput')" 299 value="${pre.co_city }" oninput="onInputChange(event,'co_city','oninput')"
292 - onpropertychange="onInputChange(event,'co_city','onpropertychange')"></td> 300 + onpropertychange="onInputChange(event,'co_city','onpropertychange')"></td> --%>
293 <td class="kv-label"><spring:message code="manifest.state" /></td> 301 <td class="kv-label"><spring:message code="manifest.state" /></td>
294 <td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text" 302 <td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text"
295 value="${pre.co_deltaname }"></td> 303 value="${pre.co_deltaname }"></td>
296 - <td class="kv-label"><spring:message code="manifest.country" /><span  
297 - class="required_span">*</span></td>  
298 - <td class="kv-content" colspan="5"><input required id="co_country" name="co_country"  
299 - type="text" value="${pre.co_country }"  
300 - oninput="onInputChange(event,'co_country','oninput')"  
301 - onpropertychange="onInputChange(event,'co_country','onpropertychange')"></td> 304 + <td class="kv-label"><spring:message code="manifest.zip.code" /></td>
  305 + <td class="kv-content" colspan="3"><input id="co_zipcode" name="co_zipcode" type="text"
  306 + value="${pre.co_zipcode }"></td>
302 </tr> 307 </tr>
303 <tr> 308 <tr>
304 <td class="kv-label"><spring:message code="manifest.telephone" /></td> 309 <td class="kv-label"><spring:message code="manifest.telephone" /></td>
@@ -310,25 +315,42 @@ @@ -310,25 +315,42 @@
310 value="${pre.co_fax }" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td> 315 value="${pre.co_fax }" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
311 <td style="display: none;" class="kv-label"><spring:message code="manifest.name" /><span 316 <td style="display: none;" class="kv-label"><spring:message code="manifest.name" /><span
312 class="required_span">*</span></td> 317 class="required_span">*</span></td>
313 - <td style="display: none;" class="kv-content" colspan="5"><input required id="co_name" name="co_name" type="text"  
314 - value="${pre.co_name }"></td>  
315 - </tr>  
316 - <tr> 318 + <td style="display: none;" class="kv-content" colspan="5"><input required id="co_name"
  319 + name="co_name" type="text" value="${pre.co_name }"></td>
317 <td class="kv-label"><spring:message code="manifest.fhr.shpaeo" /></td> 320 <td class="kv-label"><spring:message code="manifest.fhr.shpaeo" /></td>
318 <td class="kv-content"><input id="shpaeo" name="shpaeo" type="text" 321 <td class="kv-content"><input id="shpaeo" name="shpaeo" type="text"
319 value="${pre.shpaeo }" oninput="onInputChange(event,'shpaeo','oninput')" 322 value="${pre.shpaeo }" oninput="onInputChange(event,'shpaeo','oninput')"
320 onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td> 323 onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td>
321 - <td class="kv-label"><spring:message code="manifest.fhr.shpcusid" /><span  
322 - class="required_span">*</span></td>  
323 - <td class="kv-content" colspan="3"><input required id="shpcusid" name="shpcusid" 324 + </tr>
  325 + <tr>
  326 + <%-- <td class="kv-label"><spring:message code="manifest.fhr.shpcusid" /></td>
  327 + <td class="kv-content" colspan="3"><input id="shpcusid" name="shpcusid"
324 type="text" value="${pre.shpcusid }" oninput="onInputChange(event,'shpcusid','oninput')" 328 type="text" value="${pre.shpcusid }" oninput="onInputChange(event,'shpcusid','oninput')"
  329 + onpropertychange="onInputChange(event,'shpcusid','onpropertychange')"></td> --%>
  330 + <td class="kv-label" colspan="6"><select id="co_cusid" required>
  331 + <c:if test="${not empty pre.shpcusid}">
  332 + <c:set var="tempShpType" value='${fn:split(pre.shpcusid,"+")[0]}' />
  333 + <option value="${tempShpType}">${tempShpType}</option>
  334 + </c:if>
  335 +
  336 + <c:if test="${empty pre.shpcusid}">
  337 + <option value=""><spring:message code="manifest.enterprise.code.type" /></option>
  338 + </c:if>
  339 + </select> <span style="color: black; font-size: 16px;">+</span> <input required id="shpcusid" type="text"
  340 + <c:if test="${not empty pre.shpcusid}">
  341 + <c:set var="tempShpValue" value='${fn:split(pre.shpcusid,"+")[1]}' />
  342 + value="${tempShpValue}"
  343 + </c:if>
  344 + placeholder="<spring:message code='manifest.enterprise.code' />"
  345 + oninput="onInputChange(event,'shpcusid','oninput')"
325 onpropertychange="onInputChange(event,'shpcusid','onpropertychange')"></td> 346 onpropertychange="onInputChange(event,'shpcusid','onpropertychange')"></td>
326 </tr> 347 </tr>
327 <!-- 发货信息 end --> 348 <!-- 发货信息 end -->
328 349
329 <!-- 收货信息 start --> 350 <!-- 收货信息 start -->
330 - <tr>  
331 - <td class="kv-label" colspan="1"><spring:message code="manifest.consignee" /></td> 351 + <tr style="background-color: #EBEDF4; color: black;">
  352 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="1"><spring:message
  353 + code="manifest.consignee" /></td>
332 <td class="kv-content" colspan="5"><select onchange="changeConsigneeSelect()" 354 <td class="kv-content" colspan="5"><select onchange="changeConsigneeSelect()"
333 id="consignee_select"> 355 id="consignee_select">
334 <option value="-1">请选择</option> 356 <option value="-1">请选择</option>
@@ -345,6 +367,7 @@ @@ -345,6 +367,7 @@
345 $("#sh_address").val(consignee.address?consignee.address:""); 367 $("#sh_address").val(consignee.address?consignee.address:"");
346 $("#sh_telephone").val(consignee.tel?consignee.tel:""); 368 $("#sh_telephone").val(consignee.tel?consignee.tel:"");
347 $("#sh_country").val(consignee.name?consignee.name:""); 369 $("#sh_country").val(consignee.name?consignee.name:"");
  370 + $("#sh_name").val(consignee.code?consignee.code:"");
348 } 371 }
349 } 372 }
350 } 373 }
@@ -372,15 +395,14 @@ @@ -372,15 +395,14 @@
372 <td class="kv-label"><spring:message code="manifest.company" /><span 395 <td class="kv-label"><spring:message code="manifest.company" /><span
373 class="required_span">*</span></td> 396 class="required_span">*</span></td>
374 <td class="kv-content"><input required id="sh_company" name="sh_company" type="text" 397 <td class="kv-content"><input required id="sh_company" name="sh_company" type="text"
375 - value="${pre.sh_company }"  
376 - oninput="onInputChange(event,'sh_company','oninput')" 398 + value="${pre.sh_company }" oninput="onInputChange(event,'sh_company','oninput')"
377 onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td> 399 onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td>
378 <td class="kv-label"><spring:message code="manifest.address" /><span 400 <td class="kv-label"><spring:message code="manifest.address" /><span
379 class="required_span">*</span></td> 401 class="required_span">*</span></td>
380 <td class="kv-content"><input required id="sh_address" name="sh_address" type="text" 402 <td class="kv-content"><input required id="sh_address" name="sh_address" type="text"
381 value="${pre.sh_address }" maxlength="70"></td> 403 value="${pre.sh_address }" maxlength="70"></td>
382 <td class="kv-label"><spring:message code="manifest.zip.code" /></td> 404 <td class="kv-label"><spring:message code="manifest.zip.code" /></td>
383 - <td class="kv-content" colspan="5"><input id="sh_zipcode" name="sh_zipcode" type="text" 405 + <td class="kv-content"><input id="sh_zipcode" name="sh_zipcode" type="text"
384 value="${pre.sh_zipcode }"></td> 406 value="${pre.sh_zipcode }"></td>
385 </tr> 407 </tr>
386 <tr> 408 <tr>
@@ -393,7 +415,7 @@ @@ -393,7 +415,7 @@
393 value="${pre.sh_deltaname}"></td> 415 value="${pre.sh_deltaname}"></td>
394 <td class="kv-label"><spring:message code="manifest.country" /><span 416 <td class="kv-label"><spring:message code="manifest.country" /><span
395 class="required_span">*</span></td> 417 class="required_span">*</span></td>
396 - <td class="kv-content" colspan="5"><input required id="sh_country" name="sh_country" 418 + <td class="kv-content"><input required id="sh_country" name="sh_country" maxlength="2"
397 type="text" value="${pre.sh_country }" 419 type="text" value="${pre.sh_country }"
398 oninput="onInputChange(event,'sh_country','oninput')" 420 oninput="onInputChange(event,'sh_country','oninput')"
399 onpropertychange="onInputChange(event,'sh_country','onpropertychange')"></td> 421 onpropertychange="onInputChange(event,'sh_country','onpropertychange')"></td>
@@ -406,10 +428,14 @@ @@ -406,10 +428,14 @@
406 <td class="kv-content"><input id="sh_fax" name="sh_fax" type="text" 428 <td class="kv-content"><input id="sh_fax" name="sh_fax" type="text"
407 value="${pre.sh_fax }"></td> 429 value="${pre.sh_fax }"></td>
408 <td style="display: none;" class="kv-label"><spring:message code="manifest.name" /></td> 430 <td style="display: none;" class="kv-label"><spring:message code="manifest.name" /></td>
409 - <td style="display: none;" class="kv-content" colspan="5"><input id="sh_name" name="sh_name" type="text"  
410 - value="${pre.sh_name }"></td> 431 + <td style="display: none;" class="kv-content" colspan="5"><input id="sh_name"
  432 + name="sh_name" type="text" value="${pre.sh_name }"></td>
  433 + <td class="kv-label"><spring:message code="manifest.shr.cneaeo" /></td>
  434 + <td class="kv-content"><input id="cneaeo" name="cneaeo" type="text"
  435 + value="${pre.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"
  436 + onpropertychange="onInputChange(event,'cneaeo','onpropertychange')"></td>
411 </tr> 437 </tr>
412 - <tr> 438 + <%-- <tr>
413 <td class="kv-label"><spring:message code="manifest.province.code" /></td> 439 <td class="kv-label"><spring:message code="manifest.province.code" /></td>
414 <td class="kv-content"><input id="sh_provincecode" name="sh_provincecode" type="text" 440 <td class="kv-content"><input id="sh_provincecode" name="sh_provincecode" type="text"
415 value="${pre.sh_provincecode }" oninput="onInputChange(event,'sh_provincecode','oninput')" 441 value="${pre.sh_provincecode }" oninput="onInputChange(event,'sh_provincecode','oninput')"
@@ -417,27 +443,44 @@ @@ -417,27 +443,44 @@
417 <td class="kv-label"><spring:message code="manifest.province.name" /></td> 443 <td class="kv-label"><spring:message code="manifest.province.name" /></td>
418 <td class="kv-content" colspan="3"><input id="sh_provincename" name="sh_provincename" 444 <td class="kv-content" colspan="3"><input id="sh_provincename" name="sh_provincename"
419 type="text" value="${pre.sh_provincename }"></td> 445 type="text" value="${pre.sh_provincename }"></td>
420 - </tr> 446 + </tr> --%>
421 <tr> 447 <tr>
422 - <td class="kv-label"><spring:message code="manifest.shr.cneaeo" /></td>  
423 - <td class="kv-content"><input id="cneaeo" name="cneaeo" type="text"  
424 - value="${pre.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"  
425 - onpropertychange="onInputChange(event,'cneaeo','onpropertychange')"></td>  
426 - <td class="kv-label"><spring:message code="manifest.shr.cnecusid" /></td> 448 + <%-- <td class="kv-label"><spring:message code="manifest.shr.cnecusid" /></td>
427 <td class="kv-content"><input id="cnecusid" name="cnecusid" type="text" 449 <td class="kv-content"><input id="cnecusid" name="cnecusid" type="text"
428 value="${pre.cnecusid }" oninput="onInputChange(event,'cnecusid','oninput')" 450 value="${pre.cnecusid }" oninput="onInputChange(event,'cnecusid','oninput')"
  451 + onpropertychange="onInputChange(event,'cnecusid','onpropertychange')"></td> --%>
  452 +
  453 + <td class="kv-label" colspan="6"><select id="sh_cusid" required>
  454 + <c:if test="${not empty pre.cnecusid}">
  455 + <c:set var="tempCneType" value='${fn:split(pre.cnecusid,"+")[0]}' />
  456 + <option value="${tempCneType}">${tempCneType}</option>
  457 + </c:if>
  458 +
  459 + <c:if test="${empty pre.cnecusid}">
  460 + <option value=""><spring:message code="manifest.enterprise.code.type" /></option>
  461 + </c:if>
  462 + </select> <span style="color: black; font-size: 16px;">+</span> <input required id="cnecusid" type="text"
  463 + <c:if test="${not empty pre.cnecusid}">
  464 + <c:set var="tempCneValue" value='${fn:split(pre.cnecusid,"+")[1]}' />
  465 + value="${tempCneValue }"
  466 + </c:if>
  467 + placeholder="<spring:message code='manifest.enterprise.code' />"
  468 + oninput="onInputChange(event,'cnecusid','oninput')"
429 onpropertychange="onInputChange(event,'cnecusid','onpropertychange')"></td> 469 onpropertychange="onInputChange(event,'cnecusid','onpropertychange')"></td>
430 - <td style="display: none;" class="kv-label"><spring:message code="manifest.shr.unlodingcode" /><span  
431 - class="required_span">*</span></td>  
432 - <td style="display: none;" class="kv-content"><input required id="unlodingcode" name="unlodingcode" type="text"  
433 - value="${pre.unlodingcode }" oninput="onInputChange(event,'unlodingcode','oninput')" 470 +
  471 +
  472 + <td style="display: none;" class="kv-label"><spring:message
  473 + code="manifest.shr.unlodingcode" /><span class="required_span">*</span></td>
  474 + <td style="display: none;" class="kv-content"><input required id="unlodingcode"
  475 + name="unlodingcode" type="text" value="${pre.unlodingcode }"
  476 + oninput="onInputChange(event,'unlodingcode','oninput')"
434 onpropertychange="onInputChange(event,'unlodingcode','onpropertychange')"></td> 477 onpropertychange="onInputChange(event,'unlodingcode','onpropertychange')"></td>
435 </tr> 478 </tr>
436 <!-- 收货信息 end --> 479 <!-- 收货信息 end -->
437 480
438 <!-- 危险信息 start --> 481 <!-- 危险信息 start -->
439 <tr> 482 <tr>
440 - <td class="kv-label" colspan="6"><spring:message 483 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
441 code="manifest.dangerous.goods.information" /></td> 484 code="manifest.dangerous.goods.information" /></td>
442 </tr> 485 </tr>
443 <tr> 486 <tr>
@@ -454,10 +497,10 @@ @@ -454,10 +497,10 @@
454 </tr> 497 </tr>
455 <!-- 危险信息 end --> 498 <!-- 危险信息 end -->
456 499
457 - <!-- 交运信息 start --> 500 + <!-- 承运到达信息 start -->
458 <tr> 501 <tr>
459 - <td class="kv-label" colspan="6"><spring:message code="manifest.carriage.arrival" /><span  
460 - class="required_span">*</span></td> 502 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  503 + code="manifest.carriage.arrival" /></td>
461 </tr> 504 </tr>
462 <tr> 505 <tr>
463 <td class="kv-label"><spring:message code="manifest.carrier" /><span 506 <td class="kv-label"><spring:message code="manifest.carrier" /><span
@@ -496,8 +539,12 @@ @@ -496,8 +539,12 @@
496 oninput="onInputChange(event,'reach_station2','oninput')" 539 oninput="onInputChange(event,'reach_station2','oninput')"
497 onpropertychange="onInputChange(event,'reach_station2','onpropertychange')"></td> 540 onpropertychange="onInputChange(event,'reach_station2','onpropertychange')"></td>
498 </tr> 541 </tr>
  542 + <!-- 承运到达信息 end -->
  543 +
  544 + <!-- 交运信息 start -->
499 <tr> 545 <tr>
500 - <td class="kv-label" colspan="6"><spring:message code="menu.delivery" /></td> 546 + <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
  547 + code="menu.delivery" /></td>
501 </tr> 548 </tr>
502 <tr> 549 <tr>
503 <td class="kv-label"><spring:message code="manifest.transfer.station" /></td> 550 <td class="kv-label"><spring:message code="manifest.transfer.station" /></td>
@@ -567,7 +614,7 @@ @@ -567,7 +614,7 @@
567 <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script> 614 <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
568 <script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script> 615 <script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script>
569 <script src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script> 616 <script src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script>
570 - <script src="<%=basePath%>resource/js/tools.js?version=0.8"></script> 617 + <script src="<%=basePath%>resource/js/tools.js?version=1.2"></script>
571 <script type="text/javascript"> 618 <script type="text/javascript">
572 function onCarrierMsg() { 619 function onCarrierMsg() {
573 layer.open({content: "<spring:message code='manifest.fhr.carrierMsg'/>"}); 620 layer.open({content: "<spring:message code='manifest.fhr.carrierMsg'/>"});
@@ -578,7 +625,7 @@ @@ -578,7 +625,7 @@
578 var is='${is_strs}'; 625 var is='${is_strs}';
579 if(is != null){ 626 if(is != null){
580 table_data = JSON.parse(is); 627 table_data = JSON.parse(is);
581 - if(parseInt(table_data.totalpiece) <= 0){ 628 + /* if(parseInt(table_data.totalpiece) <= 0){
582 $("#totalpiece").attr("readonly","true"); 629 $("#totalpiece").attr("readonly","true");
583 } 630 }
584 if(parseInt(table_data.totalweight) <= 0){ 631 if(parseInt(table_data.totalweight) <= 0){
@@ -589,7 +636,7 @@ @@ -589,7 +636,7 @@
589 } 636 }
590 if(parseInt(table_data.preparetotalweight) <= 0){ 637 if(parseInt(table_data.preparetotalweight) <= 0){
591 $("#prepareweight").attr("readonly","true") 638 $("#prepareweight").attr("readonly","true")
592 - } 639 + } */
593 $("#pie").val(table_data.totalpiece); 640 $("#pie").val(table_data.totalpiece);
594 $("#wei").val(table_data.totalweight); 641 $("#wei").val(table_data.totalweight);
595 $("#topie").val(table_data.preparetotalpiece); 642 $("#topie").val(table_data.preparetotalpiece);
@@ -664,7 +711,7 @@ @@ -664,7 +711,7 @@
664 }) 711 })
665 712
666 //计算 总件数 总总量 舱单件数 和舱单重量 --开始 713 //计算 总件数 总总量 舱单件数 和舱单重量 --开始
667 - $("#totalpiece").blur(function(){ 714 + /* $("#totalpiece").blur(function(){
668 if(parseInt(table_data.totalpiece) <= 0){ 715 if(parseInt(table_data.totalpiece) <= 0){
669 $("#totalpiece").attr("readonly","true"); 716 $("#totalpiece").attr("readonly","true");
670 return false; 717 return false;
@@ -675,10 +722,10 @@ @@ -675,10 +722,10 @@
675 $("#totalpiece").val(""); 722 $("#totalpiece").val("");
676 layer.open({content:"不能大于提示信息"}); 723 layer.open({content:"不能大于提示信息"});
677 } 724 }
678 - }) 725 + }) */
679 726
680 //未判断小数的重量 727 //未判断小数的重量
681 - $("#totalweight").blur(function(){ 728 + /* $("#totalweight").blur(function(){
682 if(parseInt(table_data.totalweight) <= 0){ 729 if(parseInt(table_data.totalweight) <= 0){
683 $("#totalweight").attr("readonly","true"); 730 $("#totalweight").attr("readonly","true");
684 return false; 731 return false;
@@ -715,7 +762,7 @@ @@ -715,7 +762,7 @@
715 $("#prepareweight").val(""); 762 $("#prepareweight").val("");
716 layer.open({content:"不能大于提示信息"}); 763 layer.open({content:"不能大于提示信息"});
717 } 764 }
718 - }) 765 + }) */
719 766
720 //--结束 767 //--结束
721 768
@@ -724,6 +771,25 @@ @@ -724,6 +771,25 @@
724 var dd = $("#ways").val(); 771 var dd = $("#ways").val();
725 $("#waybillnosecondary").val(dd) 772 $("#waybillnosecondary").val(dd)
726 var data = $("#form").serialize(); 773 var data = $("#form").serialize();
  774 +
  775 + var shp_cusid_type = getSelectedValue("co_cusid");
  776 + var sh_cusid = $("#shpcusid").val();
  777 +
  778 + if(notEmpty(shp_cusid_type)&&notEmpty(sh_cusid)){
  779 + shpcusid = shp_cusid_type+"+"+sh_cusid;
  780 + data+="&shpcusid="+encodeURIComponent(shpcusid);
  781 + }
  782 +
  783 + var cne_cusid_type = getSelectedValue("sh_cusid");
  784 + var cne_cusid = $("#cnecusid").val();
  785 +
  786 + if(notEmpty(cne_cusid_type)&&notEmpty(cne_cusid)){
  787 + cnecusid = cne_cusid_type+"+"+cne_cusid;
  788 + data+="&cnecusid="+encodeURIComponent(cnecusid);
  789 + }
  790 +
  791 + console.log("form-->"+data);
  792 +
727 $.post("<%=basePath%>manifest/sub_save",data,function(data){ 793 $.post("<%=basePath%>manifest/sub_save",data,function(data){
728 if(data.status==200){ 794 if(data.status==200){
729 // layer.confirm("<spring:message code="opt.savesuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){ 795 // layer.confirm("<spring:message code="opt.savesuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
@@ -737,20 +803,36 @@ @@ -737,20 +803,36 @@
737 } 803 }
738 804
739 function presavesend(){ 805 function presavesend(){
  806 + var isValid = $("#form").valid();
  807 + if(isValid){
740 var dd = $("#ways").val(); 808 var dd = $("#ways").val();
741 - $("#waybillnosecondary").val(dd) 809 + $("#waybillnosecondary").val(dd);
742 var data = $("#form").serialize(); 810 var data = $("#form").serialize();
  811 + var shp_cusid_type = getSelectedValue("co_cusid");
  812 + var sh_cusid = $("#shpcusid").val();
  813 +
  814 + if(notEmpty(shp_cusid_type)&&notEmpty(sh_cusid)){
  815 + shpcusid = shp_cusid_type+"+"+sh_cusid;
  816 + data+="&shpcusid="+encodeURIComponent(shpcusid);
  817 + }
  818 +
  819 + var cne_cusid_type = getSelectedValue("sh_cusid");
  820 + var cne_cusid = $("#cnecusid").val();
  821 +
  822 + if(notEmpty(cne_cusid_type)&&notEmpty(cne_cusid)){
  823 + cnecusid = cne_cusid_type+"+"+cne_cusid;
  824 + data+="&cnecusid="+encodeURIComponent(cnecusid);
  825 + }
  826 +
743 $.post("<%=basePath%>manifest/presavesend",data,function(data){ 827 $.post("<%=basePath%>manifest/presavesend",data,function(data){
744 if(data.status==200){ 828 if(data.status==200){
745 -// layer.confirm("<spring:message code="opt.savesuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){  
746 window.location.href="<%=basePath%>manifest/list"; 829 window.location.href="<%=basePath%>manifest/list";
747 -// })  
748 }else{ 830 }else{
749 layer.open({content:""+data.msg}); 831 layer.open({content:""+data.msg});
750 - //layer.open({content:"<spring:message code="opt.savefailed" />!"});  
751 } 832 }
752 }) 833 })
753 } 834 }
  835 + }
754 836
755 function presendDelivery(){ 837 function presendDelivery(){
756 var dd = $("#ways").val(); 838 var dd = $("#ways").val();
@@ -826,6 +908,93 @@ @@ -826,6 +908,93 @@
826 $("#de_chweight").val(co); 908 $("#de_chweight").val(co);
827 $("#de_volume").val(co); 909 $("#de_volume").val(co);
828 }) 910 })
  911 +
  912 + var api = "<%=basePath%>enterprise/search";
  913 +
  914 + var api = "<%=basePath%>enterprise/search";
  915 +
  916 + $('#co_country').combogrid({
  917 + panelWidth:212,
  918 + url: api,
  919 + idField:'country_code',
  920 + textField:'start',
  921 + mode:'remote',
  922 + fitColumns:true,
  923 + onBeforeLoad: function (parm) { //在请求加载数据之前触发，返回 false 则取消加载动作
  924 + var value = $('#co_country').combobox('getValue');
  925 + if (value) {
  926 + var upper = value.toUpperCase();
  927 + $('#co_country').combogrid('setValue',upper);
  928 + parm.start = upper;
  929 +
  930 + onGetData('co_cusid','co_country')
  931 + return true;
  932 + }
  933 + return false;
  934 + },
  935 + onSelect: function(row,rowData){
  936 + //当用户选择一个列表项时触发。
  937 + $('#co_country').combogrid('setValue',rowData.country_code);
  938 + onGetData('co_cusid','co_country')
  939 + },
  940 + columns:[[
  941 + {field:'name_cn',title:'名称',width:106},
  942 + {field:'country_code',title:'代码',width:106}
  943 + ]]
  944 + });
  945 +
  946 + $('#sh_country').combogrid({
  947 + panelWidth:220,
  948 + url: api,
  949 + idField:'country_code',
  950 + textField:'start',
  951 + mode:'remote',
  952 + fitColumns:true,
  953 + onBeforeLoad: function (parm) { //在请求加载数据之前触发，返回 false 则取消加载动作
  954 + var value = $('#sh_country').combobox('getValue');
  955 + if (value) {
  956 + var upper = value.toUpperCase();
  957 + $('#sh_country').combogrid('setValue',upper);
  958 + parm.start = upper;
  959 +
  960 + onGetData('sh_cusid','sh_country')
  961 + return true;
  962 + }
  963 + return false;
  964 + },
  965 + onSelect: function(row,rowData){
  966 + //当用户选择一个列表项时触发。
  967 + $('#sh_country').val(rowData.country_code);
  968 + onGetData('sh_cusid','sh_country')
  969 + },
  970 + columns:[[
  971 + {field:'name_cn',title:'名称',width:106},
  972 + {field:'country_code',title:'代码',width:106}
  973 + ]]
  974 + });
  975 +
  976 + function onGetData(selectId,inputId) {
  977 + var select = $("#"+selectId);
  978 + select.html("");
  979 + select.append("<option value=''><spring:message code='manifest.enterprise.code.type' /></option>");
  980 +
  981 + var countryCode = $('#'+inputId).combobox('getValue');
  982 +
  983 + $.ajax({
  984 + url:"<%=basePath%>/enterprise/list?countryCode="+ countryCode,
  985 + success : function(data) {
  986 + if (data.status == 200) {
  987 + if (data.data) {
  988 + for (var i = 0; i < data.data.length; i++) {
  989 + var type = data.data[i].enterprise_type;
  990 + select.append("<option value='"+type+"'>"
  991 + + type + "</option>");
  992 + }
  993 + }
  994 + }
  995 + }
  996 + });
  997 + }
829 </script> 998 </script>
830 </body> 999 </body>
831 </html> 1000 </html>
1 -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}html{*overflow:auto}body,button,input,select,textarea{font-family:PingFang SC, Lantinghei SC, Microsoft Yahei, Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans;font-size:14px}.clearfix:after{content:"";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}.clearfix{height:1%}.clearfix{display:block;overflow:hidden}.ellipsis{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.alert{margin-bottom:20px;padding:0 10px;height:36px;line-height:36px;border:1px solid #ddd;color:#888}.alert .close{float:right;font-size:12px;color:#999}.alert .close:hover{text-decoration:none}.alert.alert-warning{background:#fff5db;color:#e2ba89;border-color:#ffe195}.alert.alert-error{background:#fceee8;color:#fc0000;border-color:#fc0000}::-webkit-scrollbar-track-piece{background-color:#fff;-webkit-border-radius:0}::-webkit-scrollbar{width:10px;height:10px}::-webkit-scrollbar-thumb{height:50px;background-color:#b8b8b8;-webkit-border-radius:6px;outline:2px solid #fff;outline-offset:-2px;border:2px solid #fff;filter:alpha(opacity=50);-moz-opacity:0.5;-khtml-opacity:0.5;opacity:0.5}::-webkit-scrollbar-thumb:hover{height:50px;background-color:#878987;-webkit-border-radius:6px}@font-face{font-family:'iconfont';src:url('../fonts/iconfont.eot?1464535104');src:url('../fonts/iconfont.eot?&1464535104#iefix') format("embedded-opentype"),url('../fonts/iconfont.woff?1464535104') format("woff"),url('../fonts/iconfont.ttf?1464535104') format("truetype"),url('../fonts/iconfont.svg?1464535104#iconfont') format("svg")}.iconfont{font-family:"iconfont" !important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-webkit-text-stroke-width:0.2px;-moz-osx-font-smoothing:grayscale}.kv-table{border-right:1px solid #cacaca \9;*border-right:1px solid #cacaca}.kv-table .kv-table-row{border-bottom:1px solid #cacaca}.kv-table .kv-table-row .kv-item{padding-left:134px}.kv-table .kv-table-row .kv-item .kv-label{float:left;padding:0 10px;margin-left:-134px;width:112px;background:#f5f5f5;border:1px solid #cacaca;border-bottom:none;border-top:none}.kv-table .kv-table-row .kv-item .kv-content-wrap{float:left;width:100%}.kv-table .kv-table-row .kv-item .kv-content{padding:10px}.kv-table .kv-table-row.col-3 .kv-item-wrap{float:left;width:33.33%}.kv-table .kv-table-row.col-2 .kv-item-wrap{float:left;width:33.33%}table.kv-table{width:100%}table.kv-table .kv-label{padding:0 10px;width:114px;background:#f5f5f5;border:1px solid #cacaca;border-top:none}table.kv-table td.kv-content,table.kv-table td.kv-label{height:29px;padding:5px 0;border-bottom:1px solid #cacaca;font-size:14px;padding-left:20px}table.kv-table tr:first-child td.kv-content,table.kv-table tr:first-child td.kv-label{border-top:1px solid #cacaca}table.kv-table tr td.kv-content:last-child{border-right:1px solid #cacaca}table.kv-table tr .button{text-align:center;border-radius:0;text-indent:0;height:32px}table.kv-table .kv-content{width:260px;padding:5px 10px}table.kv-table .textarea-wrap textarea{width:98%} 1 +html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p,
  2 + blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn,
  3 + em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var,
  4 + b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend,
  5 + table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas,
  6 + details, embed, figure, figcaption, footer, header, hgroup, menu, nav,
  7 + output, ruby, section, summary, time, mark, audio, video {
  8 + margin: 0;
  9 + padding: 0;
  10 + border: 0;
  11 + font: inherit;
  12 + font-size: 100%;
  13 + vertical-align: baseline
  14 +}
  15 +
  16 +html {
  17 + line-height: 1
  18 +}
  19 +
  20 +ol, ul {
  21 + list-style: none
  22 +}
  23 +
  24 +table {
  25 + border-collapse: collapse;
  26 + border-spacing: 0
  27 +}
  28 +
  29 +caption, th, td {
  30 + text-align: left;
  31 + font-weight: normal;
  32 + vertical-align: middle
  33 +}
  34 +
  35 +q, blockquote {
  36 + quotes: none
  37 +}
  38 +
  39 +q:before, q:after, blockquote:before, blockquote:after {
  40 + content: "";
  41 + content: none
  42 +}
  43 +
  44 +a img {
  45 + border: none
  46 +}
  47 +
  48 +article, aside, details, figcaption, figure, footer, header, hgroup,
  49 + main, menu, nav, section, summary {
  50 + display: block
  51 +}
  52 +
  53 +html {
  54 + *overflow: auto
  55 +}
  56 +
  57 +body, button, input, select, textarea {
  58 + font-family: PingFang SC, Lantinghei SC, Microsoft Yahei,
  59 + Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans;
  60 + font-size: 14px
  61 +}
  62 +
  63 +.clearfix:after {
  64 + content: "";
  65 + display: block;
  66 + height: 0;
  67 + clear: both;
  68 + visibility: hidden
  69 +}
  70 +
  71 +.clearfix {
  72 + display: inline-block
  73 +}
  74 +
  75 +.clearfix {
  76 + height: 1%
  77 +}
  78 +
  79 +.clearfix {
  80 + display: block;
  81 + overflow: hidden
  82 +}
  83 +
  84 +.ellipsis {
  85 + text-overflow: ellipsis;
  86 + white-space: nowrap;
  87 + overflow: hidden
  88 +}
  89 +
  90 +.alert {
  91 + margin-bottom: 20px;
  92 + padding: 0 10px;
  93 + height: 36px;
  94 + line-height: 36px;
  95 + border: 1px solid #ddd;
  96 + color: #888
  97 +}
  98 +
  99 +.alert .close {
  100 + float: right;
  101 + font-size: 12px;
  102 + color: #999
  103 +}
  104 +
  105 +.alert .close:hover {
  106 + text-decoration: none
  107 +}
  108 +
  109 +.alert.alert-warning {
  110 + background: #fff5db;
  111 + color: #e2ba89;
  112 + border-color: #ffe195
  113 +}
  114 +
  115 +.alert.alert-error {
  116 + background: #fceee8;
  117 + color: #fc0000;
  118 + border-color: #fc0000
  119 +}
  120 +
  121 +::-webkit-scrollbar-track-piece {
  122 + background-color: #fff;
  123 + -webkit-border-radius: 0
  124 +}
  125 +
  126 +::-webkit-scrollbar {
  127 + width: 10px;
  128 + height: 10px
  129 +}
  130 +
  131 +::-webkit-scrollbar-thumb {
  132 + height: 50px;
  133 + background-color: #b8b8b8;
  134 + -webkit-border-radius: 6px;
  135 + outline: 2px solid #fff;
  136 + outline-offset: -2px;
  137 + border: 2px solid #fff;
  138 + filter: alpha(opacity = 50);
  139 + -moz-opacity: 0.5;
  140 + -khtml-opacity: 0.5;
  141 + opacity: 0.5
  142 +}
  143 +
  144 +::-webkit-scrollbar-thumb:hover {
  145 + height: 50px;
  146 + background-color: #878987;
  147 + -webkit-border-radius: 6px
  148 +}
  149 +
  150 +@font-face {
  151 + font-family: 'iconfont';
  152 + src: url('../fonts/iconfont.eot?1464535104');
  153 + src: url('../fonts/iconfont.eot?&1464535104#iefix')
  154 + format("embedded-opentype"), url('../fonts/iconfont.woff?1464535104')
  155 + format("woff"), url('../fonts/iconfont.ttf?1464535104')
  156 + format("truetype"), url('../fonts/iconfont.svg?1464535104#iconfont')
  157 + format("svg")
  158 +}
  159 +
  160 +.iconfont {
  161 + font-family: "iconfont" !important;
  162 + font-size: 16px;
  163 + font-style: normal;
  164 + -webkit-font-smoothing: antialiased;
  165 + -webkit-text-stroke-width: 0.2px;
  166 + -moz-osx-font-smoothing: grayscale
  167 +}
  168 +
  169 +.kv-table {
  170 + border-right: 1px solid #cacaca \9;
  171 + *border-right: 1px solid #cacaca
  172 +}
  173 +
  174 +.kv-table .kv-table-row {
  175 + border-bottom: 1px solid #cacaca
  176 +}
  177 +
  178 +.kv-table .kv-table-row .kv-item {
  179 + padding-left: 134px
  180 +}
  181 +
  182 +.kv-table .kv-table-row .kv-item .kv-label {
  183 + float: left;
  184 + padding: 0 10px;
  185 + margin-left: -134px;
  186 + width: 112px;
  187 + background: white;
  188 + border: 1px solid #cacaca;
  189 + border-bottom: none;
  190 + border-top: none
  191 +}
  192 +
  193 +.kv-table .kv-table-row .kv-item .kv-content-wrap {
  194 + float: left;
  195 + width: 100%
  196 +}
  197 +
  198 +.kv-table .kv-table-row .kv-item .kv-content {
  199 + padding: 10px
  200 +}
  201 +
  202 +.kv-table .kv-table-row.col-3 .kv-item-wrap {
  203 + float: left;
  204 + width: 33.33%
  205 +}
  206 +
  207 +.kv-table .kv-table-row.col-2 .kv-item-wrap {
  208 + float: left;
  209 + width: 33.33%
  210 +}
  211 +
  212 +table.kv-table {
  213 + width: 100%
  214 +}
  215 +
  216 +table.kv-table .kv-label {
  217 + padding: 0 10px;
  218 + width: 114px;
  219 + background: white;
  220 + border: 1px solid #cacaca;
  221 + border-top: none
  222 +}
  223 +
  224 +table.kv-table td.kv-content, table.kv-table td.kv-label {
  225 + height: 29px;
  226 + padding: 5px 0;
  227 + border-bottom: 1px solid #cacaca;
  228 + font-size: 14px;
  229 + padding-left: 20px
  230 +}
  231 +
  232 +table.kv-table tr:first-child td.kv-content, table.kv-table tr:first-child td.kv-label
  233 + {
  234 + border-top: 1px solid #cacaca
  235 +}
  236 +
  237 +table.kv-table tr td.kv-content:last-child {
  238 + border-right: 1px solid #cacaca
  239 +}
  240 +
  241 +table.kv-table tr .button {
  242 + text-align: center;
  243 + border-radius: 0;
  244 + text-indent: 0;
  245 + height: 32px
  246 +}
  247 +
  248 +table.kv-table .kv-content {
  249 + width: 260px;
  250 + padding: 5px 10px
  251 +}
  252 +
  253 +table.kv-table .textarea-wrap textarea {
  254 + width: 98%
  255 +}
1 -.container{position:relative;}.container .left-tree{position:absolute;left:0;top:0;bottom:0;padding:10px;width:146px;border:1px solid #bfbfbf}.container .content{padding-left:10px;min-height:200px}.container .content .basic-info{padding:10px}.container .content .tabs-header{background-color:#fff;border-width:0}.container .content .tabs li{border-top:1px solid #bfbfbf;border-radius:3px 3px 0 0}.container .content .tabs li.tabs-selected{border-top:2px solid #11a9e2}.container .content .tabs li.tabs-selected a.tabs-inner{color:#000;background-color:#fff}.container .content .tabs li a.tabs-inner{color:#000;background-color:#e3e3e3}.container .content .tabs li a.tabs-inner .tabs-title{font-size:14px}.container .content .column{position:relative;height:23px;border-bottom:1px solid #d4d4d4;margin-bottom:10px}.container .content .column span.current{position:relative;top:0px;display:inline-block;color:#11a9e2;font-size:12px;font-weight:bold;height:22px;line-height:22px;border-bottom:2px solid #ff9d02}.container .content table.yes-not.kv-table td.kv-label{width:130px}.container .content table.kv-table{margin-bottom:20px}.container .content table.kv-table td.kv-label{height:26px;font-size:12px}.container .content table.kv-table td.kv-content{height:26px;font-size:12px}.container .content table.kv-table td.kv-content a{color:#11a9e2;text-decoration:none}.container .content table.kv-table td.kv-content a:hover{text-decoration:underline} 1 +.container {
  2 + position: relative;
  3 +}
  4 +
  5 +.container .left-tree {
  6 + position: absolute;
  7 + left: 0;
  8 + top: 0;
  9 + bottom: 0;
  10 + padding: 10px;
  11 + width: 146px;
  12 + border: 1px solid #bfbfbf
  13 +}
  14 +
  15 +.container .content {
  16 + padding-left: 10px;
  17 + min-height: 200px
  18 +}
  19 +
  20 +.container .content .basic-info {
  21 + padding: 10px
  22 +}
  23 +
  24 +.container .content .tabs-header {
  25 + background-color: #fff;
  26 + border-width: 0
  27 +}
  28 +
  29 +.container .content .tabs li {
  30 + border-top: 1px solid #bfbfbf;
  31 + border-radius: 3px 3px 0 0
  32 +}
  33 +
  34 +.container .content .tabs li.tabs-selected {
  35 + border-top: 2px solid #11a9e2
  36 +}
  37 +
  38 +.container .content .tabs li.tabs-selected a.tabs-inner {
  39 + color: #000;
  40 + background-color: #fff
  41 +}
  42 +
  43 +.container .content .tabs li a.tabs-inner {
  44 + color: #000;
  45 + background-color: #e3e3e3
  46 +}
  47 +
  48 +.container .content .tabs li a.tabs-inner .tabs-title {
  49 + font-size: 14px
  50 +}
  51 +
  52 +.container .content .column {
  53 + position: relative;
  54 + height: 23px;
  55 + border-bottom: 1px solid #d4d4d4;
  56 + margin-bottom: 10px
  57 +}
  58 +
  59 +.container .content .column span.current {
  60 + position: relative;
  61 + top: 0px;
  62 + display: inline-block;
  63 + color: #11a9e2;
  64 + font-size: 12px;
  65 + font-weight: bold;
  66 + height: 22px;
  67 + line-height: 22px;
  68 + border-bottom: 2px solid #ff9d02
  69 +}
  70 +
  71 +.container .content table.yes-not.kv-table td.kv-label {
  72 + width: 130px
  73 +}
  74 +
  75 +.container .content table.kv-table {
  76 + margin-bottom: 20px
  77 +}
  78 +
  79 +.container .content table.kv-table td.kv-label {
  80 + height: 26px;
  81 + font-size: 12px
  82 +}
  83 +
  84 +.container .content table.kv-table td.kv-content {
  85 + height: 26px;
  86 + font-size: 12px
  87 +}
  88 +
  89 +.container .content table.kv-table td.kv-content a {
  90 + color: #11a9e2;
  91 + text-decoration: none
  92 +}
  93 +
  94 +.container .content table.kv-table td.kv-content a:hover {
  95 + text-decoration: underline
  96 +}
@@ -304,6 +304,24 @@ function isEmpty(data) { @@ -304,6 +304,24 @@ function isEmpty(data) {
304 } 304 }
305 } 305 }
306 306
307 -function sync(id){ 307 +function notEmpty(data) {
  308 + return !isEmpty(data);
  309 +}
  310 +
  311 +//获取下拉列表选中项的文本
  312 +function getSelectedText(eid) {
  313 + var obj = document.getElementById(eid);
  314 + for (i = 0; i < obj.length; i++) {
  315 + if (obj[i].selected == true) {
  316 + // 关键是通过option对象的innerText属性获取到选项文本
  317 + return obj[i].innerText;
  318 + }
  319 + }
  320 +}
308 321
  322 +// 获取下拉列表选中项的值
  323 +function getSelectedValue(eid) {
  324 + var obj = document.getElementById(eid);
  325 + // 直接用其对象的value属性便可获取到
  326 + return obj.value;
309 } 327 }