张天舒 / station · 提交

转到一个项目

作者 zhangFan
提交 b171995cd2cef930b1fc9347a1a100f7b3c3e77a 1 个父辈 f654bff3

稳定版

内嵌 并排对比
正在显示 15 个修改的文件 包含 292 行增加 和 169 行删除
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="VcsDirectoryMappings">
  4 + <mapping directory="$PROJECT_DIR$" vcs="Git" />
  5 + </component>
  6 +</project>
@@ -26,4 +26,5 @@ public interface LandBusinesstypeListDao extends CrudDao<LandBusinesstypeList> { @@ -26,4 +26,5 @@ public interface LandBusinesstypeListDao extends CrudDao<LandBusinesstypeList> {
26 int deleteByBarcode(@Param("barcode")String barcode); 26 int deleteByBarcode(@Param("barcode")String barcode);
27 27
28 int updateByBarcode(LandBusinesstypeList landBusinesstypeList); 28 int updateByBarcode(LandBusinesstypeList landBusinesstypeList);
  29 +
29 } 30 }
@@ -38,6 +38,11 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -38,6 +38,11 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
38 private String contrastflag; // 校验标识 38 private String contrastflag; // 校验标识
39 private String barcode; // 二维码 39 private String barcode; // 二维码
40 private String isvalid; // 是否失效：0：有效，1：无效 40 private String isvalid; // 是否失效：0：有效，1：无效
  41 + private Double aislewt; // 过卡重量
  42 + private String isfull; // 是否空车：0空车，1不空车
  43 + private String remark; // 预留字段
  44 + private String remark1; // 预留字段
  45 + private String remark2; // 预留字段
41 46
42 public LandBusinesstypeList() { 47 public LandBusinesstypeList() {
43 super(); 48 super();
@@ -235,4 +240,48 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -235,4 +240,48 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
235 public void setIsvalid(String isvalid) { 240 public void setIsvalid(String isvalid) {
236 this.isvalid = isvalid; 241 this.isvalid = isvalid;
237 } 242 }
  243 +
  244 + public Double getAislewt() {
  245 + return aislewt;
  246 + }
  247 +
  248 + public void setAislewt(Double aislewt) {
  249 + this.aislewt = aislewt;
  250 + }
  251 +
  252 + @Length(min=0, max=1, message="是否空车：0空车，1不空车长度必须介于 0 和 1 之间")
  253 + public String getIsfull() {
  254 + return isfull;
  255 + }
  256 +
  257 + public void setIsfull(String isfull) {
  258 + this.isfull = isfull;
  259 + }
  260 +
  261 + @Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
  262 + public String getRemark() {
  263 + return remark;
  264 + }
  265 +
  266 + public void setRemark(String remark) {
  267 + this.remark = remark;
  268 + }
  269 +
  270 + @Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
  271 + public String getRemark1() {
  272 + return remark1;
  273 + }
  274 +
  275 + public void setRemark1(String remark1) {
  276 + this.remark1 = remark1;
  277 + }
  278 +
  279 + @Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
  280 + public String getRemark2() {
  281 + return remark2;
  282 + }
  283 +
  284 + public void setRemark2(String remark2) {
  285 + this.remark2 = remark2;
  286 + }
238 } 287 }
@@ -67,4 +67,5 @@ public class LandBusinesstypeListService extends CrudService<LandBusinesstypeLis @@ -67,4 +67,5 @@ public class LandBusinesstypeListService extends CrudService<LandBusinesstypeLis
67 public int updateByBarcode(LandBusinesstypeList landBusinesstypeList) { 67 public int updateByBarcode(LandBusinesstypeList landBusinesstypeList) {
68 return dao.updateByBarcode(landBusinesstypeList); 68 return dao.updateByBarcode(landBusinesstypeList);
69 } 69 }
  70 +
70 } 71 }
@@ -104,24 +104,24 @@ public class LandBusinesstypeListController extends BaseController { @@ -104,24 +104,24 @@ public class LandBusinesstypeListController extends BaseController {
104 @ResponseBody 104 @ResponseBody
105 public Page<LandRoadVeRecord> list(String frameNo) throws Exception { 105 public Page<LandRoadVeRecord> list(String frameNo) throws Exception {
106 Page<LandRoadVeRecord> page = new Page<LandRoadVeRecord>(); 106 Page<LandRoadVeRecord> page = new Page<LandRoadVeRecord>();
107 - //List<LandBusinesstypeList> list = landBusinesstypeListService.findByStatus(frameNo);  
108 - List<LandRoadVeRecord> list = roadVeService.selectByFrameNo(frameNo);  
109 -// if(list.size()>0 ) {  
110 -// for (int i = 0; i < list.size(); i++) {  
111 -// System.out.println(list.get(i));  
112 -// boolean flag = (list.get(i).getContrastflag()==null ||list.get(i).getContrastflag()=="" ||list.get(i).getContrastflag().length()<=0);  
113 -// if("进场站".equals(list.get(i).getTurnoverflag()) && flag) {  
114 -// page.setResultMsg("此车辆存在进场业务，请勿重新申报");  
115 -// }else if("已进站".equals(list.get(i).getContrastflag())) {  
116 -// page.setResultMsg("此车辆有出站业务未完成");  
117 -// }else if("出场站".equals(list.get(i).getTurnoverflag())&& flag ) {  
118 -// page.setResultMsg("此车辆存在出场业务，请勿重新申报");  
119 -// }  
120 -// }  
121 -// }else {  
122 -// page.setResultMsg("此车辆可以正常申报业务");  
123 -// }  
124 - page.setList(list); 107 + List<LandBusinesstypeList> list = landBusinesstypeListService.findByStatus(frameNo);
  108 + List<LandRoadVeRecord> veList = roadVeService.selectByFrameNo(frameNo);
  109 + if(list.size()>0 ) {
  110 + for (int i = 0; i < list.size(); i++) {
  111 + boolean flag = (list.get(i).getContrastflag()==null || list.get(i).getContrastflag().length()<1);
  112 + if("I".equals(list.get(i).getTurnoverflag()) && flag) {
  113 + page.setResultMsg("此车辆已存在进出场业务，请勿重新申报");
  114 + }else if("E".equals(list.get(i).getTurnoverflag())&& flag ) {
  115 + page.setResultMsg("此车辆已存在进出场业务，请勿重新申报");
  116 + }else {
  117 + page.setResultMsg("此车辆可以正常申报业务");
  118 + }
  119 + break;
  120 + }
  121 + }else {
  122 + page.setResultMsg("此车辆可以正常申报业务");
  123 + }
  124 + page.setList(veList);
125 return page; 125 return page;
126 126
127 } 127 }
@@ -139,7 +139,6 @@ public class LandBusinesstypeListController extends BaseController { @@ -139,7 +139,6 @@ public class LandBusinesstypeListController extends BaseController {
139 @RequiresPermissions("land:landBusinesstypeList:view") 139 @RequiresPermissions("land:landBusinesstypeList:view")
140 @RequestMapping(value = "form") 140 @RequestMapping(value = "form")
141 public String form(LandBusinesstypeList landBusinesstypeList, Model model) { 141 public String form(LandBusinesstypeList landBusinesstypeList, Model model) {
142 - System.out.println(landBusinesstypeList);  
143 Yard yard = new Yard(); 142 Yard yard = new Yard();
144 List<Yard> yardList = yardService.findList(yard); 143 List<Yard> yardList = yardService.findList(yard);
145 LandRoadVeRecord ve = new LandRoadVeRecord(); 144 LandRoadVeRecord ve = new LandRoadVeRecord();
@@ -154,9 +153,6 @@ public class LandBusinesstypeListController extends BaseController { @@ -154,9 +153,6 @@ public class LandBusinesstypeListController extends BaseController {
154 List<Bayonet> bayonets = bayService.findByYardId(yard1.getStationid()); 153 List<Bayonet> bayonets = bayService.findByYardId(yard1.getStationid());
155 model.addAttribute("bayonets", bayonets); 154 model.addAttribute("bayonets", bayonets);
156 } 155 }
157 -// Bayonet bayonet = new Bayonet();  
158 -// List<Bayonet> bayonets = bayService.findList(bayonet);  
159 -// model.addAttribute("bayonets", bayonets);  
160 model.addAttribute("veList",veList); 156 model.addAttribute("veList",veList);
161 model.addAttribute("yardList", yardList); 157 model.addAttribute("yardList", yardList);
162 model.addAttribute("landBusinesstypeList", landBusinesstypeList); 158 model.addAttribute("landBusinesstypeList", landBusinesstypeList);
@@ -173,13 +169,24 @@ public class LandBusinesstypeListController extends BaseController { @@ -173,13 +169,24 @@ public class LandBusinesstypeListController extends BaseController {
173 landBusinesstypeList.setIsvalid("0"); 169 landBusinesstypeList.setIsvalid("0");
174 if(landBusinesstypeList.getId().length()>0) { 170 if(landBusinesstypeList.getId().length()>0) {
175 String masterList = landBusinesstypeList.getMasterList(); 171 String masterList = landBusinesstypeList.getMasterList();
176 - System.out.println(masterList);  
177 insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),masterList); 172 insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),masterList);
  173 + landBusinesstypeListService.save(landBusinesstypeList);
178 List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode()); 174 List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
179 for (int i = 0; i < list.size(); i++) { 175 for (int i = 0; i < list.size(); i++) {
180 - if(list.get(i).getMasterList().length()>0) {  
181 - list.get(i).setMasterList(masterList);  
182 - landBusinesstypeListService.save(list.get(i)); 176 + if(list.get(i).getBusinesstype().endsWith("流转")) {
  177 + if(list.get(i).getMasterList().length()>0) {
  178 + if(list.get(i).getContrastflag()==null) {
  179 + list.get(i).setMasterList(masterList);
  180 + // list.get(i).setBusinesstype(landBusinesstypeList.getBusinesstype());
  181 + landBusinesstypeListService.save(list.get(i));
  182 + }
  183 + }else {
  184 + if("I".equals(list.get(i).getTurnoverflag())) {
  185 + list.get(i).setMasterList(masterList);
  186 + // list.get(i).setBusinesstype(landBusinesstypeList.getBusinesstype());
  187 + landBusinesstypeListService.save(list.get(i));
  188 + }
  189 + }
183 } 190 }
184 } 191 }
185 }else{ 192 }else{
@@ -229,13 +236,10 @@ public class LandBusinesstypeListController extends BaseController { @@ -229,13 +236,10 @@ public class LandBusinesstypeListController extends BaseController {
229 String messageId = LandBusinesstypeListController.dateTimeFormat(); 236 String messageId = LandBusinesstypeListController.dateTimeFormat();
230 String mainfistList = landBusinesstypeList.getMasterList(); 237 String mainfistList = landBusinesstypeList.getMasterList();
231 String startport = landBusinesstypeList.getStartport(); 238 String startport = landBusinesstypeList.getStartport();
232 - System.out.println("startport:"+startport);  
233 String endport = landBusinesstypeList.getEndport(); 239 String endport = landBusinesstypeList.getEndport();
234 - System.out.println("endport:"+endport);  
235 String startStation = landBusinesstypeList.getStartsatation(); 240 String startStation = landBusinesstypeList.getStartsatation();
236 - System.out.println("startStation:"+startStation);  
237 String endStation = landBusinesstypeList.getEndstation(); 241 String endStation = landBusinesstypeList.getEndstation();
238 - System.out.println("endStation:"+endStation); 242 + String isfull = landBusinesstypeList.getIsfull();
239 landBusinesstypeList.setMassageId(messageId); 243 landBusinesstypeList.setMassageId(messageId);
240 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId); 244 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
241 landBusinesstypeList.setStartport(""); 245 landBusinesstypeList.setStartport("");
@@ -244,6 +248,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -244,6 +248,7 @@ public class LandBusinesstypeListController extends BaseController {
244 landBusinesstypeList.setEndstation(startStation); 248 landBusinesstypeList.setEndstation(startStation);
245 landBusinesstypeList.setBarcode(barCode); 249 landBusinesstypeList.setBarcode(barCode);
246 landBusinesstypeList.setMasterList(""); 250 landBusinesstypeList.setMasterList("");
  251 + landBusinesstypeList.setProdectTime(new Date());
247 landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel()); 252 landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel());
248 landBusinesstypeListService.save(landBusinesstypeList); 253 landBusinesstypeListService.save(landBusinesstypeList);
249 insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList); 254 insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList);
@@ -255,6 +260,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -255,6 +260,7 @@ public class LandBusinesstypeListController extends BaseController {
255 list.setBarcode(barCode); 260 list.setBarcode(barCode);
256 list.setIsDelete("0"); 261 list.setIsDelete("0");
257 list.setIsvalid("0"); 262 list.setIsvalid("0");
  263 + list.setIsfull(isfull);
258 list.setBusinesstype(landBusinesstypeList.getBusinesstype()); 264 list.setBusinesstype(landBusinesstypeList.getBusinesstype());
259 list.setCocode(landBusinesstypeList.getCocode()); 265 list.setCocode(landBusinesstypeList.getCocode());
260 list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo()); 266 list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
@@ -275,6 +281,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -275,6 +281,7 @@ public class LandBusinesstypeListController extends BaseController {
275 list1.setAgentno(landBusinesstypeList.getAgentno()); 281 list1.setAgentno(landBusinesstypeList.getAgentno());
276 list1.setIsDelete("0"); 282 list1.setIsDelete("0");
277 list1.setIsvalid("0"); 283 list1.setIsvalid("0");
  284 + list1.setIsfull(isfull);
278 list1.setBarcode(barCode); 285 list1.setBarcode(barCode);
279 list1.setBusinesstype(landBusinesstypeList.getBusinesstype()); 286 list1.setBusinesstype(landBusinesstypeList.getBusinesstype());
280 list1.setCocode(landBusinesstypeList.getCocode()); 287 list1.setCocode(landBusinesstypeList.getCocode());
@@ -299,13 +306,14 @@ public class LandBusinesstypeListController extends BaseController { @@ -299,13 +306,14 @@ public class LandBusinesstypeListController extends BaseController {
299 list2.setBarcode(barCode); 306 list2.setBarcode(barCode);
300 list2.setIsDelete("0"); 307 list2.setIsDelete("0");
301 list2.setIsvalid("0"); 308 list2.setIsvalid("0");
  309 + list2.setIsfull(isfull);
302 list2.setBusinesstype(landBusinesstypeList.getBusinesstype()); 310 list2.setBusinesstype(landBusinesstypeList.getBusinesstype());
303 list2.setCocode(landBusinesstypeList.getCocode()); 311 list2.setCocode(landBusinesstypeList.getCocode());
304 list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo()); 312 list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
305 list2.setStartport(""); 313 list2.setStartport("");
306 list2.setStartsatation(""); 314 list2.setStartsatation("");
307 - list1.setStartport(startport);  
308 - list1.setStartsatation(startStation); 315 + list2.setStartport(startport);
  316 + list2.setStartsatation(startStation);
309 list2.setEndport(endport); 317 list2.setEndport(endport);
310 list2.setEndstation(endStation); 318 list2.setEndstation(endStation);
311 list2.setProdectTime(new Date()); 319 list2.setProdectTime(new Date());
@@ -323,7 +331,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -323,7 +331,7 @@ public class LandBusinesstypeListController extends BaseController {
323 //first entry 331 //first entry
324 String messageId = dateTimeFormat(); 332 String messageId = dateTimeFormat();
325 String mainfistList = landBusinesstypeList.getMasterList(); 333 String mainfistList = landBusinesstypeList.getMasterList();
326 - System.out.println(mainfistList); 334 + String isfull = landBusinesstypeList.getIsfull();
327 landBusinesstypeList.setMassageId(messageId); 335 landBusinesstypeList.setMassageId(messageId);
328 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId); 336 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
329 landBusinesstypeList.setBarcode(barCode); 337 landBusinesstypeList.setBarcode(barCode);
@@ -337,6 +345,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -337,6 +345,7 @@ public class LandBusinesstypeListController extends BaseController {
337 list.setIsDelete("0"); 345 list.setIsDelete("0");
338 list.setIsvalid("0"); 346 list.setIsvalid("0");
339 list.setBarcode(barCode); 347 list.setBarcode(barCode);
  348 + list.setIsfull(isfull);
340 list.setBusinesstype(landBusinesstypeList.getBusinesstype()); 349 list.setBusinesstype(landBusinesstypeList.getBusinesstype());
341 list.setCocode(landBusinesstypeList.getCocode()); 350 list.setCocode(landBusinesstypeList.getCocode());
342 list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo()); 351 list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
@@ -361,7 +370,8 @@ public class LandBusinesstypeListController extends BaseController { @@ -361,7 +370,8 @@ public class LandBusinesstypeListController extends BaseController {
361 landBusinesstypeList.setMassageId(messageId); 370 landBusinesstypeList.setMassageId(messageId);
362 String mainfistList = landBusinesstypeList.getMasterList(); 371 String mainfistList = landBusinesstypeList.getMasterList();
363 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId); 372 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
364 -// String barCode = messageId; 373 + //String barCode = messageId;
  374 + String isfull = landBusinesstypeList.getIsfull();
365 landBusinesstypeList.setBarcode(barCode); 375 landBusinesstypeList.setBarcode(barCode);
366 landBusinesstypeListService.save(landBusinesstypeList); 376 landBusinesstypeListService.save(landBusinesstypeList);
367 insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList); 377 insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList);
@@ -371,6 +381,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -371,6 +381,7 @@ public class LandBusinesstypeListController extends BaseController {
371 list.setAgentno(landBusinesstypeList.getAgentno()); 381 list.setAgentno(landBusinesstypeList.getAgentno());
372 list.setIsDelete("0"); 382 list.setIsDelete("0");
373 list.setIsvalid("0"); 383 list.setIsvalid("0");
  384 + list.setIsfull(isfull);
374 list.setBarcode(barCode); 385 list.setBarcode(barCode);
375 list.setBusinesstype(landBusinesstypeList.getBusinesstype()); 386 list.setBusinesstype(landBusinesstypeList.getBusinesstype());
376 list.setCocode(landBusinesstypeList.getCocode()); 387 list.setCocode(landBusinesstypeList.getCocode());
@@ -396,15 +407,27 @@ public class LandBusinesstypeListController extends BaseController { @@ -396,15 +407,27 @@ public class LandBusinesstypeListController extends BaseController {
396 } 407 }
397 408
398 public void insertVm(String id ,String frameNo,String mainfistList) { 409 public void insertVm(String id ,String frameNo,String mainfistList) {
399 - veMainService.deleteById(id); 410 +
  411 + List<VehicleMainifist> vmList = veMainService.selectByBueId(id);
  412 +
400 if(mainfistList.length()>0) { 413 if(mainfistList.length()>0) {
401 - String[] list = mainfistList.split(",");  
402 - for (int i = 0; i < list.length; i++) {  
403 - VehicleMainifist vehicleMainifist = new VehicleMainifist();  
404 - vehicleMainifist.setBusinessId(id);  
405 - vehicleMainifist.setBusinessNum(frameNo);  
406 - vehicleMainifist.setMainifist(list[i]);  
407 - veMainService.save(vehicleMainifist); 414 + String[] list = mainfistList.replace("，", ",").split(",");
  415 + if(vmList.size()>list.length) {
  416 + for (int j = 0; j < vmList.size(); j++) {
  417 + for (int i = 0; i < list.length; i++) {
  418 + if(vmList.get(j).getMainifist() != list[i]) {
  419 + veMainService.deleteEntry(vmList.get(j));
  420 + }
  421 + VehicleMainifist vm = veMainService.selectByVm(id,list[i]);
  422 + if(vm==null) {
  423 + VehicleMainifist vehicleMainifist = new VehicleMainifist();
  424 + vehicleMainifist.setBusinessId(id);
  425 + vehicleMainifist.setBusinessNum(frameNo);
  426 + vehicleMainifist.setMainifist(list[i]);
  427 + veMainService.save(vehicleMainifist);
  428 + }
  429 + }
  430 + }
408 } 431 }
409 } 432 }
410 } 433 }
@@ -20,4 +20,5 @@ import com.thinkgem.jeesite.modules.yard.entity.Bayonet; @@ -20,4 +20,5 @@ import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
20 public interface BayonetDao extends CrudDao<Bayonet> { 20 public interface BayonetDao extends CrudDao<Bayonet> {
21 List<Bayonet> findByYardId(@Param("yardId")String yardId); 21 List<Bayonet> findByYardId(@Param("yardId")String yardId);
22 Bayonet findByYardAndName(@Param("yardId")String yardId,@Param("name")String Name); 22 Bayonet findByYardAndName(@Param("yardId")String yardId,@Param("name")String Name);
  23 + int update(Bayonet bayonet);
23 } 24 }
@@ -69,5 +69,12 @@ public class Bayonet extends DataEntity<Bayonet> { @@ -69,5 +69,12 @@ public class Bayonet extends DataEntity<Bayonet> {
69 public void setYard(Yard yard) { 69 public void setYard(Yard yard) {
70 this.yard = yard; 70 this.yard = yard;
71 } 71 }
  72 +
  73 + @Override
  74 + public String toString() {
  75 + return "Bayonet [yard=" + yard + ", yardId=" + yardId + ", name=" + name + ", channel=" + channel + "]";
  76 + }
  77 +
  78 +
72 79
73 } 80 }
@@ -3,16 +3,15 @@ @@ -3,16 +3,15 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.yard.service; 4 package com.thinkgem.jeesite.modules.yard.service;
5 5
6 -import java.util.List;  
7 - 6 +import com.thinkgem.jeesite.common.persistence.Page;
  7 +import com.thinkgem.jeesite.common.service.CrudService;
  8 +import com.thinkgem.jeesite.modules.yard.dao.BayonetDao;
  9 +import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
8 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
9 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
10 import org.springframework.transaction.annotation.Transactional; 12 import org.springframework.transaction.annotation.Transactional;
11 13
12 -import com.thinkgem.jeesite.common.persistence.Page;  
13 -import com.thinkgem.jeesite.common.service.CrudService;  
14 -import com.thinkgem.jeesite.modules.yard.entity.Bayonet;  
15 -import com.thinkgem.jeesite.modules.yard.dao.BayonetDao; 14 +import java.util.List;
16 15
17 /** 16 /**
18 * 卡口管理Service 17 * 卡口管理Service
@@ -34,8 +33,6 @@ public class BayonetService extends CrudService<BayonetDao, Bayonet> { @@ -34,8 +33,6 @@ public class BayonetService extends CrudService<BayonetDao, Bayonet> {
34 return super.findList(bayonet); 33 return super.findList(bayonet);
35 } 34 }
36 35
37 -  
38 -  
39 public Page<Bayonet> findPage(Page<Bayonet> page, Bayonet bayonet) { 36 public Page<Bayonet> findPage(Page<Bayonet> page, Bayonet bayonet) {
40 return super.findPage(page, bayonet); 37 return super.findPage(page, bayonet);
41 } 38 }
@@ -49,7 +46,10 @@ public class BayonetService extends CrudService<BayonetDao, Bayonet> { @@ -49,7 +46,10 @@ public class BayonetService extends CrudService<BayonetDao, Bayonet> {
49 public void delete(Bayonet bayonet) { 46 public void delete(Bayonet bayonet) {
50 super.delete(bayonet); 47 super.delete(bayonet);
51 } 48 }
52 - 49 + @Transactional(readOnly = false)
  50 + public void update(Bayonet bayonet){
  51 + dao.update(bayonet);
  52 + }
53 @Transactional(readOnly = false) 53 @Transactional(readOnly = false)
54 public List<Bayonet> findByYardId(String yardId) { 54 public List<Bayonet> findByYardId(String yardId) {
55 return dao.findByYardId(yardId); 55 return dao.findByYardId(yardId);
@@ -3,11 +3,14 @@ @@ -3,11 +3,14 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.yard.web; 4 package com.thinkgem.jeesite.modules.yard.web;
5 5
6 -import java.util.List;  
7 -  
8 -import javax.servlet.http.HttpServletRequest;  
9 -import javax.servlet.http.HttpServletResponse;  
10 - 6 +import com.thinkgem.jeesite.common.config.Global;
  7 +import com.thinkgem.jeesite.common.persistence.Page;
  8 +import com.thinkgem.jeesite.common.utils.StringUtils;
  9 +import com.thinkgem.jeesite.common.web.BaseController;
  10 +import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
  11 +import com.thinkgem.jeesite.modules.yard.entity.Yard;
  12 +import com.thinkgem.jeesite.modules.yard.service.BayonetService;
  13 +import com.thinkgem.jeesite.modules.yard.service.YardService;
11 import org.apache.shiro.authz.annotation.RequiresPermissions; 14 import org.apache.shiro.authz.annotation.RequiresPermissions;
12 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Controller; 16 import org.springframework.stereotype.Controller;
@@ -17,14 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping; @@ -17,14 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
17 import org.springframework.web.bind.annotation.RequestParam; 20 import org.springframework.web.bind.annotation.RequestParam;
18 import org.springframework.web.servlet.mvc.support.RedirectAttributes; 21 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
19 22
20 -import com.thinkgem.jeesite.common.config.Global;  
21 -import com.thinkgem.jeesite.common.persistence.Page;  
22 -import com.thinkgem.jeesite.common.web.BaseController;  
23 -import com.thinkgem.jeesite.common.utils.StringUtils;  
24 -import com.thinkgem.jeesite.modules.yard.entity.Bayonet;  
25 -import com.thinkgem.jeesite.modules.yard.entity.Yard;  
26 -import com.thinkgem.jeesite.modules.yard.service.BayonetService;  
27 -import com.thinkgem.jeesite.modules.yard.service.YardService; 23 +import javax.servlet.http.HttpServletRequest;
  24 +import javax.servlet.http.HttpServletResponse;
  25 +import java.util.List;
28 26
29 /** 27 /**
30 * 卡口管理Controller 28 * 卡口管理Controller
@@ -66,7 +64,6 @@ public class BayonetController extends BaseController { @@ -66,7 +64,6 @@ public class BayonetController extends BaseController {
66 public String form(Bayonet bayonet, Model model) { 64 public String form(Bayonet bayonet, Model model) {
67 Yard yard = new Yard(); 65 Yard yard = new Yard();
68 List<Yard> yardList = yardService.findList(yard); 66 List<Yard> yardList = yardService.findList(yard);
69 - System.out.println(yardList);  
70 model.addAttribute("yardList", yardList); 67 model.addAttribute("yardList", yardList);
71 model.addAttribute("bayonet", bayonet); 68 model.addAttribute("bayonet", bayonet);
72 return "modules/yard/bayonetForm"; 69 return "modules/yard/bayonetForm";
@@ -78,7 +75,11 @@ public class BayonetController extends BaseController { @@ -78,7 +75,11 @@ public class BayonetController extends BaseController {
78 if (!beanValidator(model, bayonet)){ 75 if (!beanValidator(model, bayonet)){
79 return form(bayonet, model); 76 return form(bayonet, model);
80 } 77 }
81 - bayonetService.save(bayonet); 78 + if (bayonet.getId().length()>0) {
  79 + bayonetService.update(bayonet);
  80 + }else {
  81 + bayonetService.save(bayonet);
  82 + }
82 addMessage(redirectAttributes, "保存卡口成功"); 83 addMessage(redirectAttributes, "保存卡口成功");
83 return "redirect:"+Global.getAdminPath()+"/yard/bayonet/?repage"; 84 return "redirect:"+Global.getAdminPath()+"/yard/bayonet/?repage";
84 } 85 }
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 #mysql database setting 12 #mysql database setting
13 jdbc.type=mysql 13 jdbc.type=mysql
14 jdbc.driver=com.mysql.cj.jdbc.Driver 14 jdbc.driver=com.mysql.cj.jdbc.Driver
15 -jdbc.url=jdbc:mysql://10.50.7.70:3306/station?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true 15 +jdbc.url=jdbc:mysql://10.50.7.70:3306/station?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
16 jdbc.username=station 16 jdbc.username=station
17 jdbc.password=station@10.50.7.70 17 jdbc.password=station@10.50.7.70
18 18
1 <?xml version="1.0" encoding="UTF-8" ?> 1 <?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao"> 3 <mapper namespace="com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao">
4 - <sql id="landBusinesstypeListColumns">  
5 - a.massage_id AS "massageId", 4 +
  5 + <sql id="landBusinesstypeListColumns">
6 a.id AS "id", 6 a.id AS "id",
  7 + a.massage_id AS "massageId",
7 a.trailer_frame_no AS "trailerFrameNo", 8 a.trailer_frame_no AS "trailerFrameNo",
8 a.trailer_license_no AS "trailerLicenseNo", 9 a.trailer_license_no AS "trailerLicenseNo",
9 a.master_list AS "masterList", 10 a.master_list AS "masterList",
10 a.prodect_time AS "prodectTime", 11 a.prodect_time AS "prodectTime",
11 - a.agentno AS "agentno",  
12 a.is_delete AS "isDelete", 12 a.is_delete AS "isDelete",
  13 + a.agentno AS "agentno",
13 a.agentname AS "agentname", 14 a.agentname AS "agentname",
14 a.cocode AS "cocode", 15 a.cocode AS "cocode",
15 a.drivername AS "drivername", 16 a.drivername AS "drivername",
@@ -21,13 +22,18 @@ @@ -21,13 +22,18 @@
21 a.aisle AS "aisle", 22 a.aisle AS "aisle",
22 a.businesstype AS "businesstype", 23 a.businesstype AS "businesstype",
23 a.turnoverflag AS "turnoverflag", 24 a.turnoverflag AS "turnoverflag",
24 - a.contrastflag AS "contrastflag",  
25 a.barcode AS "barcode", 25 a.barcode AS "barcode",
  26 + a.contrastflag AS "contrastflag",
26 a.create_by AS "createBy.id", 27 a.create_by AS "createBy.id",
27 a.create_date AS "createDate", 28 a.create_date AS "createDate",
28 a.update_by AS "updateBy.id", 29 a.update_by AS "updateBy.id",
29 a.update_date AS "updateDate", 30 a.update_date AS "updateDate",
30 - a.isvalid AS "isvalid" 31 + a.isvalid AS "isvalid",
  32 + a.aislewt AS "aislewt",
  33 + a.isfull AS "isfull",
  34 + a.remark AS "remark",
  35 + a.remark1 AS "remark1",
  36 + a.remark2 AS "remark2"
31 </sql> 37 </sql>
32 38
33 <sql id="landBusinesstypeListJoins"> 39 <sql id="landBusinesstypeListJoins">
@@ -40,37 +46,13 @@ @@ -40,37 +46,13 @@
40 <include refid="landBusinesstypeListJoins"/> 46 <include refid="landBusinesstypeListJoins"/>
41 WHERE a.id = #{id} 47 WHERE a.id = #{id}
42 </select> 48 </select>
43 -  
44 - <select id="findList" resultType="LandBusinesstypeList">  
45 - SELECT  
46 - <include refid="landBusinesstypeListColumns"/>  
47 - FROM land_businesstype_list a  
48 - <include refid="landBusinesstypeListJoins"/>  
49 - <where>  
50 - a.is_delete = "0"  
51 - <if test="trailerFrameNo !=null and trailerFrameNo !=''">  
52 - and trailer_frame_no = #{trailerFrameNo}  
53 - </if>  
54 - <if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>  
55 - and create_by = #{createBy.id}  
56 - </if>  
57 -  
58 - </where>  
59 - <choose>  
60 - <when test="page !=null and page.orderBy != null and page.orderBy != ''">  
61 - ORDER BY ${page.orderBy}  
62 - </when>  
63 - <otherwise>  
64 - ORDER BY a.create_date DESC  
65 - </otherwise>  
66 - </choose>  
67 - </select> 49 +
68 <select id="findByStatus" resultType="LandBusinesstypeList"> 50 <select id="findByStatus" resultType="LandBusinesstypeList">
69 SELECT 51 SELECT
70 <include refid="landBusinesstypeListColumns"/> 52 <include refid="landBusinesstypeListColumns"/>
71 FROM land_businesstype_list a 53 FROM land_businesstype_list a
72 <include refid="landBusinesstypeListJoins"/> 54 <include refid="landBusinesstypeListJoins"/>
73 - where a.is_delete = "0" 55 + where a.is_delete = "0"
74 <if test="trailerFrameNo !=null and trailerFrameNo !=''"> 56 <if test="trailerFrameNo !=null and trailerFrameNo !=''">
75 and trailer_frame_no = #{trailerFrameNo} 57 and trailer_frame_no = #{trailerFrameNo}
76 </if> 58 </if>
@@ -88,6 +70,24 @@ @@ -88,6 +70,24 @@
88 order by a.create_date DESC 70 order by a.create_date DESC
89 </select> 71 </select>
90 72
  73 + <select id="findList" resultType="LandBusinesstypeList">
  74 + SELECT
  75 + <include refid="landBusinesstypeListColumns"/>
  76 + FROM land_businesstype_list a
  77 + <include refid="landBusinesstypeListJoins"/>
  78 + <where>
  79 + a.is_delete = "0"
  80 + </where>
  81 + <choose>
  82 + <when test="page !=null and page.orderBy != null and page.orderBy != ''">
  83 + ORDER BY ${page.orderBy}
  84 + </when>
  85 + <otherwise>
  86 + ORDER BY a.update_date DESC
  87 + </otherwise>
  88 + </choose>
  89 + </select>
  90 +
91 <select id="findAllList" resultType="LandBusinesstypeList"> 91 <select id="findAllList" resultType="LandBusinesstypeList">
92 SELECT 92 SELECT
93 <include refid="landBusinesstypeListColumns"/> 93 <include refid="landBusinesstypeListColumns"/>
@@ -110,17 +110,17 @@ @@ -110,17 +110,17 @@
110 UPDATE land_businesstype_list set is_delete = "1",isvalid = "1" 110 UPDATE land_businesstype_list set is_delete = "1",isvalid = "1"
111 WHERE barcode = #{barcode} 111 WHERE barcode = #{barcode}
112 </update> 112 </update>
113 - 113 +
114 <insert id="insert"> 114 <insert id="insert">
115 INSERT INTO land_businesstype_list( 115 INSERT INTO land_businesstype_list(
116 - massage_id,  
117 id, 116 id,
  117 + massage_id,
118 trailer_frame_no, 118 trailer_frame_no,
119 trailer_license_no, 119 trailer_license_no,
120 master_list, 120 master_list,
121 prodect_time, 121 prodect_time,
122 - agentno,  
123 is_delete, 122 is_delete,
  123 + agentno,
124 agentname, 124 agentname,
125 cocode, 125 cocode,
126 drivername, 126 drivername,
@@ -132,22 +132,27 @@ @@ -132,22 +132,27 @@
132 aisle, 132 aisle,
133 businesstype, 133 businesstype,
134 turnoverflag, 134 turnoverflag,
135 - contrastflag,  
136 barcode, 135 barcode,
  136 + contrastflag,
137 create_by, 137 create_by,
138 create_date, 138 create_date,
139 update_by, 139 update_by,
140 update_date, 140 update_date,
141 - isvalid 141 + isvalid,
  142 + aislewt,
  143 + isfull,
  144 + remark,
  145 + remark1,
  146 + remark2
142 ) VALUES ( 147 ) VALUES (
143 - #{massageId},  
144 #{id}, 148 #{id},
  149 + #{massageId},
145 #{trailerFrameNo}, 150 #{trailerFrameNo},
146 #{trailerLicenseNo}, 151 #{trailerLicenseNo},
147 #{masterList}, 152 #{masterList},
148 #{prodectTime}, 153 #{prodectTime},
149 - #{agentno},  
150 #{isDelete}, 154 #{isDelete},
  155 + #{agentno},
151 #{agentname}, 156 #{agentname},
152 #{cocode}, 157 #{cocode},
153 #{drivername}, 158 #{drivername},
@@ -159,13 +164,18 @@ @@ -159,13 +164,18 @@
159 #{aisle}, 164 #{aisle},
160 #{businesstype}, 165 #{businesstype},
161 #{turnoverflag}, 166 #{turnoverflag},
162 - #{contrastflag},  
163 #{barcode}, 167 #{barcode},
  168 + #{contrastflag},
164 #{createBy.id}, 169 #{createBy.id},
165 #{createDate}, 170 #{createDate},
166 #{updateBy.id}, 171 #{updateBy.id},
167 #{updateDate}, 172 #{updateDate},
168 - #{isvalid} 173 + #{isvalid},
  174 + #{aislewt},
  175 + #{isfull},
  176 + #{remark},
  177 + #{remark1},
  178 + #{remark2}
169 ) 179 )
170 </insert> 180 </insert>
171 181
@@ -176,8 +186,8 @@ @@ -176,8 +186,8 @@
176 trailer_license_no = #{trailerLicenseNo}, 186 trailer_license_no = #{trailerLicenseNo},
177 master_list = #{masterList}, 187 master_list = #{masterList},
178 prodect_time = #{prodectTime}, 188 prodect_time = #{prodectTime},
179 - agentno = #{agentno},  
180 is_delete = #{isDelete}, 189 is_delete = #{isDelete},
  190 + agentno = #{agentno},
181 agentname = #{agentname}, 191 agentname = #{agentname},
182 cocode = #{cocode}, 192 cocode = #{cocode},
183 drivername = #{drivername}, 193 drivername = #{drivername},
@@ -189,11 +199,16 @@ @@ -189,11 +199,16 @@
189 aisle = #{aisle}, 199 aisle = #{aisle},
190 businesstype = #{businesstype}, 200 businesstype = #{businesstype},
191 turnoverflag = #{turnoverflag}, 201 turnoverflag = #{turnoverflag},
192 - contrastflag = #{contrastflag},  
193 barcode = #{barcode}, 202 barcode = #{barcode},
  203 + contrastflag = #{contrastflag},
194 update_by = #{updateBy.id}, 204 update_by = #{updateBy.id},
195 update_date = #{updateDate}, 205 update_date = #{updateDate},
196 - isvalid = #{isvalid} 206 + isvalid = #{isvalid},
  207 + aislewt = #{aislewt},
  208 + isfull = #{isfull},
  209 + remark = #{remark},
  210 + remark1 = #{remark1},
  211 + remark2 = #{remark2}
197 WHERE id = #{id} 212 WHERE id = #{id}
198 </update> 213 </update>
199 214
@@ -201,5 +216,5 @@ @@ -201,5 +216,5 @@
201 DELETE FROM land_businesstype_list 216 DELETE FROM land_businesstype_list
202 WHERE id = #{id} 217 WHERE id = #{id}
203 </update> 218 </update>
204 - 219 +
205 </mapper> 220 </mapper>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 4
5 <sql id="bayonetColumns"> 5 <sql id="bayonetColumns">
6 a.*, 6 a.*,
7 - b.id AS "yard.id", 7 + b.stationid AS "yard.id",
8 b.name AS "yard.name", 8 b.name AS "yard.name",
9 b.customs_code AS "yard.customsCode" 9 b.customs_code AS "yard.customsCode"
10 </sql> 10 </sql>
@@ -99,32 +99,56 @@ th, td { @@ -99,32 +99,56 @@ th, td {
99 <form:hidden path="id" /> 99 <form:hidden path="id" />
100 <sys:message content="${message}" /> 100 <sys:message content="${message}" />
101 <div class="control-group"> 101 <div class="control-group">
102 - <label class="control-label">车牌号：</label>  
103 - <div class="controls">  
104 - <form:select path="trailerFrameNo" htmlEscape="false" maxlength="64" class="input-xlarge required" id="frameNo" >  
105 - <form:option value="" label="--请选择--" />  
106 - <form:options items="${veList}" itemLabel="domesticLisenceNo" itemValue="domesticLisenceNo" htmlEscape="false" />  
107 - </form:select>  
108 - <span class="help-inline"><font color="red">*</font></span>  
109 - <span class="help-inline" id="message" style="color: red"></span>  
110 - </div>  
111 - </div>  
112 -  
113 - <div class="control-group">  
114 - <label class="control-label">申请时间：</label>  
115 - <div class="controls">  
116 - <input name="prodectTime" type="text" readonly="readonly"  
117 - maxlength="20" class="input-xlarge Wdate "  
118 - value="<fmt:formatDate value="${landBusinesstypeList.prodectTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"  
119 - onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" /> 102 + <div class="row-fluid">
  103 + <div class="span12">
  104 + <div class="span6">
  105 + <label class="control-label">车牌号：</label>
  106 + <div class="controls">
  107 + <form:select path="trailerFrameNo" htmlEscape="false" maxlength="64" class="input-xlarge required" id="frameNo" >
  108 + <form:option value="" label="--请选择--" />
  109 + <form:options items="${veList}" itemLabel="domesticLisenceNo" itemValue="domesticLisenceNo" htmlEscape="false" />
  110 + </form:select>
  111 + <span class="help-inline"><font color="red">*</font></span>
  112 + <span class="help-inline" id="message" style="color: red"></span>
  113 + </div>
  114 + </div>
  115 + <div class="span6">
  116 + <label class="control-label">业务类型：</label>
  117 + <div class="controls">
  118 + <form:select path="businesstype" class="input-xlarge required" id="ieType">
  119 + <form:option value="" label="--请选择--" />
  120 + <form:option value="进口提货" label="进口提货" />
  121 + <form:option value="出口送货" label="出口送货" />
  122 + <form:option value="进口流转" label="进口流转" />
  123 + <form:option value="出口流转" label="出口流转" />
  124 + </form:select>
  125 + </div>
  126 + </div>
  127 + </div>
  128 +
120 </div> 129 </div>
121 </div> 130 </div>
122 <div class="control-group"> 131 <div class="control-group">
123 - <label class="control-label">所在企业代码：</label>  
124 - <div class="controls">  
125 - <form:input path="cocode" htmlEscape="false" maxlength="32"  
126 - class="input-xlarge " id="cocode" />  
127 - <span class="help-inline"><font color="red">*</font></span> 132 + <div class="row-fluid">
  133 + <div class="span12">
  134 + <div class="span6">
  135 + <label class="control-label">申请时间：</label>
  136 + <div class="controls">
  137 + <input name="prodectTime" type="text" readonly="readonly"
  138 + maxlength="20" class="input-xlarge Wdate "
  139 + value="<fmt:formatDate value="${landBusinesstypeList.prodectTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
  140 + onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
  141 + </div>
  142 + </div>
  143 + <div class="span6">
  144 + <%-- <label class="control-label">所在企业代码：</label>
  145 + <div class="controls">
  146 + <form:input path="cocode" htmlEscape="false" maxlength="32"
  147 + class="input-xlarge " id="cocode" />
  148 + <span class="help-inline"><font color="red">*</font></span>
  149 + </div> --%>
  150 + </div>
  151 + </div>
128 </div> 152 </div>
129 </div> 153 </div>
130 <div class="control-group"> 154 <div class="control-group">
@@ -239,29 +263,27 @@ th, td { @@ -239,29 +263,27 @@ th, td {
239 </div> 263 </div>
240 </div> 264 </div>
241 <div class="span6"> 265 <div class="span6">
242 - <label class="control-label">业务类型：</label> 266 + <label class="control-label">进出场：</label>
243 <div class="controls"> 267 <div class="controls">
244 - <form:select path="businesstype" class="input-xlarge" id="ieType"> 268 + <form:select path="turnoverflag" class="input-xlarge">
245 <form:option value="" label="--请选择--" /> 269 <form:option value="" label="--请选择--" />
246 - <form:option value="进口提货" label="进口提货" />  
247 - <form:option value="出口送货" label="出口送货" />  
248 - <form:option value="进口流转" label="进口流转" />  
249 - <form:option value="出口流转" label="出口流转" /> 270 + <form:option value="I" label="进场站" selected = "selected"/>
  271 + <form:option value="E" label="出场站"/>
250 </form:select> 272 </form:select>
  273 + <span class="help-inline"><font color="red">无需改动</font></span>
251 </div> 274 </div>
252 </div> 275 </div>
253 </div> 276 </div>
254 </div> 277 </div>
255 </div> 278 </div>
256 <div class="control-group"> 279 <div class="control-group">
257 - <label class="control-label">进出场：</label> 280 + <label class="control-label">是否空车：</label>
258 <div class="controls"> 281 <div class="controls">
259 - <form:select path="turnoverflag" class="input-xlarge"> 282 + <form:select path="isfull" class="input-xlarge">
260 <form:option value="" label="--请选择--" /> 283 <form:option value="" label="--请选择--" />
261 - <form:option value="I" label="进场站" selected = "selected"/>  
262 - <form:option value="E" label="出场站"/> 284 + <form:option value="0" label="是" selected = "selected"/>
  285 + <form:option value="1" label="否"/>
263 </form:select> 286 </form:select>
264 - <span class="help-inline"><font color="red">无需改动</font></span>  
265 </div> 287 </div>
266 </div> 288 </div>
267 <div class="control-group"> 289 <div class="control-group">
@@ -306,18 +328,16 @@ th, td { @@ -306,18 +328,16 @@ th, td {
306 var index = data.html.lastIndexOf(">"); 328 var index = data.html.lastIndexOf(">");
307 var str = data.html.substring(index + 1, data.html.length); 329 var str = data.html.substring(index + 1, data.html.length);
308 if(data.list !=undefined){ 330 if(data.list !=undefined){
309 - $("#agentName").val(data.list[0].agentname)  
310 - $("#agentno").val(data.list[0].agentno)  
311 - $("#driverid").val(data.list[0].driverid)  
312 - $("#drivername").val(data.list[0].drivername)  
313 - $("#cocode").val(data.list[0].coCode) 331 + $("#agentName").val(data.list[0].proposer)
  332 + $("#agentno").val(data.list[0].coCode)
  333 + $("#driverid").val(data.list[0].veOwnerNo)
  334 + $("#drivername").val(data.list[0].veOwnerName)
314 } 335 }
315 if(data.list ==undefined){ 336 if(data.list ==undefined){
316 $("#agentName").val(""); 337 $("#agentName").val("");
317 $("#agentno").val(""); 338 $("#agentno").val("");
318 $("#driverid").val(""); 339 $("#driverid").val("");
319 $("#drivername").val(""); 340 $("#drivername").val("");
320 - $("#cocode").val("");  
321 } 341 }
322 $("#message").html(str); 342 $("#message").html(str);
323 }, 343 },
@@ -362,7 +382,7 @@ th, td { @@ -362,7 +382,7 @@ th, td {
362 if(str%7 != endStr){ 382 if(str%7 != endStr){
363 $(".error_div").css("display","block"); 383 $(".error_div").css("display","block");
364 $("#error_p").html("输入主单号不符合模七校验"); 384 $("#error_p").html("输入主单号不符合模七校验");
365 - $("#putMaster").val(" "); 385 + //$("#putMaster").val(" ");
366 } 386 }
367 }) 387 })
368 $("#select").click(function(){ 388 $("#select").click(function(){
@@ -374,7 +394,8 @@ th, td { @@ -374,7 +394,8 @@ th, td {
374 }else if(ieType=="出口送货" | ieType=="出口流转"){ 394 }else if(ieType=="出口送货" | ieType=="出口流转"){
375 ieType="E"; 395 ieType="E";
376 } 396 }
377 - var url = 'http://tjfx.15miaoo.com:8003/tj/orig/orig'; 397 + var url = "http://tjfx.15miaoo.com:8003/tj/orig/orig";
  398 + //var url = "http://10.50.3.64:8080/tj/orig/orig";
378 var xhr = new XMLHttpRequest(); 399 var xhr = new XMLHttpRequest();
379 // 访问nginx中的代理服务器 400 // 访问nginx中的代理服务器
380 xhr.open('get', url+'?waybill='+masterNum+'&imp='+ieType, true); 401 xhr.open('get', url+'?waybill='+masterNum+'&imp='+ieType, true);
@@ -409,7 +430,6 @@ th, td { @@ -409,7 +430,6 @@ th, td {
409 } 430 }
410 } 431 }
411 } 432 }
412 -  
413 }) 433 })
414 434
415 function addData(btn){ 435 function addData(btn){
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 <th>业务类型</th> 48 <th>业务类型</th>
49 <th>进出场站</th> 49 <th>进出场站</th>
50 <th>已进已出</th> 50 <th>已进已出</th>
51 - <th>创建时间</th> 51 + <th>更新时间</th>
52 <shiro:hasPermission name="land:landBusinesstypeList:edit"><th>操作</th></shiro:hasPermission> 52 <shiro:hasPermission name="land:landBusinesstypeList:edit"><th>操作</th></shiro:hasPermission>
53 </tr> 53 </tr>
54 </thead> 54 </thead>
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 </td> 91 </td>
92 <td>${landBusinesstypeList.contrastflag}</td> 92 <td>${landBusinesstypeList.contrastflag}</td>
93 <td> 93 <td>
94 - <fmt:formatDate value="${landBusinesstypeList.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/> 94 + <fmt:formatDate value="${landBusinesstypeList.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
95 </td> 95 </td>
96 <shiro:hasPermission name="land:landBusinesstypeList:edit"><td> 96 <shiro:hasPermission name="land:landBusinesstypeList:edit"><td>
97 <c:if test="${landBusinesstypeList.contrastflag==null ||landBusinesstypeList.contrastflag==''}"> 97 <c:if test="${landBusinesstypeList.contrastflag==null ||landBusinesstypeList.contrastflag==''}">
@@ -78,13 +78,13 @@ input { @@ -78,13 +78,13 @@ input {
78 <h4>车辆信息</h4> 78 <h4>车辆信息</h4>
79 </div> 79 </div>
80 <div class="control-group"> 80 <div class="control-group">
81 - <label class="row-lable">主管海关代码：</label> 81 + <label class="row-lable">海关代码：</label>
82 <div class="row-controls"> 82 <div class="row-controls">
83 <form:input path="mainPort" htmlEscape="false" maxlength="4" 83 <form:input path="mainPort" htmlEscape="false" maxlength="4"
84 - class="input-large required" id="mainPort" /> 84 + class="input-large" id="mainPort" value="4604"/>
85 <span class="help-inline"><font color="red">*</font></span> 85 <span class="help-inline"><font color="red">*</font></span>
86 </div> 86 </div>
87 - <label class="row-lable">企业代码：</label> 87 + <label class="row-lable">海关货代备案代码：</label>
88 <div class="row-controls"> 88 <div class="row-controls">
89 <form:input path="coCode" htmlEscape="false" maxlength="20" 89 <form:input path="coCode" htmlEscape="false" maxlength="20"
90 class="input-large required" /> 90 class="input-large required" />
@@ -113,26 +113,25 @@ input { @@ -113,26 +113,25 @@ input {
113 </span> <label class="row-lable">车主联系电话：</label> <span 113 </span> <label class="row-lable">车主联系电话：</label> <span
114 class="row-controls"> <form:input path="ownerInsideTel" 114 class="row-controls"> <form:input path="ownerInsideTel"
115 htmlEscape="false" maxlength="32" 115 htmlEscape="false" maxlength="32"
116 - class="input-large required phone" /> <span class="help-inline"><font 116 + class="input-large required" /> <span class="help-inline"><font
117 color="red">*</font></span> 117 color="red">*</font></span>
118 </span> 118 </span>
119 </div> 119 </div>
120 <div class="control-group"> 120 <div class="control-group">
121 - <label class="row-lable">核定载货重量：</label> <span  
122 - class="row-controls">  
123 - <form:input path="veTon" htmlEscape="false" maxlength="10"  
124 - class="input-large required numberCheck" placeholder="货车核载单位为：kg" />  
125 - <span class="help-inline"><font color="red">*</font></span>  
126 - </span>  
127 - <label class="row-lable">自重（空车重量）：</label> 121 + <label class="row-lable">自重（空车重量）：</label>
128 <span class="row-controls"> 122 <span class="row-controls">
129 <form:input path="selfWt" htmlEscape="false" maxlength="10" placeholder="单位：kg" 123 <form:input path="selfWt" htmlEscape="false" maxlength="10" placeholder="单位：kg"
130 class="input-large required numberCheck" /> 124 class="input-large required numberCheck" />
131 <span class="help-inline"><font color="red">*</font></span> 125 <span class="help-inline"><font color="red">*</font></span>
132 </span> 126 </span>
  127 + <label class="row-lable">核定载货重量：</label> <span
  128 + class="row-controls">
  129 + <form:input path="veTon" htmlEscape="false" maxlength="10"
  130 + class="input-large numberCheck" placeholder="货车核载单位为：kg" />
  131 + </span>
133 </div> 132 </div>
134 <div class="control-group"> 133 <div class="control-group">
135 - <label class="row-lable">申请人：</label> 134 + <label class="row-lable">货代名称：</label>
136 <span class="row-controls"> 135 <span class="row-controls">
137 <form:input path="proposer" htmlEscape="false" maxlength="32" 136 <form:input path="proposer" htmlEscape="false" maxlength="32"
138 class="input-large required" /> 137 class="input-large required" />