zhangFan / station · 提交

转到一个项目

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

BY XYH

内嵌 并排对比
正在显示 9 个修改的文件 包含 578 行增加 和 101 行删除
... ... @@ -44,6 +44,26 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
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();
}
... ...
... ... @@ -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())) {
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())) {
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());
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,7 @@ 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());
... ... @@ -551,7 +863,172 @@ public class LandBusinesstypeListController extends BaseController {
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());
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.setIsthree("1");
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());
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
... ...
... ... @@ -33,7 +33,9 @@
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">
... ... @@ -229,7 +231,9 @@
isfull,
remark,
remark1,
remark2
remark2,
remark3,
isthree
) VALUES (
#{id},
#{massageId},
... ... @@ -261,7 +265,9 @@
#{isfull},
#{remark},
#{remark1},
#{remark2}
#{remark2},
#{remark3},
#{isthree}
)
</insert>
... ... @@ -281,7 +287,9 @@
barcode = #{barcode},
update_by = #{updateBy.id},
update_date = #{updateDate},
isfull = #{isfull}
isfull = #{isfull},
remark2=#{remark2},
remark3=#{remark3}
WHERE id = #{id}
</update>
<update id="updateEntry">
... ... @@ -302,7 +310,8 @@
update_by = #{updateBy.id},
update_date = #{updateDate},
isvalid=#{isvalid},
isfull = #{isfull}
isfull = #{isfull},
remark2=#{remark2}
WHERE id = #{id}
</update>
... ...
... ... @@ -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">
... ... @@ -300,16 +307,46 @@ th, td {
<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="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">
<form:select path="isfull" class="input-xlarge">
<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);
... ...
... ... @@ -128,6 +128,7 @@
<c:if test='${landBusinesstypeList.endstation =="4604000000"}'>西货站</c:if>
<c:if test='${landBusinesstypeList.endstation =="4604499001"}'>三号货站</c:if>
<c:if test='${landBusinesstypeList.endstation =="4604511001"}'>快邮货站</c:if>
<c:if test='${landBusinesstypeList.endstation =="4600329012"}'>综保区货站</c:if>
</td>
<td>
<c:if test="${landBusinesstypeList.aisle =='4604333311'}">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>
... ...
... ... @@ -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>
... ...