张天舒 / station · 提交

转到一个项目

作者 zhangFan
提交 b171995cd2cef930b1fc9347a1a100f7b3c3e77a 1 个父辈 f654bff3

稳定版

内嵌 并排对比
正在显示 15 个修改的文件 包含 292 行增加 和 169 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -26,4 +26,5 @@ public interface LandBusinesstypeListDao extends CrudDao<LandBusinesstypeList> {
int deleteByBarcode(@Param("barcode")String barcode);
int updateByBarcode(LandBusinesstypeList landBusinesstypeList);
}
\ No newline at end of file
... ...
... ... @@ -38,6 +38,11 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
private String contrastflag; // 校验标识
private String barcode; // 二维码
private String isvalid; // 是否失效：0：有效，1：无效
private Double aislewt; // 过卡重量
private String isfull; // 是否空车：0空车，1不空车
private String remark; // 预留字段
private String remark1; // 预留字段
private String remark2; // 预留字段
public LandBusinesstypeList() {
super();
... ... @@ -235,4 +240,48 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
public void setIsvalid(String isvalid) {
this.isvalid = isvalid;
}
public Double getAislewt() {
return aislewt;
}
public void setAislewt(Double aislewt) {
this.aislewt = aislewt;
}
@Length(min=0, max=1, message="是否空车：0空车，1不空车长度必须介于 0 和 1 之间")
public String getIsfull() {
return isfull;
}
public void setIsfull(String isfull) {
this.isfull = isfull;
}
@Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
@Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
public String getRemark1() {
return remark1;
}
public void setRemark1(String remark1) {
this.remark1 = remark1;
}
@Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
public String getRemark2() {
return remark2;
}
public void setRemark2(String remark2) {
this.remark2 = remark2;
}
}
\ No newline at end of file
... ...
... ... @@ -67,4 +67,5 @@ public class LandBusinesstypeListService extends CrudService<LandBusinesstypeLis
public int updateByBarcode(LandBusinesstypeList landBusinesstypeList) {
return dao.updateByBarcode(landBusinesstypeList);
}
}
\ No newline at end of file
... ...
... ... @@ -104,24 +104,24 @@ public class LandBusinesstypeListController extends BaseController {
@ResponseBody
public Page<LandRoadVeRecord> list(String frameNo) throws Exception {
Page<LandRoadVeRecord> page = new Page<LandRoadVeRecord>();
//List<LandBusinesstypeList> list = landBusinesstypeListService.findByStatus(frameNo);
List<LandRoadVeRecord> list = roadVeService.selectByFrameNo(frameNo);
// if(list.size()>0 ) {
// for (int i = 0; i < list.size(); i++) {
// System.out.println(list.get(i));
// boolean flag = (list.get(i).getContrastflag()==null ||list.get(i).getContrastflag()=="" ||list.get(i).getContrastflag().length()<=0);
// if("进场站".equals(list.get(i).getTurnoverflag()) && flag) {
// page.setResultMsg("此车辆存在进场业务，请勿重新申报");
// }else if("已进站".equals(list.get(i).getContrastflag())) {
// page.setResultMsg("此车辆有出站业务未完成");
// }else if("出场站".equals(list.get(i).getTurnoverflag())&& flag ) {
// page.setResultMsg("此车辆存在出场业务，请勿重新申报");
// }
// }
// }else {
// page.setResultMsg("此车辆可以正常申报业务");
// }
page.setList(list);
List<LandBusinesstypeList> list = landBusinesstypeListService.findByStatus(frameNo);
List<LandRoadVeRecord> veList = roadVeService.selectByFrameNo(frameNo);
if(list.size()>0 ) {
for (int i = 0; i < list.size(); i++) {
boolean flag = (list.get(i).getContrastflag()==null || list.get(i).getContrastflag().length()<1);
if("I".equals(list.get(i).getTurnoverflag()) && flag) {
page.setResultMsg("此车辆已存在进出场业务，请勿重新申报");
}else if("E".equals(list.get(i).getTurnoverflag())&& flag ) {
page.setResultMsg("此车辆已存在进出场业务，请勿重新申报");
}else {
page.setResultMsg("此车辆可以正常申报业务");
}
break;
}
}else {
page.setResultMsg("此车辆可以正常申报业务");
}
page.setList(veList);
return page;
}
... ... @@ -139,7 +139,6 @@ public class LandBusinesstypeListController extends BaseController {
@RequiresPermissions("land:landBusinesstypeList:view")
@RequestMapping(value = "form")
public String form(LandBusinesstypeList landBusinesstypeList, Model model) {
System.out.println(landBusinesstypeList);
Yard yard = new Yard();
List<Yard> yardList = yardService.findList(yard);
LandRoadVeRecord ve = new LandRoadVeRecord();
... ... @@ -154,9 +153,6 @@ public class LandBusinesstypeListController extends BaseController {
List<Bayonet> bayonets = bayService.findByYardId(yard1.getStationid());
model.addAttribute("bayonets", bayonets);
}
// Bayonet bayonet = new Bayonet();
// List<Bayonet> bayonets = bayService.findList(bayonet);
// model.addAttribute("bayonets", bayonets);
model.addAttribute("veList",veList);
model.addAttribute("yardList", yardList);
model.addAttribute("landBusinesstypeList", landBusinesstypeList);
... ... @@ -173,13 +169,24 @@ public class LandBusinesstypeListController extends BaseController {
landBusinesstypeList.setIsvalid("0");
if(landBusinesstypeList.getId().length()>0) {
String masterList = landBusinesstypeList.getMasterList();
System.out.println(masterList);
insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),masterList);
landBusinesstypeListService.save(landBusinesstypeList);
List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
for (int i = 0; i < list.size(); i++) {
if(list.get(i).getMasterList().length()>0) {
list.get(i).setMasterList(masterList);
landBusinesstypeListService.save(list.get(i));
if(list.get(i).getBusinesstype().endsWith("流转")) {
if(list.get(i).getMasterList().length()>0) {
if(list.get(i).getContrastflag()==null) {
list.get(i).setMasterList(masterList);
// list.get(i).setBusinesstype(landBusinesstypeList.getBusinesstype());
landBusinesstypeListService.save(list.get(i));
}
}else {
if("I".equals(list.get(i).getTurnoverflag())) {
list.get(i).setMasterList(masterList);
// list.get(i).setBusinesstype(landBusinesstypeList.getBusinesstype());
landBusinesstypeListService.save(list.get(i));
}
}
}
}
}else{
... ... @@ -229,13 +236,10 @@ public class LandBusinesstypeListController extends BaseController {
String messageId = LandBusinesstypeListController.dateTimeFormat();
String mainfistList = landBusinesstypeList.getMasterList();
String startport = landBusinesstypeList.getStartport();
System.out.println("startport:"+startport);
String endport = landBusinesstypeList.getEndport();
System.out.println("endport:"+endport);
String startStation = landBusinesstypeList.getStartsatation();
System.out.println("startStation:"+startStation);
String endStation = landBusinesstypeList.getEndstation();
System.out.println("endStation:"+endStation);
String isfull = landBusinesstypeList.getIsfull();
landBusinesstypeList.setMassageId(messageId);
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
landBusinesstypeList.setStartport("");
... ... @@ -244,6 +248,7 @@ public class LandBusinesstypeListController extends BaseController {
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);
... ... @@ -255,6 +260,7 @@ public class LandBusinesstypeListController extends BaseController {
list.setBarcode(barCode);
list.setIsDelete("0");
list.setIsvalid("0");
list.setIsfull(isfull);
list.setBusinesstype(landBusinesstypeList.getBusinesstype());
list.setCocode(landBusinesstypeList.getCocode());
list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
... ... @@ -275,6 +281,7 @@ public class LandBusinesstypeListController extends BaseController {
list1.setAgentno(landBusinesstypeList.getAgentno());
list1.setIsDelete("0");
list1.setIsvalid("0");
list1.setIsfull(isfull);
list1.setBarcode(barCode);
list1.setBusinesstype(landBusinesstypeList.getBusinesstype());
list1.setCocode(landBusinesstypeList.getCocode());
... ... @@ -299,13 +306,14 @@ public class LandBusinesstypeListController extends BaseController {
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("");
list1.setStartport(startport);
list1.setStartsatation(startStation);
list2.setStartport(startport);
list2.setStartsatation(startStation);
list2.setEndport(endport);
list2.setEndstation(endStation);
list2.setProdectTime(new Date());
... ... @@ -323,7 +331,7 @@ public class LandBusinesstypeListController extends BaseController {
//first entry
String messageId = dateTimeFormat();
String mainfistList = landBusinesstypeList.getMasterList();
System.out.println(mainfistList);
String isfull = landBusinesstypeList.getIsfull();
landBusinesstypeList.setMassageId(messageId);
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
landBusinesstypeList.setBarcode(barCode);
... ... @@ -337,6 +345,7 @@ public class LandBusinesstypeListController extends BaseController {
list.setIsDelete("0");
list.setIsvalid("0");
list.setBarcode(barCode);
list.setIsfull(isfull);
list.setBusinesstype(landBusinesstypeList.getBusinesstype());
list.setCocode(landBusinesstypeList.getCocode());
list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
... ... @@ -361,7 +370,8 @@ public class LandBusinesstypeListController extends BaseController {
landBusinesstypeList.setMassageId(messageId);
String mainfistList = landBusinesstypeList.getMasterList();
String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
// String barCode = messageId;
//String barCode = messageId;
String isfull = landBusinesstypeList.getIsfull();
landBusinesstypeList.setBarcode(barCode);
landBusinesstypeListService.save(landBusinesstypeList);
insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList);
... ... @@ -371,6 +381,7 @@ public class LandBusinesstypeListController extends BaseController {
list.setAgentno(landBusinesstypeList.getAgentno());
list.setIsDelete("0");
list.setIsvalid("0");
list.setIsfull(isfull);
list.setBarcode(barCode);
list.setBusinesstype(landBusinesstypeList.getBusinesstype());
list.setCocode(landBusinesstypeList.getCocode());
... ... @@ -396,15 +407,27 @@ public class LandBusinesstypeListController extends BaseController {
}
public void insertVm(String id ,String frameNo,String mainfistList) {
veMainService.deleteById(id);
List<VehicleMainifist> vmList = veMainService.selectByBueId(id);
if(mainfistList.length()>0) {
String[] list = mainfistList.split(",");
for (int i = 0; i < list.length; i++) {
VehicleMainifist vehicleMainifist = new VehicleMainifist();
vehicleMainifist.setBusinessId(id);
vehicleMainifist.setBusinessNum(frameNo);
vehicleMainifist.setMainifist(list[i]);
veMainService.save(vehicleMainifist);
String[] list = mainfistList.replace("，", ",").split(",");
if(vmList.size()>list.length) {
for (int j = 0; j < vmList.size(); j++) {
for (int i = 0; i < list.length; i++) {
if(vmList.get(j).getMainifist() != list[i]) {
veMainService.deleteEntry(vmList.get(j));
}
VehicleMainifist vm = veMainService.selectByVm(id,list[i]);
if(vm==null) {
VehicleMainifist vehicleMainifist = new VehicleMainifist();
vehicleMainifist.setBusinessId(id);
vehicleMainifist.setBusinessNum(frameNo);
vehicleMainifist.setMainifist(list[i]);
veMainService.save(vehicleMainifist);
}
}
}
}
}
}
... ...
... ... @@ -20,4 +20,5 @@ import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
public interface BayonetDao extends CrudDao<Bayonet> {
List<Bayonet> findByYardId(@Param("yardId")String yardId);
Bayonet findByYardAndName(@Param("yardId")String yardId,@Param("name")String Name);
int update(Bayonet bayonet);
}
\ No newline at end of file
... ...
... ... @@ -69,5 +69,12 @@ public class Bayonet extends DataEntity<Bayonet> {
public void setYard(Yard yard) {
this.yard = yard;
}
@Override
public String toString() {
return "Bayonet [yard=" + yard + ", yardId=" + yardId + ", name=" + name + ", channel=" + channel + "]";
}
}
\ No newline at end of file
... ...
... ... @@ -3,16 +3,15 @@
*/
package com.thinkgem.jeesite.modules.yard.service;
import java.util.List;
import com.thinkgem.jeesite.common.persistence.Page;
import com.thinkgem.jeesite.common.service.CrudService;
import com.thinkgem.jeesite.modules.yard.dao.BayonetDao;
import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.thinkgem.jeesite.common.persistence.Page;
import com.thinkgem.jeesite.common.service.CrudService;
import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
import com.thinkgem.jeesite.modules.yard.dao.BayonetDao;
import java.util.List;
/**
* 卡口管理Service
... ... @@ -34,8 +33,6 @@ public class BayonetService extends CrudService<BayonetDao, Bayonet> {
return super.findList(bayonet);
}
public Page<Bayonet> findPage(Page<Bayonet> page, Bayonet bayonet) {
return super.findPage(page, bayonet);
}
... ... @@ -49,7 +46,10 @@ public class BayonetService extends CrudService<BayonetDao, Bayonet> {
public void delete(Bayonet bayonet) {
super.delete(bayonet);
}
@Transactional(readOnly = false)
public void update(Bayonet bayonet){
dao.update(bayonet);
}
@Transactional(readOnly = false)
public List<Bayonet> findByYardId(String yardId) {
return dao.findByYardId(yardId);
... ...
... ... @@ -3,11 +3,14 @@
*/
package com.thinkgem.jeesite.modules.yard.web;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.thinkgem.jeesite.common.config.Global;
import com.thinkgem.jeesite.common.persistence.Page;
import com.thinkgem.jeesite.common.utils.StringUtils;
import com.thinkgem.jeesite.common.web.BaseController;
import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
import com.thinkgem.jeesite.modules.yard.entity.Yard;
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.stereotype.Controller;
... ... @@ -17,14 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.thinkgem.jeesite.common.config.Global;
import com.thinkgem.jeesite.common.persistence.Page;
import com.thinkgem.jeesite.common.web.BaseController;
import com.thinkgem.jeesite.common.utils.StringUtils;
import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
import com.thinkgem.jeesite.modules.yard.entity.Yard;
import com.thinkgem.jeesite.modules.yard.service.BayonetService;
import com.thinkgem.jeesite.modules.yard.service.YardService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 卡口管理Controller
... ... @@ -66,7 +64,6 @@ public class BayonetController extends BaseController {
public String form(Bayonet bayonet, Model model) {
Yard yard = new Yard();
List<Yard> yardList = yardService.findList(yard);
System.out.println(yardList);
model.addAttribute("yardList", yardList);
model.addAttribute("bayonet", bayonet);
return "modules/yard/bayonetForm";
... ... @@ -78,7 +75,11 @@ public class BayonetController extends BaseController {
if (!beanValidator(model, bayonet)){
return form(bayonet, model);
}
bayonetService.save(bayonet);
if (bayonet.getId().length()>0) {
bayonetService.update(bayonet);
}else {
bayonetService.save(bayonet);
}
addMessage(redirectAttributes, "保存卡口成功");
return "redirect:"+Global.getAdminPath()+"/yard/bayonet/?repage";
}
... ...
... ... @@ -12,7 +12,7 @@
#mysql database setting
jdbc.type=mysql
jdbc.driver=com.mysql.cj.jdbc.Driver
jdbc.url=jdbc:mysql://10.50.7.70:3306/station?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true
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
jdbc.username=station
jdbc.password=station@10.50.7.70
... ...
<?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.massage_id AS "massageId",
<sql id="landBusinesstypeListColumns">
a.id AS "id",
a.massage_id AS "massageId",
a.trailer_frame_no AS "trailerFrameNo",
a.trailer_license_no AS "trailerLicenseNo",
a.master_list AS "masterList",
a.prodect_time AS "prodectTime",
a.agentno AS "agentno",
a.is_delete AS "isDelete",
a.agentno AS "agentno",
a.agentname AS "agentname",
a.cocode AS "cocode",
a.drivername AS "drivername",
... ... @@ -21,13 +22,18 @@
a.aisle AS "aisle",
a.businesstype AS "businesstype",
a.turnoverflag AS "turnoverflag",
a.contrastflag AS "contrastflag",
a.barcode AS "barcode",
a.contrastflag AS "contrastflag",
a.create_by AS "createBy.id",
a.create_date AS "createDate",
a.update_by AS "updateBy.id",
a.update_date AS "updateDate",
a.isvalid AS "isvalid"
a.isvalid AS "isvalid",
a.aislewt AS "aislewt",
a.isfull AS "isfull",
a.remark AS "remark",
a.remark1 AS "remark1",
a.remark2 AS "remark2"
</sql>
<sql id="landBusinesstypeListJoins">
... ... @@ -40,37 +46,13 @@
<include refid="landBusinesstypeListJoins"/>
WHERE a.id = #{id}
</select>
<select id="findList" resultType="LandBusinesstypeList">
SELECT
<include refid="landBusinesstypeListColumns"/>
FROM land_businesstype_list a
<include refid="landBusinesstypeListJoins"/>
<where>
a.is_delete = "0"
<if test="trailerFrameNo !=null and trailerFrameNo !=''">
and trailer_frame_no = #{trailerFrameNo}
</if>
<if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
and create_by = #{createBy.id}
</if>
</where>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY a.create_date DESC
</otherwise>
</choose>
</select>
<select id="findByStatus" resultType="LandBusinesstypeList">
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>
... ... @@ -88,6 +70,24 @@
order by a.create_date DESC
</select>
<select id="findList" resultType="LandBusinesstypeList">
SELECT
<include refid="landBusinesstypeListColumns"/>
FROM land_businesstype_list a
<include refid="landBusinesstypeListJoins"/>
<where>
a.is_delete = "0"
</where>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY a.update_date DESC
</otherwise>
</choose>
</select>
<select id="findAllList" resultType="LandBusinesstypeList">
SELECT
<include refid="landBusinesstypeListColumns"/>
... ... @@ -110,17 +110,17 @@
UPDATE land_businesstype_list set is_delete = "1",isvalid = "1"
WHERE barcode = #{barcode}
</update>
<insert id="insert">
INSERT INTO land_businesstype_list(
massage_id,
id,
massage_id,
trailer_frame_no,
trailer_license_no,
master_list,
prodect_time,
agentno,
is_delete,
agentno,
agentname,
cocode,
drivername,
... ... @@ -132,22 +132,27 @@
aisle,
businesstype,
turnoverflag,
contrastflag,
barcode,
contrastflag,
create_by,
create_date,
update_by,
update_date,
isvalid
isvalid,
aislewt,
isfull,
remark,
remark1,
remark2
) VALUES (
#{massageId},
#{id},
#{massageId},
#{trailerFrameNo},
#{trailerLicenseNo},
#{masterList},
#{prodectTime},
#{agentno},
#{isDelete},
#{agentno},
#{agentname},
#{cocode},
#{drivername},
... ... @@ -159,13 +164,18 @@
#{aisle},
#{businesstype},
#{turnoverflag},
#{contrastflag},
#{barcode},
#{contrastflag},
#{createBy.id},
#{createDate},
#{updateBy.id},
#{updateDate},
#{isvalid}
#{isvalid},
#{aislewt},
#{isfull},
#{remark},
#{remark1},
#{remark2}
)
</insert>
... ... @@ -176,8 +186,8 @@
trailer_license_no = #{trailerLicenseNo},
master_list = #{masterList},
prodect_time = #{prodectTime},
agentno = #{agentno},
is_delete = #{isDelete},
agentno = #{agentno},
agentname = #{agentname},
cocode = #{cocode},
drivername = #{drivername},
... ... @@ -189,11 +199,16 @@
aisle = #{aisle},
businesstype = #{businesstype},
turnoverflag = #{turnoverflag},
contrastflag = #{contrastflag},
barcode = #{barcode},
contrastflag = #{contrastflag},
update_by = #{updateBy.id},
update_date = #{updateDate},
isvalid = #{isvalid}
isvalid = #{isvalid},
aislewt = #{aislewt},
isfull = #{isfull},
remark = #{remark},
remark1 = #{remark1},
remark2 = #{remark2}
WHERE id = #{id}
</update>
... ... @@ -201,5 +216,5 @@
DELETE FROM land_businesstype_list
WHERE id = #{id}
</update>
</mapper>
\ No newline at end of file
... ...
... ... @@ -4,7 +4,7 @@
<sql id="bayonetColumns">
a.*,
b.id AS "yard.id",
b.stationid AS "yard.id",
b.name AS "yard.name",
b.customs_code AS "yard.customsCode"
</sql>
... ...
... ... @@ -99,32 +99,56 @@ th, td {
<form:hidden path="id" />
<sys:message content="${message}" />
<div class="control-group">
<label class="control-label">车牌号：</label>
<div class="controls">
<form:select path="trailerFrameNo" htmlEscape="false" maxlength="64" class="input-xlarge required" id="frameNo" >
<form:option value="" label="--请选择--" />
<form:options items="${veList}" itemLabel="domesticLisenceNo" itemValue="domesticLisenceNo" htmlEscape="false" />
</form:select>
<span class="help-inline"><font color="red">*</font></span>
<span class="help-inline" id="message" style="color: red"></span>
</div>
</div>
<div class="control-group">
<label class="control-label">申请时间：</label>
<div class="controls">
<input name="prodectTime" type="text" readonly="readonly"
maxlength="20" class="input-xlarge Wdate "
value="<fmt:formatDate value="${landBusinesstypeList.prodectTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
<div class="row-fluid">
<div class="span12">
<div class="span6">
<label class="control-label">车牌号：</label>
<div class="controls">
<form:select path="trailerFrameNo" htmlEscape="false" maxlength="64" class="input-xlarge required" id="frameNo" >
<form:option value="" label="--请选择--" />
<form:options items="${veList}" itemLabel="domesticLisenceNo" itemValue="domesticLisenceNo" htmlEscape="false" />
</form:select>
<span class="help-inline"><font color="red">*</font></span>
<span class="help-inline" id="message" style="color: red"></span>
</div>
</div>
<div class="span6">
<label class="control-label">业务类型：</label>
<div class="controls">
<form:select path="businesstype" class="input-xlarge required" id="ieType">
<form:option value="" label="--请选择--" />
<form:option value="进口提货" label="进口提货" />
<form:option value="出口送货" label="出口送货" />
<form:option value="进口流转" label="进口流转" />
<form:option value="出口流转" label="出口流转" />
</form:select>
</div>
</div>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label">所在企业代码：</label>
<div class="controls">
<form:input path="cocode" htmlEscape="false" maxlength="32"
class="input-xlarge " id="cocode" />
<span class="help-inline"><font color="red">*</font></span>
<div class="row-fluid">
<div class="span12">
<div class="span6">
<label class="control-label">申请时间：</label>
<div class="controls">
<input name="prodectTime" type="text" readonly="readonly"
maxlength="20" class="input-xlarge Wdate "
value="<fmt:formatDate value="${landBusinesstypeList.prodectTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
</div>
</div>
<div class="span6">
<%-- <label class="control-label">所在企业代码：</label>
<div class="controls">
<form:input path="cocode" htmlEscape="false" maxlength="32"
class="input-xlarge " id="cocode" />
<span class="help-inline"><font color="red">*</font></span>
</div> --%>
</div>
</div>
</div>
</div>
<div class="control-group">
... ... @@ -239,29 +263,27 @@ th, td {
</div>
</div>
<div class="span6">
<label class="control-label">业务类型：</label>
<label class="control-label">进出场：</label>
<div class="controls">
<form:select path="businesstype" class="input-xlarge" id="ieType">
<form:select path="turnoverflag" class="input-xlarge">
<form:option value="" label="--请选择--" />
<form:option value="进口提货" label="进口提货" />
<form:option value="出口送货" label="出口送货" />
<form:option value="进口流转" label="进口流转" />
<form:option value="出口流转" label="出口流转" />
<form:option value="I" label="进场站" selected = "selected"/>
<form:option value="E" label="出场站"/>
</form:select>
<span class="help-inline"><font color="red">无需改动</font></span>
</div>
</div>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label">进出场：</label>
<label class="control-label">是否空车：</label>
<div class="controls">
<form:select path="turnoverflag" class="input-xlarge">
<form:select path="isfull" class="input-xlarge">
<form:option value="" label="--请选择--" />
<form:option value="I" label="进场站" selected = "selected"/>
<form:option value="E" label="出场站"/>
<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="control-group">
... ... @@ -306,18 +328,16 @@ th, td {
var index = data.html.lastIndexOf(">");
var str = data.html.substring(index + 1, data.html.length);
if(data.list !=undefined){
$("#agentName").val(data.list[0].agentname)
$("#agentno").val(data.list[0].agentno)
$("#driverid").val(data.list[0].driverid)
$("#drivername").val(data.list[0].drivername)
$("#cocode").val(data.list[0].coCode)
$("#agentName").val(data.list[0].proposer)
$("#agentno").val(data.list[0].coCode)
$("#driverid").val(data.list[0].veOwnerNo)
$("#drivername").val(data.list[0].veOwnerName)
}
if(data.list ==undefined){
$("#agentName").val("");
$("#agentno").val("");
$("#driverid").val("");
$("#drivername").val("");
$("#cocode").val("");
}
$("#message").html(str);
},
... ... @@ -362,7 +382,7 @@ th, td {
if(str%7 != endStr){
$(".error_div").css("display","block");
$("#error_p").html("输入主单号不符合模七校验");
$("#putMaster").val(" ");
//$("#putMaster").val(" ");
}
})
$("#select").click(function(){
... ... @@ -374,7 +394,8 @@ th, td {
}else if(ieType=="出口送货" | ieType=="出口流转"){
ieType="E";
}
var url = 'http://tjfx.15miaoo.com:8003/tj/orig/orig';
var url = "http://tjfx.15miaoo.com:8003/tj/orig/orig";
//var url = "http://10.50.3.64:8080/tj/orig/orig";
var xhr = new XMLHttpRequest();
// 访问nginx中的代理服务器
xhr.open('get', url+'?waybill='+masterNum+'&imp='+ieType, true);
... ... @@ -409,7 +430,6 @@ th, td {
}
}
}
})
function addData(btn){
... ...
... ... @@ -48,7 +48,7 @@
<th>业务类型</th>
<th>进出场站</th>
<th>已进已出</th>
<th>创建时间</th>
<th>更新时间</th>
<shiro:hasPermission name="land:landBusinesstypeList:edit"><th>操作</th></shiro:hasPermission>
</tr>
</thead>
... ... @@ -91,7 +91,7 @@
</td>
<td>${landBusinesstypeList.contrastflag}</td>
<td>
<fmt:formatDate value="${landBusinesstypeList.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
<fmt:formatDate value="${landBusinesstypeList.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
</td>
<shiro:hasPermission name="land:landBusinesstypeList:edit"><td>
<c:if test="${landBusinesstypeList.contrastflag==null ||landBusinesstypeList.contrastflag==''}">
... ...
... ... @@ -78,13 +78,13 @@ input {
<h4>车辆信息</h4>
</div>
<div class="control-group">
<label class="row-lable">主管海关代码：</label>
<label class="row-lable">海关代码：</label>
<div class="row-controls">
<form:input path="mainPort" htmlEscape="false" maxlength="4"
class="input-large required" id="mainPort" />
class="input-large" id="mainPort" value="4604"/>
<span class="help-inline"><font color="red">*</font></span>
</div>
<label class="row-lable">企业代码：</label>
<label class="row-lable">海关货代备案代码：</label>
<div class="row-controls">
<form:input path="coCode" htmlEscape="false" maxlength="20"
class="input-large required" />
... ... @@ -113,26 +113,25 @@ input {
</span> <label class="row-lable">车主联系电话：</label> <span
class="row-controls"> <form:input path="ownerInsideTel"
htmlEscape="false" maxlength="32"
class="input-large required phone" /> <span class="help-inline"><font
class="input-large required" /> <span class="help-inline"><font
color="red">*</font></span>
</span>
</div>
<div class="control-group">
<label class="row-lable">核定载货重量：</label> <span
class="row-controls">
<form:input path="veTon" htmlEscape="false" maxlength="10"
class="input-large required numberCheck" placeholder="货车核载单位为：kg" />
<span class="help-inline"><font color="red">*</font></span>
</span>
<label class="row-lable">自重（空车重量）：</label>
<label class="row-lable">自重（空车重量）：</label>
<span class="row-controls">
<form:input path="selfWt" htmlEscape="false" maxlength="10" placeholder="单位：kg"
class="input-large required numberCheck" />
<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" />
</span>
</div>
<div class="control-group">
<label class="row-lable">申请人：</label>
<label class="row-lable">货代名称：</label>
<span class="row-controls">
<form:input path="proposer" htmlEscape="false" maxlength="32"
class="input-large required" />
... ...