zhangFan / station · 提交

转到一个项目

作者 xudada
提交 41eae1508704a01db9e5bb8208575447de52463e 1 个父辈 06a761b8

BY XYH

内嵌 并排对比
正在显示 9 个修改的文件 包含 658 行增加 和 181 行删除
... ... @@ -15,7 +15,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
* @version 2019-02-12
*/
public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
private static final long serialVersionUID = 1L;
private String massageId; // 主键
private String trailerFrameNo; // 车牌号
... ... @@ -43,7 +43,27 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
private String remark; // 预留字段
private String remark1; // 预留字段
private String remark2; // 预留字段
public String getIsthree() {
return isthree;
}
public void setIsthree(String isthree) {
this.isthree = isthree;
}
private String isthree;
public String getRemark3() {
return remark3;
}
public void setRemark3(String remark3) {
this.remark3 = remark3;
}
private String remark3;
public LandBusinesstypeList() {
super();
}
... ... @@ -60,7 +80,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setMassageId(String massageId) {
this.massageId = massageId;
}
@Length(min=0, max=32, message="车牌号长度必须介于 0 和 32 之间")
public String getTrailerFrameNo() {
return trailerFrameNo;
... ... @@ -69,7 +89,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setTrailerFrameNo(String trailerFrameNo) {
this.trailerFrameNo = trailerFrameNo;
}
@Length(min=0, max=64, message="车架号长度必须介于 0 和 64 之间")
public String getTrailerLicenseNo() {
return trailerLicenseNo;
... ... @@ -78,7 +98,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setTrailerLicenseNo(String trailerLicenseNo) {
this.trailerLicenseNo = trailerLicenseNo;
}
@Length(min=0, max=1024, message="主单列表长度必须介于 0 和 1024 之间")
public String getMasterList() {
return masterList;
... ... @@ -87,7 +107,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setMasterList(String masterList) {
this.masterList = masterList;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date getProdectTime() {
return prodectTime;
... ... @@ -96,7 +116,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setProdectTime(Date prodectTime) {
this.prodectTime = prodectTime;
}
@Length(min=0, max=32, message="货代代码长度必须介于 0 和 32 之间")
public String getAgentno() {
return agentno;
... ... @@ -105,7 +125,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setAgentno(String agentno) {
this.agentno = agentno;
}
@Length(min=0, max=2, message="删除标识0：未删除，1删除长度必须介于 0 和 2 之间")
public String getIsDelete() {
return isDelete;
... ... @@ -114,7 +134,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setIsDelete(String isDelete) {
this.isDelete = isDelete;
}
@Length(min=0, max=255, message="货代名称长度必须介于 0 和 255 之间")
public String getAgentname() {
return agentname;
... ... @@ -123,7 +143,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setAgentname(String agentname) {
this.agentname = agentname;
}
@Length(min=0, max=32, message="所在企业代码长度必须介于 0 和 32 之间")
public String getCocode() {
return cocode;
... ... @@ -132,7 +152,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setCocode(String cocode) {
this.cocode = cocode;
}
@Length(min=0, max=32, message="驾驶员姓名长度必须介于 0 和 32 之间")
public String getDrivername() {
return drivername;
... ... @@ -141,7 +161,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setDrivername(String drivername) {
this.drivername = drivername;
}
@Length(min=0, max=32, message="驾驶员ID长度必须介于 0 和 32 之间")
public String getDriverid() {
return driverid;
... ... @@ -150,7 +170,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setDriverid(String driverid) {
this.driverid = driverid;
}
@Length(min=0, max=4, message="起始海关代码长度必须介于 0 和 4 之间")
public String getStartport() {
return startport;
... ... @@ -159,7 +179,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setStartport(String startport) {
this.startport = startport;
}
@Length(min=0, max=4, message="目的关区代码长度必须介于 0 和 4 之间")
public String getEndport() {
return endport;
... ... @@ -168,7 +188,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setEndport(String endport) {
this.endport = endport;
}
@Length(min=0, max=64, message="起始场站长度必须介于 0 和 64 之间")
public String getStartsatation() {
return startsatation;
... ... @@ -177,7 +197,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setStartsatation(String startsatation) {
this.startsatation = startsatation;
}
@Length(min=0, max=64, message="目的场站长度必须介于 0 和 64 之间")
public String getEndstation() {
return endstation;
... ... @@ -186,7 +206,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setEndstation(String endstation) {
this.endstation = endstation;
}
@Length(min=0, max=32, message="通道/卡口长度必须介于 0 和 32 之间")
public String getAisle() {
return aisle;
... ... @@ -195,7 +215,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setAisle(String aisle) {
this.aisle = aisle;
}
@Length(min=0, max=10, message="业务类型长度必须介于 0 和 10 之间")
public String getBusinesstype() {
return businesstype;
... ... @@ -204,7 +224,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setBusinesstype(String businesstype) {
this.businesstype = businesstype;
}
@Length(min=0, max=5, message="进出场标识长度必须介于 0 和 5 之间")
public String getTurnoverflag() {
return turnoverflag;
... ... @@ -213,7 +233,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setTurnoverflag(String turnoverflag) {
this.turnoverflag = turnoverflag;
}
@Length(min=0, max=5, message="校验标识长度必须介于 0 和 5 之间")
public String getContrastflag() {
return contrastflag;
... ... @@ -222,7 +242,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setContrastflag(String contrastflag) {
this.contrastflag = contrastflag;
}
@Length(min=0, max=32, message="二维码长度必须介于 0 和 32 之间")
public String getBarcode() {
return barcode;
... ... @@ -231,7 +251,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setBarcode(String barcode) {
this.barcode = barcode;
}
@Length(min=0, max=2, message="是否失效：0：有效，1：无效长度必须介于 0 和 2 之间")
public String getIsvalid() {
return isvalid;
... ... @@ -240,7 +260,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setIsvalid(String isvalid) {
this.isvalid = isvalid;
}
public Double getAislewt() {
return aislewt;
}
... ... @@ -248,7 +268,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setAislewt(Double aislewt) {
this.aislewt = aislewt;
}
@Length(min=0, max=1, message="是否空车：0空车，1不空车长度必须介于 0 和 1 之间")
public String getIsfull() {
return isfull;
... ... @@ -257,7 +277,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setIsfull(String isfull) {
this.isfull = isfull;
}
@Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
public String getRemark() {
return remark;
... ... @@ -266,7 +286,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setRemark(String remark) {
this.remark = remark;
}
@Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
public String getRemark1() {
return remark1;
... ... @@ -275,7 +295,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setRemark1(String remark1) {
this.remark1 = remark1;
}
@Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
public String getRemark2() {
return remark2;
... ... @@ -284,4 +304,4 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setRemark2(String remark2) {
this.remark2 = remark2;
}
}
\ No newline at end of file
}
... ...
... ... @@ -27,6 +27,7 @@ import com.thinkgem.jeesite.modules.yard.service.BayonetService;
import com.thinkgem.jeesite.modules.yard.service.YardService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
... ... @@ -72,6 +73,7 @@ public class LandBusinesstypeListController extends BaseController {
@Autowired
private OfficeService officeService;
private static final String TYPE1 = "调拨业务";
private static final String TYPE2 = "进口提货";
private static final String TYPE3 = "出口送货";
... ... @@ -270,18 +272,33 @@ public class LandBusinesstypeListController extends BaseController {
}
}
flag = true;
} else {
} else {//西-综 分拨 综-西 调拨 4600329012 4600329012
if (TYPE1.equals(landBusinesstypeList.getBusinesstype())) {
flag = insertType1(landBusinesstypeList);
if(landBusinesstypeList.getStartsatation().equals("4600329012")||landBusinesstypeList.getEndstation().equals("4600329012")){
flag = insertTypeZD(landBusinesstypeList);
}else{
flag = insertType1(landBusinesstypeList);
}
}
if (TYPE2.equals(landBusinesstypeList.getBusinesstype())) {
flag = insertType2(landBusinesstypeList);
}
if (TYPE3.equals(landBusinesstypeList.getBusinesstype())) {
flag = insertType3(landBusinesstypeList);
if(landBusinesstypeList.getStartsatation().equals("4600329012")||landBusinesstypeList.getEndstation().equals("4600329012")){
if(landBusinesstypeList.getIsthree().equals("0")){
flag = insertTypeZE(landBusinesstypeList);
}else{
flag = insertTypeZE2(landBusinesstypeList);
}
}else{
flag = insertType3(landBusinesstypeList);
}
}
if (TYPE4.equals(landBusinesstypeList.getBusinesstype())) {
flag = insertType1(landBusinesstypeList);
flag = insertType6(landBusinesstypeList);
}
}
if (flag) {
... ... @@ -350,7 +367,7 @@ public class LandBusinesstypeListController extends BaseController {
try {
String messageId = dateTimeFormat();
//String barCode = "abcd";
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
if (barCode.length() < 1 | barCode == null) {
buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
... ... @@ -460,12 +477,298 @@ public class LandBusinesstypeListController extends BaseController {
return true;
}
public boolean insertTypeZD(LandBusinesstypeList landBusinesstypeList) {
try {
String messageId = dateTimeFormat();
//String barCode = "abcd";
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
if (barCode.length() < 1 | barCode == null) {
buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
return false;
}
// first entry in
String mainfistList = landBusinesstypeList.getMasterList();
String startport = landBusinesstypeList.getStartport();
String endport = landBusinesstypeList.getEndport();
String startStation = landBusinesstypeList.getStartsatation();
String endStation = landBusinesstypeList.getEndstation();
String isfull = landBusinesstypeList.getIsfull();
landBusinesstypeList.setMassageId(messageId);
landBusinesstypeList.setStartport("");
landBusinesstypeList.setStartsatation("");
landBusinesstypeList.setEndport(startport);
landBusinesstypeList.setEndstation(startStation);
landBusinesstypeList.setMasterList("");
landBusinesstypeList.setProdectTime(new Date());
landBusinesstypeList.setBarcode(barCode);
landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "6号卡口-进").getChannel());
landBusinesstypeListService.save(landBusinesstypeList);
insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
// second out
LandBusinesstypeList list = new LandBusinesstypeList();
list.setAgentname(landBusinesstypeList.getAgentname());
list.setAgentno(landBusinesstypeList.getAgentno());
list.setCocode(landBusinesstypeList.getCocode());
list.setIsDelete("0");
list.setIsvalid("0");
list.setIsfull(isfull);
list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list.setBusinesstype(landBusinesstypeList.getBusinesstype());
list.setCocode(landBusinesstypeList.getCocode());
list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list.setEndport(startport);
list.setEndstation(startStation);
list.setProdectTime(new Date());
list.setMasterList(mainfistList);
list.setDriverid(landBusinesstypeList.getDriverid());
list.setDrivername(landBusinesstypeList.getDrivername());
list.setAisle(bayService.findByYardAndName(startStation, "6号卡口-出").getChannel());
list.setTurnoverflag("E");
list.setMassageId(messageId);
list.setBarcode(barCode);
landBusinesstypeListService.save(list);
// third
LandBusinesstypeList list1 = new LandBusinesstypeList();
list1.setAgentname(landBusinesstypeList.getAgentname());
list1.setAgentno(landBusinesstypeList.getAgentno());
list1.setCocode(landBusinesstypeList.getCocode());
list1.setIsDelete("0");
list1.setIsvalid("0");
list1.setIsfull(isfull);
list1.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list1.setBusinesstype(landBusinesstypeList.getBusinesstype());
list1.setCocode(landBusinesstypeList.getCocode());
list1.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list1.setStartport(startport);
list1.setStartsatation(startStation);
list1.setEndport(endport);
list1.setEndstation(endStation);
list1.setProdectTime(new Date());
list1.setMasterList(mainfistList);
list1.setDriverid(landBusinesstypeList.getDriverid());
list1.setDrivername(landBusinesstypeList.getDrivername());
list1.setAisle(bayService.findByYardAndName(endStation, "1号卡口-进").getChannel());
list1.setTurnoverflag("I");
list1.setMassageId(messageId);
list1.setBarcode(barCode);
landBusinesstypeListService.save(list1);
// four
LandBusinesstypeList list2 = new LandBusinesstypeList();
list2.setAgentname(landBusinesstypeList.getAgentname());
list2.setAgentno(landBusinesstypeList.getAgentno());
list2.setCocode(landBusinesstypeList.getCocode());
list2.setIsDelete("0");
list2.setIsvalid("0");
list2.setIsfull(isfull);
list2.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list2.setBusinesstype(landBusinesstypeList.getBusinesstype());
list2.setCocode(landBusinesstypeList.getCocode());
list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list2.setStartport("");
list2.setStartsatation("");
list2.setStartport(startport);
list2.setStartsatation(startStation);
list2.setEndport(endport);
list2.setEndstation(endStation);
list2.setProdectTime(new Date());
list2.setMasterList("");
list2.setDriverid(landBusinesstypeList.getDriverid());
list2.setDrivername(landBusinesstypeList.getDrivername());
list2.setAisle(bayService.findByYardAndName(endStation, "1号卡口-出").getChannel());
list2.setTurnoverflag("E");
list2.setMassageId(messageId);
list2.setBarcode(barCode);
landBusinesstypeListService.save(list2);
} catch (Exception e) {
e.printStackTrace();
}
return true;
}
public boolean insertType6(LandBusinesstypeList landBusinesstypeList){
try {
String messageId = dateTimeFormat();
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
//String barCode = "abcd";
if (barCode.length() < 1 | barCode == null) {
buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
return false;
}
// first entry in
String mainfistList = landBusinesstypeList.getMasterList();
String startport = landBusinesstypeList.getStartport();
String endport = landBusinesstypeList.getEndport();
String startStation = landBusinesstypeList.getStartsatation();
String endStation = landBusinesstypeList.getEndstation();
String isfull = landBusinesstypeList.getIsfull();
landBusinesstypeList.setMassageId(messageId);
landBusinesstypeList.setStartport("");
landBusinesstypeList.setStartsatation("");
landBusinesstypeList.setEndport(startport);
landBusinesstypeList.setEndstation(startStation);
landBusinesstypeList.setMasterList("");
landBusinesstypeList.setProdectTime(new Date());
landBusinesstypeList.setBarcode(barCode);
landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel());
landBusinesstypeListService.save(landBusinesstypeList);
insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
// second out
LandBusinesstypeList list = new LandBusinesstypeList();
list.setAgentname(landBusinesstypeList.getAgentname());
list.setAgentno(landBusinesstypeList.getAgentno());
list.setCocode(landBusinesstypeList.getCocode());
list.setIsDelete("0");
list.setIsvalid("0");
list.setIsfull(isfull);
list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list.setBusinesstype(landBusinesstypeList.getBusinesstype());
list.setCocode(landBusinesstypeList.getCocode());
list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list.setEndport(startport);
list.setEndstation(startStation);
list.setProdectTime(new Date());
list.setMasterList(mainfistList);
list.setDriverid(landBusinesstypeList.getDriverid());
list.setDrivername(landBusinesstypeList.getDrivername());
list.setAisle(bayService.findByYardAndName(startStation, "1号卡口-出").getChannel());
list.setTurnoverflag("E");
list.setMassageId(messageId);
list.setBarcode(barCode);
landBusinesstypeListService.save(list);
// third
LandBusinesstypeList list1 = new LandBusinesstypeList();
list1.setAgentname(landBusinesstypeList.getAgentname());
list1.setAgentno(landBusinesstypeList.getAgentno());
list1.setCocode(landBusinesstypeList.getCocode());
list1.setIsDelete("0");
list1.setIsvalid("0");
list1.setIsfull(isfull);
list1.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list1.setBusinesstype(landBusinesstypeList.getBusinesstype());
list1.setCocode(landBusinesstypeList.getCocode());
list1.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list1.setStartport(startport);
list1.setStartsatation(startStation);
list1.setEndport(endport);
list1.setEndstation(endStation);
list1.setProdectTime(new Date());
list1.setMasterList(mainfistList);
list1.setDriverid(landBusinesstypeList.getDriverid());
list1.setDrivername(landBusinesstypeList.getDrivername());
list1.setAisle(bayService.findByYardAndName(endStation, "6号卡口-进").getChannel());
list1.setTurnoverflag("I");
list1.setMassageId(messageId);
list1.setBarcode(barCode);
landBusinesstypeListService.save(list1);
// four
LandBusinesstypeList list2 = new LandBusinesstypeList();
list2.setAgentname(landBusinesstypeList.getAgentname());
list2.setAgentno(landBusinesstypeList.getAgentno());
list2.setCocode(landBusinesstypeList.getCocode());
list2.setIsDelete("0");
list2.setIsvalid("0");
list2.setIsfull(isfull);
list2.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list2.setBusinesstype(landBusinesstypeList.getBusinesstype());
list2.setCocode(landBusinesstypeList.getCocode());
list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list2.setStartport("");
list2.setStartsatation("");
list2.setStartport(startport);
list2.setStartsatation(startStation);
list2.setEndport(endport);
list2.setEndstation(endStation);
list2.setProdectTime(new Date());
list2.setMasterList("");
list2.setDriverid(landBusinesstypeList.getDriverid());
list2.setDrivername(landBusinesstypeList.getDrivername());
list2.setAisle(bayService.findByYardAndName(endStation, "6号卡口-出").getChannel());
list2.setTurnoverflag("E");
list2.setMassageId(messageId);
list2.setBarcode(barCode);
landBusinesstypeListService.save(list2);
//five
LandBusinesstypeList list3 = new LandBusinesstypeList();
list3.setAgentname(landBusinesstypeList.getAgentname());
list3.setAgentno(landBusinesstypeList.getAgentno());
list3.setCocode(landBusinesstypeList.getCocode());
list3.setIsDelete("0");
list3.setIsvalid("0");
list3.setIsfull(isfull);
list3.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list3.setBusinesstype(landBusinesstypeList.getBusinesstype());
list3.setCocode(landBusinesstypeList.getCocode());
list3.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list3.setStartport("");
list3.setStartsatation("");
list3.setStartport(startport);
list3.setStartsatation(startStation);
list3.setEndport(endport);
list3.setEndstation("4612199001");
list3.setProdectTime(new Date());
list3.setMasterList("");
list3.setDriverid(landBusinesstypeList.getDriverid());
list3.setDrivername(landBusinesstypeList.getDrivername());
list3.setAisle("4612031001");
list3.setTurnoverflag("I");
list3.setMassageId(messageId);
list3.setBarcode(barCode);
landBusinesstypeListService.save(list3);
//six
//five
LandBusinesstypeList list4 = new LandBusinesstypeList();
list4.setAgentname(landBusinesstypeList.getAgentname());
list4.setAgentno(landBusinesstypeList.getAgentno());
list4.setCocode(landBusinesstypeList.getCocode());
list4.setIsDelete("0");
list4.setIsvalid("0");
list4.setIsfull(isfull);
list4.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list4.setBusinesstype(landBusinesstypeList.getBusinesstype());
list4.setCocode(landBusinesstypeList.getCocode());
list4.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list4.setStartport("");
list4.setStartsatation("");
list4.setStartport(startport);
list4.setStartsatation(startStation);
list4.setEndport(endport);
list4.setEndstation("4612199001");
list4.setProdectTime(new Date());
list4.setMasterList("");
list4.setDriverid(landBusinesstypeList.getDriverid());
list4.setDrivername(landBusinesstypeList.getDrivername());
//list4.setAisle(bayService.findByYardAndName(endStation, "内三卡口-出").getChannel());
list4.setAisle("4612030001");
list4.setTurnoverflag("E");
list4.setMassageId(messageId);
list4.setBarcode(barCode);
landBusinesstypeListService.save(list4);
} catch (Exception e) {
e.printStackTrace();
}
return true;
}
public boolean insertType2(LandBusinesstypeList landBusinesstypeList) {
try {
String messageId = LandBusinesstypeListController.dateTimeFormat();
//String barCode="abcd";
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
if (barCode.length() < 1 | barCode == null) {
buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
... ... @@ -501,7 +804,16 @@ public class LandBusinesstypeListController extends BaseController {
list.setMasterList(mainfistList);
list.setDriverid(landBusinesstypeList.getDriverid());
list.setDrivername(landBusinesstypeList.getDrivername());
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
if("4604333311".equals(landBusinesstypeList.getAisle())){
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
}else if("4604333321".equals(landBusinesstypeList.getAisle())){
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "2号卡口-出").getChannel());
}else if("4604444411".equals(landBusinesstypeList.getAisle())){
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
}else{
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
}
list.setTurnoverflag("E");
list.setMassageId(messageId);
list.setBarcode(barCode);
... ... @@ -517,7 +829,171 @@ public class LandBusinesstypeListController extends BaseController {
try {
String messageId = LandBusinesstypeListController.dateTimeFormat();
//String barCode="abcd";
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
if (barCode.length() < 1 | barCode == null) {
buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
return false;
}
// first entry
landBusinesstypeList.setMassageId(messageId);
String mainfistList = landBusinesstypeList.getMasterList();
String isfull = landBusinesstypeList.getIsfull();
landBusinesstypeList.setProdectTime(new Date());
landBusinesstypeList.setBarcode(barCode);
landBusinesstypeListService.save(landBusinesstypeList);
insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
// second
LandBusinesstypeList list = new LandBusinesstypeList();
list.setAgentname(landBusinesstypeList.getAgentname());
list.setAgentno(landBusinesstypeList.getAgentno());
list.setCocode(landBusinesstypeList.getCocode());
list.setIsDelete("0");
list.setIsvalid("0");
list.setIsfull(isfull);
list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list.setBusinesstype(landBusinesstypeList.getBusinesstype());
list.setCocode(landBusinesstypeList.getCocode());
list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list.setStartport(landBusinesstypeList.getStartport());
list.setStartsatation(landBusinesstypeList.getStartsatation());
list.setEndport(landBusinesstypeList.getEndport());
list.setEndstation(landBusinesstypeList.getEndstation());
list.setProdectTime(new Date());
list.setMasterList("");
list.setDriverid(landBusinesstypeList.getDriverid());
list.setDrivername(landBusinesstypeList.getDrivername());
if("4604333311".equals(landBusinesstypeList.getAisle())){
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
}else if("4604333321".equals(landBusinesstypeList.getAisle())){
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "2号卡口-出").getChannel());
}else if("4604444411".equals(landBusinesstypeList.getAisle())){
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
}else{
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
}
list.setTurnoverflag("E");
list.setMassageId(messageId);
list.setBarcode(barCode);
landBusinesstypeListService.save(list);
} catch (Exception e) {
e.printStackTrace();
}
return true;
}
public boolean insertTypeZE(LandBusinesstypeList landBusinesstypeList) {
try {
String messageId = LandBusinesstypeListController.dateTimeFormat();
//String barCode="abcd";
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
if (barCode.length() < 1 | barCode == null) {
buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
return false;
}
// first entry
landBusinesstypeList.setMassageId(messageId);
String mainfistList = landBusinesstypeList.getMasterList();
String isfull = landBusinesstypeList.getIsfull();
landBusinesstypeList.setProdectTime(new Date());
landBusinesstypeList.setBarcode(barCode);
landBusinesstypeListService.save(landBusinesstypeList);
insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
// second
LandBusinesstypeList list = new LandBusinesstypeList();
list.setAgentname(landBusinesstypeList.getAgentname());
list.setAgentno(landBusinesstypeList.getAgentno());
list.setCocode(landBusinesstypeList.getCocode());
list.setIsDelete("0");
list.setIsvalid("0");
list.setIsfull(isfull);
list.setIsthree("0");
list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list.setBusinesstype(landBusinesstypeList.getBusinesstype());
list.setCocode(landBusinesstypeList.getCocode());
list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list.setStartport(landBusinesstypeList.getStartport());
list.setStartsatation(landBusinesstypeList.getStartsatation());
list.setEndport(landBusinesstypeList.getEndport());
list.setEndstation(landBusinesstypeList.getEndstation());
list.setProdectTime(new Date());
list.setMasterList("");
list.setDriverid(landBusinesstypeList.getDriverid());
list.setDrivername(landBusinesstypeList.getDrivername());
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "6号卡口-出").getChannel());
list.setTurnoverflag("E");
list.setMassageId(messageId);
list.setBarcode(barCode);
landBusinesstypeListService.save(list);
//five
LandBusinesstypeList list3 = new LandBusinesstypeList();
list3.setAgentname(landBusinesstypeList.getAgentname());
list3.setAgentno(landBusinesstypeList.getAgentno());
list3.setCocode(landBusinesstypeList.getCocode());
list3.setIsDelete("0");
list3.setIsvalid("0");
list3.setIsthree("0");
list3.setIsfull(isfull);
list3.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list3.setBusinesstype(landBusinesstypeList.getBusinesstype());
list3.setCocode(landBusinesstypeList.getCocode());
list3.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list3.setStartport("");
list3.setStartsatation("");
list3.setEndport("4620");
list3.setEndstation("4612199001");
list3.setProdectTime(new Date());
list3.setMasterList("");
list3.setDriverid(landBusinesstypeList.getDriverid());
list3.setDrivername(landBusinesstypeList.getDrivername());
list3.setAisle("4612031001");
list3.setTurnoverflag("I");
list3.setMassageId(messageId);
list3.setBarcode(barCode);
landBusinesstypeListService.save(list3);
//six
//five
LandBusinesstypeList list4 = new LandBusinesstypeList();
list4.setAgentname(landBusinesstypeList.getAgentname());
list4.setAgentno(landBusinesstypeList.getAgentno());
list4.setCocode(landBusinesstypeList.getCocode());
list4.setIsDelete("0");
list4.setIsvalid("0");
list4.setIsthree("0");
list4.setIsfull(isfull);
list4.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list4.setBusinesstype(landBusinesstypeList.getBusinesstype());
list4.setCocode(landBusinesstypeList.getCocode());
list4.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
list4.setStartport("");
list4.setStartsatation("");
list4.setEndport("4620");
list4.setEndstation("4612199001");
list4.setProdectTime(new Date());
list4.setMasterList("");
list4.setDriverid(landBusinesstypeList.getDriverid());
list4.setDrivername(landBusinesstypeList.getDrivername());
//list4.setAisle(bayService.findByYardAndName(endStation, "内三卡口-出").getChannel());
list4.setAisle("4612030001");
list4.setTurnoverflag("E");
list4.setMassageId(messageId);
list4.setBarcode(barCode);
landBusinesstypeListService.save(list4);
} catch (Exception e) {
e.printStackTrace();
}
return true;
}
public boolean insertTypeZE2(LandBusinesstypeList landBusinesstypeList) {
try {
String messageId = LandBusinesstypeListController.dateTimeFormat();
//String barCode="abcd";
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
if (barCode.length() < 1 | barCode == null) {
buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
... ... @@ -538,6 +1014,7 @@ public class LandBusinesstypeListController extends BaseController {
list.setCocode(landBusinesstypeList.getCocode());
list.setIsDelete("0");
list.setIsvalid("0");
list.setIsthree("1");
list.setIsfull(isfull);
list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
list.setBusinesstype(landBusinesstypeList.getBusinesstype());
... ... @@ -551,7 +1028,7 @@ public class LandBusinesstypeListController extends BaseController {
list.setMasterList("");
list.setDriverid(landBusinesstypeList.getDriverid());
list.setDrivername(landBusinesstypeList.getDrivername());
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "6号卡口-出").getChannel());
list.setTurnoverflag("E");
list.setMassageId(messageId);
list.setBarcode(barCode);
... ... @@ -563,81 +1040,6 @@ public class LandBusinesstypeListController extends BaseController {
return true;
}
/*
* public void insertType1(LandBusinesstypeList landBusinesstypeList) { //first
* entry in String messageId = LandBusinesstypeListController.dateTimeFormat();
* String mainfistList = landBusinesstypeList.getMasterList(); String startport
* = landBusinesstypeList.getStartport(); String endport =
* landBusinesstypeList.getEndport(); String startStation =
* landBusinesstypeList.getStartsatation(); String endStation =
* landBusinesstypeList.getEndstation(); String isfull =
* landBusinesstypeList.getIsfull();
* landBusinesstypeList.setMassageId(messageId); String barCode =
* buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId
* ); landBusinesstypeList.setStartport("");
* landBusinesstypeList.setStartsatation("");
* landBusinesstypeList.setEndport(startport);
* landBusinesstypeList.setEndstation(startStation);
* landBusinesstypeList.setBarcode(barCode);
* landBusinesstypeList.setMasterList("");
* landBusinesstypeList.setProdectTime(new Date());
* landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation,
* "1号卡口-进").getChannel());
* landBusinesstypeListService.save(landBusinesstypeList);
* insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.
* getTrailerFrameNo(),mainfistList);
*
* //second out LandBusinesstypeList list = new LandBusinesstypeList();
* list.setAgentname(landBusinesstypeList.getAgentname());
* list.setAgentno(landBusinesstypeList.getAgentno()); list.setBarcode(barCode);
* list.setIsDelete("0"); list.setIsvalid("0"); list.setIsfull(isfull);
* list.setBusinesstype(landBusinesstypeList.getBusinesstype());
* list.setCocode(landBusinesstypeList.getCocode());
* list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
* list.setEndport(startport); list.setEndstation(startStation);
* list.setProdectTime(new Date()); list.setMasterList(mainfistList);
* list.setDriverid(landBusinesstypeList.getDriverid());
* list.setDrivername(landBusinesstypeList.getDrivername());
* list.setAisle(bayService.findByYardAndName(startStation,
* "1号卡口-出").getChannel()); list.setTurnoverflag("E");
* list.setMassageId(messageId); landBusinesstypeListService.save(list);
*
* //third LandBusinesstypeList list1 = new LandBusinesstypeList();
* list1.setAgentname(landBusinesstypeList.getAgentname());
* list1.setAgentno(landBusinesstypeList.getAgentno()); list1.setIsDelete("0");
* list1.setIsvalid("0"); list1.setIsfull(isfull); list1.setBarcode(barCode);
* list1.setBusinesstype(landBusinesstypeList.getBusinesstype());
* list1.setCocode(landBusinesstypeList.getCocode());
* list1.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
* list1.setStartport(startport); list1.setStartsatation(startStation);
* list1.setEndport(endport); list1.setEndstation(endStation);
* list1.setProdectTime(new Date()); list1.setMasterList(mainfistList);
* list1.setDriverid(landBusinesstypeList.getDriverid());
* list1.setDrivername(landBusinesstypeList.getDrivername());
* list1.setAisle(bayService.findByYardAndName(endStation,
* "1号卡口-进").getChannel()); list1.setTurnoverflag("I");
* list1.setMassageId(messageId); landBusinesstypeListService.save(list1);
*
* //four LandBusinesstypeList list2 = new LandBusinesstypeList();
* list2.setAgentname(landBusinesstypeList.getAgentname());
* list2.setAgentno(landBusinesstypeList.getAgentno());
* list2.setBarcode(barCode); list2.setIsDelete("0"); list2.setIsvalid("0");
* list2.setIsfull(isfull);
* list2.setBusinesstype(landBusinesstypeList.getBusinesstype());
* list2.setCocode(landBusinesstypeList.getCocode());
* list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
* list2.setStartport(""); list2.setStartsatation("");
* list2.setStartport(startport); list2.setStartsatation(startStation);
* list2.setEndport(endport); list2.setEndstation(endStation);
* list2.setProdectTime(new Date()); list2.setMasterList("");
* list2.setDriverid(landBusinesstypeList.getDriverid());
* list2.setDrivername(landBusinesstypeList.getDrivername());
* list2.setAisle(bayService.findByYardAndName(endStation,
* "1号卡口-出").getChannel()); list2.setTurnoverflag("E");
* list2.setMassageId(messageId); landBusinesstypeListService.save(list2);
*
* }
*/
public static String dateTimeFormat() {
Date dateTime = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
... ...
... ... @@ -11,16 +11,17 @@
#mysql database setting
jdbc.type=mysql
#jdbc.driver=com.mysql.cj.jdbc.Driver
#jdbc.url=jdbc:mysql://10.50.7.60:3306/station?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
#jdbc.username=managent_user
#jdbc.password=1q2w3e4r%.
jdbc.driver=com.mysql.cj.jdbc.Driver
jdbc.url=jdbc:mysql://10.50.7.60:3306/station?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
jdbc.username=managent_user
jdbc.password=1q2w3e4r%.
#jdbc.type=mysql
jdbc.driver=com.mysql.cj.jdbc.Driver
jdbc.url=jdbc:mysql://localhost:3306/station?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
jdbc.username=root
jdbc.password=root
#jdbc.driver=com.mysql.cj.jdbc.Driver
#jdbc.url=jdbc:mysql://118.31.66.166:3306/station?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
#jdbc.username=110
#jdbc.password=QAHqCJf2kFYCLirM
#pool settings
jdbc.pool.init=1
... ...
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao">
<sql id="landBusinesstypeListColumns">
a.id AS "id",
a.massage_id AS "massageId",
... ... @@ -33,14 +33,16 @@
a.isfull AS "isfull",
a.remark AS "remark",
a.remark1 AS "remark1",
a.remark2 AS "remark2"
a.remark2 AS "remark2",
a.remark3 AS "remark3",
a.isthree AS "isthree"
</sql>
<sql id="landBusinesstypeListJoins">
</sql>
<select id="get" resultType="LandBusinesstypeList">
SELECT
SELECT
<include refid="landBusinesstypeListColumns"/>
FROM land_businesstype_list a
<include refid="landBusinesstypeListJoins"/>
... ... @@ -48,11 +50,11 @@
</select>
<select id="findByStatus" resultType="LandBusinesstypeList">
SELECT
SELECT
<include refid="landBusinesstypeListColumns"/>
FROM land_businesstype_list a
<include refid="landBusinesstypeListJoins"/>
where a.is_delete = "0"
where a.is_delete = "0"
<if test="trailerFrameNo !=null and trailerFrameNo !=''">
and trailer_frame_no = #{trailerFrameNo}
</if>
... ... @@ -61,9 +63,9 @@
</if> -->
order by a.create_date DESC
</select>
<select id="findByBarcode" resultType="LandBusinesstypeList">
SELECT
SELECT
<include refid="landBusinesstypeListColumns"/>
FROM land_businesstype_list a
<include refid="landBusinesstypeListJoins"/>
... ... @@ -74,16 +76,16 @@
order by a.create_date DESC
</select>
<select id="findByTime" resultType="LandBusinesstypeList">
select * from land_businesstype_list
WHERE PRODECT_TIME &gt;=#{time1}
AND PRODECT_TIME &lt;= #{time2}
AND ENDSTATION= "4604000000"
AND AISLE = "4604333311"
AND IS_DELETE="0"
select * from land_businesstype_list
WHERE PRODECT_TIME &gt;=#{time1}
AND PRODECT_TIME &lt;= #{time2}
AND ENDSTATION= "4604000000"
AND AISLE = "4604333311"
AND IS_DELETE="0"
ORDER BY PRODECT_TIME;
</select>
<select id="findByMessageId" resultType="LandBusinesstypeList">
SELECT
SELECT
<include refid="landBusinesstypeListColumns"/>
FROM land_businesstype_list a
<include refid="landBusinesstypeListJoins"/>
... ... @@ -94,7 +96,7 @@
order by a.create_date DESC
</select>
<select id="findList" resultType="LandBusinesstypeList">
SELECT
SELECT
<include refid="landBusinesstypeListColumns"/>
FROM land_businesstype_list a
<include refid="landBusinesstypeListJoins"/>
... ... @@ -128,9 +130,9 @@
</otherwise>
</choose>
</select>
<select id="findByUserType" resultType="LandBusinesstypeList">
SELECT
SELECT
<include refid="landBusinesstypeListColumns"/>
FROM land_businesstype_list a
<include refid="landBusinesstypeListJoins"/>
... ... @@ -161,15 +163,15 @@
</otherwise>
</choose>
</select>
<select id="findAllList" resultType="LandBusinesstypeList">
SELECT
SELECT
<include refid="landBusinesstypeListColumns"/>
FROM land_businesstype_list a
<include refid="landBusinesstypeListJoins"/>
<where>
</where>
</where>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
... ... @@ -180,7 +182,7 @@
</choose>
</select>
<select id="findByIsValid" resultType="LandBusinesstypeList">
select * from land_businesstype_list
select * from land_businesstype_list
WHERE trailer_frame_no =#{trailerFrameNo} AND isvalid=#{isvalid}
</select>
<update id="deleteByBarcode" parameterType="java.lang.String">
... ... @@ -191,9 +193,9 @@
DELETE FROM land_businesstype_list
WHERE id = #{id}
</update>
<update id="deleteByMessageId" parameterType="java.lang.String">
DELETE FROM land_businesstype_list
DELETE FROM land_businesstype_list
WHERE massage_id = #{massageId}
</update>
... ... @@ -229,7 +231,9 @@
isfull,
remark,
remark1,
remark2
remark2,
remark3,
isthree
) VALUES (
#{id},
#{massageId},
... ... @@ -261,12 +265,14 @@
#{isfull},
#{remark},
#{remark1},
#{remark2}
#{remark2},
#{remark3},
#{isthree}
)
</insert>
<update id="update">
UPDATE land_businesstype_list SET
UPDATE land_businesstype_list SET
trailer_frame_no = #{trailerFrameNo},
master_list = #{masterList},
agentno = #{agentno},
... ... @@ -281,11 +287,13 @@
barcode = #{barcode},
update_by = #{updateBy.id},
update_date = #{updateDate},
isfull = #{isfull}
isfull = #{isfull},
remark2=#{remark2},
remark3=#{remark3}
WHERE id = #{id}
</update>
<update id="updateEntry">
UPDATE land_businesstype_list SET
UPDATE land_businesstype_list SET
trailer_frame_no = #{trailerFrameNo},
master_list = #{masterList},
agentno = #{agentno},
... ... @@ -302,13 +310,14 @@
update_by = #{updateBy.id},
update_date = #{updateDate},
isvalid=#{isvalid},
isfull = #{isfull}
isfull = #{isfull},
remark2=#{remark2}
WHERE id = #{id}
</update>
<update id="delete">
DELETE FROM land_businesstype_list
WHERE id = #{id}
</update>
</mapper>
\ No newline at end of file
</mapper>
... ...
... ... @@ -72,6 +72,7 @@ th, td {
<span class="help-inline"><font color="red">查询单号前请先选定业务类型</font>
</div>
<br>
<div class="controls">
<table>
<thead>
... ... @@ -99,6 +100,12 @@ th, td {
<form:hidden path="id" />
<sys:message content="${message}" />
<div class="control-group">
<label class="control-label">备注：</label>
<div class="controls">
<form:input path="remark3" autocomplete="off" id="remark3"/>
</div>
</div>
<div class="control-group">
<div class="row-fluid">
<div class="span12">
<div class="span6">
... ... @@ -298,18 +305,48 @@ th, td {
</div>
</div>
<div class="control-group">
<div class="row-fluid">
<div class="span12">
<div class="span6">
<label class="control-label">是否空车：</label>
<div class="controls">
<form:select path="isfull" class="input-xlarge">
<form:option value="" label="--请选择--" />
<form:option value="0" label="是" selected = "selected"/>
<form:option value="1" label="否"/>
</form:select>
<div class="row-fluid">
<div class="span12">
<div class="span6">
<label class="control-label">是否进内三：</label>
<div class="controls">
<form:select path="isthree" class="input-xlarge">
<form:option value="0" label="是" selected = "selected"/>
<form:option value="1" label="否"/>
</form:select>
<span class="help-inline"><font color="red">综保区出口送货业务必须选择，默认进内三</font></span>
</div>
</div>
<div class="span6">
<label class="control-label">是否空车：</label>
<div class="controls">
<c:choose>
<c:when test="${landBusinesstypeList.isfull!=null}">
<form:select path="isfull" class="input-xlarge" disabled="true">
<form:option value="" label="--请选择--" />
<form:option value="0" label="是" selected = "selected"/>
<form:option value="1" label="否"/>
</form:select>
</c:when>
<c:otherwise>
<form:select path="isfull" class="input-xlarge" >
<form:option value="" label="--请选择--" />
<form:option value="0" label="是" selected = "selected"/>
<form:option value="1" label="否"/>
</form:select>
</c:otherwise>
</c:choose>
</div>
</div>
</div>
</div>
</div>
<div class="control-group">
<div class="row-fluid">
<div class="span12">
<div class="span6">
<label class="control-label">货物类型：</label>
<div class="controls">
... ... @@ -487,7 +524,7 @@ th, td {
if(data[i].receiptinformation!=undefined){
if(data[i].receiptinformation.indexOf("41301")!=-1 || data[i].receiptinformation.indexOf("41106")!=-1 ||
data[i].receiptinformation.indexOf("31301")!=-1 || data[i].receiptinformation.indexOf("31106")!=-1 ||
data[i].receiptinformation.indexOf("提运单放行")!=-1 ){
data[i].receiptinformation.indexOf("提运单放行")!=-1 ||data[i].receiptinformation.indexOf("90001")!=-1 ){
if(ieType=="I"){
flightNo = data[i].flightno;
flightDate = timeFormat(data[i].flightDate).substring(0,10);
... ...
... ... @@ -6,7 +6,7 @@
<meta name="decorator" content="default"/>
<script type="text/javascript">
$(document).ready(function() {
});
function page(n,s){
$("#pageNo").val(n);
... ... @@ -52,28 +52,28 @@
<li>
<label>车牌号：</label>
<form:input path="trailerFrameNo" htmlEscape="false" maxlength="10" class="input-small"/>
<label>挂靠名称：</label>
<form:input path="agentname" htmlEscape="false" maxlength="32" class="input-small"/>
<label>目的场站：</label>
<form:select path="endstation" class="input" id="station" onchange="change()">
<form:option value="" label="--请选择--" />
<form:options items="${yardList}" itemLabel="name" itemValue="stationid" htmlEscape="false" />
</form:select>
<label>卡口：</label>
<form:select path="aisle" class="input" id="aisle">
<form:option value="" label="--请选择--" />
</form:select>
<%-- <label>是否出站</label>
<form:select path="contrastflag" class="input">
<form:option value="" label="--请选择--" />
<form:option value="已进站" label="已进站" />
<form:option value="已出站" label="已出站" />
</form:select> --%>
</li>
<li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/></li>
<li class="clearfix"></li>
... ... @@ -122,13 +122,14 @@
</td>
</shiro:hasRole>
<td>${landBusinesstypeList.trailerFrameNo}</td>
<td>${landBusinesstypeList.agentname}</td>
<td>${landBusinesstypeList.agentname}</td>
<td>${landBusinesstypeList.endport}</td>
<td>
<c:if test='${landBusinesstypeList.endstation =="4604000000"}'>西货站</c:if>
<c:if test='${landBusinesstypeList.endstation =="4604499001"}'>三号货站</c:if>
<c:if test='${landBusinesstypeList.endstation =="4604511001"}'>快邮货站</c:if>
</td>
<c:if test='${landBusinesstypeList.endstation =="4600329012"}'>综保区货站</c:if>
</td>
<td>
<c:if test="${landBusinesstypeList.aisle =='4604333311'}">1号卡口-进</c:if>
<c:if test="${landBusinesstypeList.aisle =='4604111111'}">1号卡口-进</c:if>
... ... @@ -136,8 +137,14 @@
<c:if test="${landBusinesstypeList.aisle =='4604333312'}">1号卡口-出</c:if>
<c:if test="${landBusinesstypeList.aisle =='4604444412'}">1号卡口-出</c:if>
<c:if test="${landBusinesstypeList.aisle =='4604110112'}">1号卡口-出</c:if>
<c:if test="${landBusinesstypeList.aisle =='4604333321'}">暂不启用</c:if>
<c:if test="${landBusinesstypeList.aisle =='4604333322'}">暂不启用</c:if>
<c:if test="${landBusinesstypeList.aisle =='4612031001'}">内三卡口-进</c:if>
<c:if test="${landBusinesstypeList.aisle =='4612030001'}">内三卡口-出</c:if>
<c:if test="${landBusinesstypeList.aisle =='4600011006'}">6号卡口-进</c:if>
<c:if test="${landBusinesstypeList.aisle =='4600010006'}">6号卡口-出</c:if>
<c:if test="${landBusinesstypeList.aisle =='4600011005'}">5号卡口-进</c:if>
<c:if test="${landBusinesstypeList.aisle =='4600010005'}">5号卡口-出</c:if>
<c:if test="${landBusinesstypeList.aisle =='4604333321'}">2号卡口-进</c:if>
<c:if test="${landBusinesstypeList.aisle =='4604333322'}">2号卡口-出</c:if>
</td>
<td>${landBusinesstypeList.aislewt}</td>
<td>${landBusinesstypeList.remark}</td>
... ... @@ -169,4 +176,4 @@
</table>
<div class="pagination">${page}</div>
</body>
</html>
\ No newline at end of file
</html>
... ...
... ... @@ -80,7 +80,7 @@
<div class="control-group">
<label class="control-label">挂车重量：</label>
<div class="controls">
<form:input path="trailerWt" htmlEscape="false" maxlength="10" class="input-xlarge "/>
<form:input path="trailerWt" htmlEscape="false" maxlength="10" class="input-xlarge " oninput = "value=value.replace(/[^\d]/g,'')"/>
</div>
</div>
<div class="control-group">
... ...
... ... @@ -137,13 +137,13 @@ input {
<label class="row-lable">自重（空车重量）：</label>
<span class="row-controls">
<form:input path="selfWt" htmlEscape="false" maxlength="10" placeholder="单位：kg"
class="input-large required numberCheck" />
class="input-large required numberCheck" oninput = "value=value.replace(/[^\d]/g,'')"/>
<span class="help-inline"><font color="red">*</font></span>
</span>
<label class="row-lable">核定载货重量：</label> <span
class="row-controls">
<form:input path="veTon" htmlEscape="false" maxlength="10"
class="input-large numberCheck" placeholder="货车核载单位为：kg" />
class="input-large numberCheck" placeholder="货车核载单位为：kg" oninput = "value=value.replace(/[^\d]/g,'')"/>
</span>
</div>
<%-- <div class="control-group">
... ...
... ... @@ -77,8 +77,9 @@
<fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
</a></td>
<shiro:hasPermission name="land:landRoadVeRecord:edit"><td>
<a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">修改</a>
<shiro:hasAnyRoles name="dept,admin,leader">
<a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">修改</a>
<a href="${ctx}/land/landRoadVeRecord/delete?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要删除该备案吗？', this.href)">删除</a>
<%--<c:if test="${landRoadVeRecord.operationTyp.veClassFlag=='1' }"></c:if>--%>
<a href="${ctx}/land/landRoadVeRecord/change?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要审批吗？', this.href)">审批</a>
... ...