zhangFan / station · 提交

转到一个项目

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

BY XYH

内嵌 并排对比
正在显示 9 个修改的文件 包含 658 行增加 和 181 行删除
@@ -15,7 +15,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity; @@ -15,7 +15,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
15 * @version 2019-02-12 15 * @version 2019-02-12
16 */ 16 */
17 public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { 17 public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
18 - 18 +
19 private static final long serialVersionUID = 1L; 19 private static final long serialVersionUID = 1L;
20 private String massageId; // 主键 20 private String massageId; // 主键
21 private String trailerFrameNo; // 车牌号 21 private String trailerFrameNo; // 车牌号
@@ -43,7 +43,27 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -43,7 +43,27 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
43 private String remark; // 预留字段 43 private String remark; // 预留字段
44 private String remark1; // 预留字段 44 private String remark1; // 预留字段
45 private String remark2; // 预留字段 45 private String remark2; // 预留字段
46 - 46 +
  47 + public String getIsthree() {
  48 + return isthree;
  49 + }
  50 +
  51 + public void setIsthree(String isthree) {
  52 + this.isthree = isthree;
  53 + }
  54 +
  55 + private String isthree;
  56 +
  57 + public String getRemark3() {
  58 + return remark3;
  59 + }
  60 +
  61 + public void setRemark3(String remark3) {
  62 + this.remark3 = remark3;
  63 + }
  64 +
  65 + private String remark3;
  66 +
47 public LandBusinesstypeList() { 67 public LandBusinesstypeList() {
48 super(); 68 super();
49 } 69 }
@@ -60,7 +80,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -60,7 +80,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
60 public void setMassageId(String massageId) { 80 public void setMassageId(String massageId) {
61 this.massageId = massageId; 81 this.massageId = massageId;
62 } 82 }
63 - 83 +
64 @Length(min=0, max=32, message="车牌号长度必须介于 0 和 32 之间") 84 @Length(min=0, max=32, message="车牌号长度必须介于 0 和 32 之间")
65 public String getTrailerFrameNo() { 85 public String getTrailerFrameNo() {
66 return trailerFrameNo; 86 return trailerFrameNo;
@@ -69,7 +89,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -69,7 +89,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
69 public void setTrailerFrameNo(String trailerFrameNo) { 89 public void setTrailerFrameNo(String trailerFrameNo) {
70 this.trailerFrameNo = trailerFrameNo; 90 this.trailerFrameNo = trailerFrameNo;
71 } 91 }
72 - 92 +
73 @Length(min=0, max=64, message="车架号长度必须介于 0 和 64 之间") 93 @Length(min=0, max=64, message="车架号长度必须介于 0 和 64 之间")
74 public String getTrailerLicenseNo() { 94 public String getTrailerLicenseNo() {
75 return trailerLicenseNo; 95 return trailerLicenseNo;
@@ -78,7 +98,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -78,7 +98,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
78 public void setTrailerLicenseNo(String trailerLicenseNo) { 98 public void setTrailerLicenseNo(String trailerLicenseNo) {
79 this.trailerLicenseNo = trailerLicenseNo; 99 this.trailerLicenseNo = trailerLicenseNo;
80 } 100 }
81 - 101 +
82 @Length(min=0, max=1024, message="主单列表长度必须介于 0 和 1024 之间") 102 @Length(min=0, max=1024, message="主单列表长度必须介于 0 和 1024 之间")
83 public String getMasterList() { 103 public String getMasterList() {
84 return masterList; 104 return masterList;
@@ -87,7 +107,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -87,7 +107,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
87 public void setMasterList(String masterList) { 107 public void setMasterList(String masterList) {
88 this.masterList = masterList; 108 this.masterList = masterList;
89 } 109 }
90 - 110 +
91 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") 111 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
92 public Date getProdectTime() { 112 public Date getProdectTime() {
93 return prodectTime; 113 return prodectTime;
@@ -96,7 +116,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -96,7 +116,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
96 public void setProdectTime(Date prodectTime) { 116 public void setProdectTime(Date prodectTime) {
97 this.prodectTime = prodectTime; 117 this.prodectTime = prodectTime;
98 } 118 }
99 - 119 +
100 @Length(min=0, max=32, message="货代代码长度必须介于 0 和 32 之间") 120 @Length(min=0, max=32, message="货代代码长度必须介于 0 和 32 之间")
101 public String getAgentno() { 121 public String getAgentno() {
102 return agentno; 122 return agentno;
@@ -105,7 +125,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -105,7 +125,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
105 public void setAgentno(String agentno) { 125 public void setAgentno(String agentno) {
106 this.agentno = agentno; 126 this.agentno = agentno;
107 } 127 }
108 - 128 +
109 @Length(min=0, max=2, message="删除标识0：未删除，1删除长度必须介于 0 和 2 之间") 129 @Length(min=0, max=2, message="删除标识0：未删除，1删除长度必须介于 0 和 2 之间")
110 public String getIsDelete() { 130 public String getIsDelete() {
111 return isDelete; 131 return isDelete;
@@ -114,7 +134,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -114,7 +134,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
114 public void setIsDelete(String isDelete) { 134 public void setIsDelete(String isDelete) {
115 this.isDelete = isDelete; 135 this.isDelete = isDelete;
116 } 136 }
117 - 137 +
118 @Length(min=0, max=255, message="货代名称长度必须介于 0 和 255 之间") 138 @Length(min=0, max=255, message="货代名称长度必须介于 0 和 255 之间")
119 public String getAgentname() { 139 public String getAgentname() {
120 return agentname; 140 return agentname;
@@ -123,7 +143,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -123,7 +143,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
123 public void setAgentname(String agentname) { 143 public void setAgentname(String agentname) {
124 this.agentname = agentname; 144 this.agentname = agentname;
125 } 145 }
126 - 146 +
127 @Length(min=0, max=32, message="所在企业代码长度必须介于 0 和 32 之间") 147 @Length(min=0, max=32, message="所在企业代码长度必须介于 0 和 32 之间")
128 public String getCocode() { 148 public String getCocode() {
129 return cocode; 149 return cocode;
@@ -132,7 +152,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -132,7 +152,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
132 public void setCocode(String cocode) { 152 public void setCocode(String cocode) {
133 this.cocode = cocode; 153 this.cocode = cocode;
134 } 154 }
135 - 155 +
136 @Length(min=0, max=32, message="驾驶员姓名长度必须介于 0 和 32 之间") 156 @Length(min=0, max=32, message="驾驶员姓名长度必须介于 0 和 32 之间")
137 public String getDrivername() { 157 public String getDrivername() {
138 return drivername; 158 return drivername;
@@ -141,7 +161,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -141,7 +161,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
141 public void setDrivername(String drivername) { 161 public void setDrivername(String drivername) {
142 this.drivername = drivername; 162 this.drivername = drivername;
143 } 163 }
144 - 164 +
145 @Length(min=0, max=32, message="驾驶员ID长度必须介于 0 和 32 之间") 165 @Length(min=0, max=32, message="驾驶员ID长度必须介于 0 和 32 之间")
146 public String getDriverid() { 166 public String getDriverid() {
147 return driverid; 167 return driverid;
@@ -150,7 +170,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -150,7 +170,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
150 public void setDriverid(String driverid) { 170 public void setDriverid(String driverid) {
151 this.driverid = driverid; 171 this.driverid = driverid;
152 } 172 }
153 - 173 +
154 @Length(min=0, max=4, message="起始海关代码长度必须介于 0 和 4 之间") 174 @Length(min=0, max=4, message="起始海关代码长度必须介于 0 和 4 之间")
155 public String getStartport() { 175 public String getStartport() {
156 return startport; 176 return startport;
@@ -159,7 +179,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -159,7 +179,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
159 public void setStartport(String startport) { 179 public void setStartport(String startport) {
160 this.startport = startport; 180 this.startport = startport;
161 } 181 }
162 - 182 +
163 @Length(min=0, max=4, message="目的关区代码长度必须介于 0 和 4 之间") 183 @Length(min=0, max=4, message="目的关区代码长度必须介于 0 和 4 之间")
164 public String getEndport() { 184 public String getEndport() {
165 return endport; 185 return endport;
@@ -168,7 +188,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -168,7 +188,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
168 public void setEndport(String endport) { 188 public void setEndport(String endport) {
169 this.endport = endport; 189 this.endport = endport;
170 } 190 }
171 - 191 +
172 @Length(min=0, max=64, message="起始场站长度必须介于 0 和 64 之间") 192 @Length(min=0, max=64, message="起始场站长度必须介于 0 和 64 之间")
173 public String getStartsatation() { 193 public String getStartsatation() {
174 return startsatation; 194 return startsatation;
@@ -177,7 +197,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -177,7 +197,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
177 public void setStartsatation(String startsatation) { 197 public void setStartsatation(String startsatation) {
178 this.startsatation = startsatation; 198 this.startsatation = startsatation;
179 } 199 }
180 - 200 +
181 @Length(min=0, max=64, message="目的场站长度必须介于 0 和 64 之间") 201 @Length(min=0, max=64, message="目的场站长度必须介于 0 和 64 之间")
182 public String getEndstation() { 202 public String getEndstation() {
183 return endstation; 203 return endstation;
@@ -186,7 +206,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -186,7 +206,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
186 public void setEndstation(String endstation) { 206 public void setEndstation(String endstation) {
187 this.endstation = endstation; 207 this.endstation = endstation;
188 } 208 }
189 - 209 +
190 @Length(min=0, max=32, message="通道/卡口长度必须介于 0 和 32 之间") 210 @Length(min=0, max=32, message="通道/卡口长度必须介于 0 和 32 之间")
191 public String getAisle() { 211 public String getAisle() {
192 return aisle; 212 return aisle;
@@ -195,7 +215,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -195,7 +215,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
195 public void setAisle(String aisle) { 215 public void setAisle(String aisle) {
196 this.aisle = aisle; 216 this.aisle = aisle;
197 } 217 }
198 - 218 +
199 @Length(min=0, max=10, message="业务类型长度必须介于 0 和 10 之间") 219 @Length(min=0, max=10, message="业务类型长度必须介于 0 和 10 之间")
200 public String getBusinesstype() { 220 public String getBusinesstype() {
201 return businesstype; 221 return businesstype;
@@ -204,7 +224,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -204,7 +224,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
204 public void setBusinesstype(String businesstype) { 224 public void setBusinesstype(String businesstype) {
205 this.businesstype = businesstype; 225 this.businesstype = businesstype;
206 } 226 }
207 - 227 +
208 @Length(min=0, max=5, message="进出场标识长度必须介于 0 和 5 之间") 228 @Length(min=0, max=5, message="进出场标识长度必须介于 0 和 5 之间")
209 public String getTurnoverflag() { 229 public String getTurnoverflag() {
210 return turnoverflag; 230 return turnoverflag;
@@ -213,7 +233,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -213,7 +233,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
213 public void setTurnoverflag(String turnoverflag) { 233 public void setTurnoverflag(String turnoverflag) {
214 this.turnoverflag = turnoverflag; 234 this.turnoverflag = turnoverflag;
215 } 235 }
216 - 236 +
217 @Length(min=0, max=5, message="校验标识长度必须介于 0 和 5 之间") 237 @Length(min=0, max=5, message="校验标识长度必须介于 0 和 5 之间")
218 public String getContrastflag() { 238 public String getContrastflag() {
219 return contrastflag; 239 return contrastflag;
@@ -222,7 +242,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -222,7 +242,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
222 public void setContrastflag(String contrastflag) { 242 public void setContrastflag(String contrastflag) {
223 this.contrastflag = contrastflag; 243 this.contrastflag = contrastflag;
224 } 244 }
225 - 245 +
226 @Length(min=0, max=32, message="二维码长度必须介于 0 和 32 之间") 246 @Length(min=0, max=32, message="二维码长度必须介于 0 和 32 之间")
227 public String getBarcode() { 247 public String getBarcode() {
228 return barcode; 248 return barcode;
@@ -231,7 +251,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -231,7 +251,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
231 public void setBarcode(String barcode) { 251 public void setBarcode(String barcode) {
232 this.barcode = barcode; 252 this.barcode = barcode;
233 } 253 }
234 - 254 +
235 @Length(min=0, max=2, message="是否失效：0：有效，1：无效长度必须介于 0 和 2 之间") 255 @Length(min=0, max=2, message="是否失效：0：有效，1：无效长度必须介于 0 和 2 之间")
236 public String getIsvalid() { 256 public String getIsvalid() {
237 return isvalid; 257 return isvalid;
@@ -240,7 +260,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -240,7 +260,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
240 public void setIsvalid(String isvalid) { 260 public void setIsvalid(String isvalid) {
241 this.isvalid = isvalid; 261 this.isvalid = isvalid;
242 } 262 }
243 - 263 +
244 public Double getAislewt() { 264 public Double getAislewt() {
245 return aislewt; 265 return aislewt;
246 } 266 }
@@ -248,7 +268,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -248,7 +268,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
248 public void setAislewt(Double aislewt) { 268 public void setAislewt(Double aislewt) {
249 this.aislewt = aislewt; 269 this.aislewt = aislewt;
250 } 270 }
251 - 271 +
252 @Length(min=0, max=1, message="是否空车：0空车，1不空车长度必须介于 0 和 1 之间") 272 @Length(min=0, max=1, message="是否空车：0空车，1不空车长度必须介于 0 和 1 之间")
253 public String getIsfull() { 273 public String getIsfull() {
254 return isfull; 274 return isfull;
@@ -257,7 +277,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -257,7 +277,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
257 public void setIsfull(String isfull) { 277 public void setIsfull(String isfull) {
258 this.isfull = isfull; 278 this.isfull = isfull;
259 } 279 }
260 - 280 +
261 @Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间") 281 @Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
262 public String getRemark() { 282 public String getRemark() {
263 return remark; 283 return remark;
@@ -266,7 +286,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -266,7 +286,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
266 public void setRemark(String remark) { 286 public void setRemark(String remark) {
267 this.remark = remark; 287 this.remark = remark;
268 } 288 }
269 - 289 +
270 @Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间") 290 @Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
271 public String getRemark1() { 291 public String getRemark1() {
272 return remark1; 292 return remark1;
@@ -275,7 +295,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -275,7 +295,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
275 public void setRemark1(String remark1) { 295 public void setRemark1(String remark1) {
276 this.remark1 = remark1; 296 this.remark1 = remark1;
277 } 297 }
278 - 298 +
279 @Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间") 299 @Length(min=0, max=32, message="预留字段长度必须介于 0 和 32 之间")
280 public String getRemark2() { 300 public String getRemark2() {
281 return remark2; 301 return remark2;
@@ -284,4 +304,4 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -284,4 +304,4 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
284 public void setRemark2(String remark2) { 304 public void setRemark2(String remark2) {
285 this.remark2 = remark2; 305 this.remark2 = remark2;
286 } 306 }
287 -}  
  307 +}
@@ -27,6 +27,7 @@ import com.thinkgem.jeesite.modules.yard.service.BayonetService; @@ -27,6 +27,7 @@ import com.thinkgem.jeesite.modules.yard.service.BayonetService;
27 import com.thinkgem.jeesite.modules.yard.service.YardService; 27 import com.thinkgem.jeesite.modules.yard.service.YardService;
28 import org.apache.shiro.authz.annotation.RequiresPermissions; 28 import org.apache.shiro.authz.annotation.RequiresPermissions;
29 import org.springframework.beans.factory.annotation.Autowired; 29 import org.springframework.beans.factory.annotation.Autowired;
  30 +import org.springframework.beans.factory.annotation.Value;
30 import org.springframework.stereotype.Controller; 31 import org.springframework.stereotype.Controller;
31 import org.springframework.ui.Model; 32 import org.springframework.ui.Model;
32 import org.springframework.web.bind.annotation.ModelAttribute; 33 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -72,6 +73,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -72,6 +73,7 @@ public class LandBusinesstypeListController extends BaseController {
72 @Autowired 73 @Autowired
73 private OfficeService officeService; 74 private OfficeService officeService;
74 75
  76 +
75 private static final String TYPE1 = "调拨业务"; 77 private static final String TYPE1 = "调拨业务";
76 private static final String TYPE2 = "进口提货"; 78 private static final String TYPE2 = "进口提货";
77 private static final String TYPE3 = "出口送货"; 79 private static final String TYPE3 = "出口送货";
@@ -270,18 +272,33 @@ public class LandBusinesstypeListController extends BaseController { @@ -270,18 +272,33 @@ public class LandBusinesstypeListController extends BaseController {
270 } 272 }
271 } 273 }
272 flag = true; 274 flag = true;
273 - } else { 275 + } else {//西-综 分拨 综-西 调拨 4600329012 4600329012
274 if (TYPE1.equals(landBusinesstypeList.getBusinesstype())) { 276 if (TYPE1.equals(landBusinesstypeList.getBusinesstype())) {
275 - flag = insertType1(landBusinesstypeList); 277 + if(landBusinesstypeList.getStartsatation().equals("4600329012")||landBusinesstypeList.getEndstation().equals("4600329012")){
  278 + flag = insertTypeZD(landBusinesstypeList);
  279 + }else{
  280 + flag = insertType1(landBusinesstypeList);
  281 + }
  282 +
276 } 283 }
277 if (TYPE2.equals(landBusinesstypeList.getBusinesstype())) { 284 if (TYPE2.equals(landBusinesstypeList.getBusinesstype())) {
278 flag = insertType2(landBusinesstypeList); 285 flag = insertType2(landBusinesstypeList);
279 } 286 }
280 if (TYPE3.equals(landBusinesstypeList.getBusinesstype())) { 287 if (TYPE3.equals(landBusinesstypeList.getBusinesstype())) {
281 - flag = insertType3(landBusinesstypeList); 288 + if(landBusinesstypeList.getStartsatation().equals("4600329012")||landBusinesstypeList.getEndstation().equals("4600329012")){
  289 + if(landBusinesstypeList.getIsthree().equals("0")){
  290 + flag = insertTypeZE(landBusinesstypeList);
  291 + }else{
  292 + flag = insertTypeZE2(landBusinesstypeList);
  293 + }
  294 +
  295 + }else{
  296 + flag = insertType3(landBusinesstypeList);
  297 + }
  298 +
282 } 299 }
283 if (TYPE4.equals(landBusinesstypeList.getBusinesstype())) { 300 if (TYPE4.equals(landBusinesstypeList.getBusinesstype())) {
284 - flag = insertType1(landBusinesstypeList); 301 + flag = insertType6(landBusinesstypeList);
285 } 302 }
286 } 303 }
287 if (flag) { 304 if (flag) {
@@ -350,7 +367,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -350,7 +367,7 @@ public class LandBusinesstypeListController extends BaseController {
350 367
351 try { 368 try {
352 String messageId = dateTimeFormat(); 369 String messageId = dateTimeFormat();
353 - 370 + //String barCode = "abcd";
354 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId); 371 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
355 if (barCode.length() < 1 | barCode == null) { 372 if (barCode.length() < 1 | barCode == null) {
356 buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo()); 373 buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
@@ -460,12 +477,298 @@ public class LandBusinesstypeListController extends BaseController { @@ -460,12 +477,298 @@ public class LandBusinesstypeListController extends BaseController {
460 return true; 477 return true;
461 478
462 } 479 }
  480 + public boolean insertTypeZD(LandBusinesstypeList landBusinesstypeList) {
  481 +
  482 + try {
  483 + String messageId = dateTimeFormat();
  484 + //String barCode = "abcd";
  485 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
  486 + if (barCode.length() < 1 | barCode == null) {
  487 + buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
  488 + return false;
  489 + }
  490 + // first entry in
  491 + String mainfistList = landBusinesstypeList.getMasterList();
  492 + String startport = landBusinesstypeList.getStartport();
  493 + String endport = landBusinesstypeList.getEndport();
  494 + String startStation = landBusinesstypeList.getStartsatation();
  495 + String endStation = landBusinesstypeList.getEndstation();
  496 + String isfull = landBusinesstypeList.getIsfull();
  497 +
  498 + landBusinesstypeList.setMassageId(messageId);
  499 + landBusinesstypeList.setStartport("");
  500 + landBusinesstypeList.setStartsatation("");
  501 + landBusinesstypeList.setEndport(startport);
  502 + landBusinesstypeList.setEndstation(startStation);
  503 + landBusinesstypeList.setMasterList("");
  504 + landBusinesstypeList.setProdectTime(new Date());
  505 + landBusinesstypeList.setBarcode(barCode);
  506 + landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "6号卡口-进").getChannel());
  507 + landBusinesstypeListService.save(landBusinesstypeList);
  508 + insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
  509 +
  510 + // second out
  511 + LandBusinesstypeList list = new LandBusinesstypeList();
  512 + list.setAgentname(landBusinesstypeList.getAgentname());
  513 + list.setAgentno(landBusinesstypeList.getAgentno());
  514 + list.setCocode(landBusinesstypeList.getCocode());
  515 + list.setIsDelete("0");
  516 + list.setIsvalid("0");
  517 + list.setIsfull(isfull);
  518 + list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  519 + list.setBusinesstype(landBusinesstypeList.getBusinesstype());
  520 + list.setCocode(landBusinesstypeList.getCocode());
  521 + list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  522 + list.setEndport(startport);
  523 + list.setEndstation(startStation);
  524 + list.setProdectTime(new Date());
  525 + list.setMasterList(mainfistList);
  526 + list.setDriverid(landBusinesstypeList.getDriverid());
  527 + list.setDrivername(landBusinesstypeList.getDrivername());
  528 + list.setAisle(bayService.findByYardAndName(startStation, "6号卡口-出").getChannel());
  529 + list.setTurnoverflag("E");
  530 + list.setMassageId(messageId);
  531 + list.setBarcode(barCode);
  532 + landBusinesstypeListService.save(list);
  533 +
  534 + // third
  535 + LandBusinesstypeList list1 = new LandBusinesstypeList();
  536 + list1.setAgentname(landBusinesstypeList.getAgentname());
  537 + list1.setAgentno(landBusinesstypeList.getAgentno());
  538 + list1.setCocode(landBusinesstypeList.getCocode());
  539 + list1.setIsDelete("0");
  540 + list1.setIsvalid("0");
  541 + list1.setIsfull(isfull);
  542 + list1.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  543 + list1.setBusinesstype(landBusinesstypeList.getBusinesstype());
  544 + list1.setCocode(landBusinesstypeList.getCocode());
  545 + list1.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  546 + list1.setStartport(startport);
  547 + list1.setStartsatation(startStation);
  548 + list1.setEndport(endport);
  549 + list1.setEndstation(endStation);
  550 + list1.setProdectTime(new Date());
  551 + list1.setMasterList(mainfistList);
  552 + list1.setDriverid(landBusinesstypeList.getDriverid());
  553 + list1.setDrivername(landBusinesstypeList.getDrivername());
  554 + list1.setAisle(bayService.findByYardAndName(endStation, "1号卡口-进").getChannel());
  555 + list1.setTurnoverflag("I");
  556 + list1.setMassageId(messageId);
  557 + list1.setBarcode(barCode);
  558 + landBusinesstypeListService.save(list1);
  559 +
  560 + // four
  561 + LandBusinesstypeList list2 = new LandBusinesstypeList();
  562 + list2.setAgentname(landBusinesstypeList.getAgentname());
  563 + list2.setAgentno(landBusinesstypeList.getAgentno());
  564 + list2.setCocode(landBusinesstypeList.getCocode());
  565 + list2.setIsDelete("0");
  566 + list2.setIsvalid("0");
  567 + list2.setIsfull(isfull);
  568 + list2.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  569 + list2.setBusinesstype(landBusinesstypeList.getBusinesstype());
  570 + list2.setCocode(landBusinesstypeList.getCocode());
  571 + list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  572 + list2.setStartport("");
  573 + list2.setStartsatation("");
  574 + list2.setStartport(startport);
  575 + list2.setStartsatation(startStation);
  576 + list2.setEndport(endport);
  577 + list2.setEndstation(endStation);
  578 + list2.setProdectTime(new Date());
  579 + list2.setMasterList("");
  580 + list2.setDriverid(landBusinesstypeList.getDriverid());
  581 + list2.setDrivername(landBusinesstypeList.getDrivername());
  582 + list2.setAisle(bayService.findByYardAndName(endStation, "1号卡口-出").getChannel());
  583 + list2.setTurnoverflag("E");
  584 + list2.setMassageId(messageId);
  585 + list2.setBarcode(barCode);
  586 + landBusinesstypeListService.save(list2);
  587 +
  588 +
  589 +
  590 + } catch (Exception e) {
  591 + e.printStackTrace();
  592 + }
  593 + return true;
  594 +
  595 + }
  596 +
  597 + public boolean insertType6(LandBusinesstypeList landBusinesstypeList){
  598 + try {
  599 + String messageId = dateTimeFormat();
  600 +
  601 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
  602 + //String barCode = "abcd";
  603 + if (barCode.length() < 1 | barCode == null) {
  604 + buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
  605 + return false;
  606 + }
  607 + // first entry in
  608 + String mainfistList = landBusinesstypeList.getMasterList();
  609 + String startport = landBusinesstypeList.getStartport();
  610 + String endport = landBusinesstypeList.getEndport();
  611 + String startStation = landBusinesstypeList.getStartsatation();
  612 + String endStation = landBusinesstypeList.getEndstation();
  613 + String isfull = landBusinesstypeList.getIsfull();
  614 +
  615 + landBusinesstypeList.setMassageId(messageId);
  616 + landBusinesstypeList.setStartport("");
  617 + landBusinesstypeList.setStartsatation("");
  618 + landBusinesstypeList.setEndport(startport);
  619 + landBusinesstypeList.setEndstation(startStation);
  620 + landBusinesstypeList.setMasterList("");
  621 + landBusinesstypeList.setProdectTime(new Date());
  622 + landBusinesstypeList.setBarcode(barCode);
  623 + landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel());
  624 + landBusinesstypeListService.save(landBusinesstypeList);
  625 + insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
  626 +
  627 + // second out
  628 + LandBusinesstypeList list = new LandBusinesstypeList();
  629 + list.setAgentname(landBusinesstypeList.getAgentname());
  630 + list.setAgentno(landBusinesstypeList.getAgentno());
  631 + list.setCocode(landBusinesstypeList.getCocode());
  632 + list.setIsDelete("0");
  633 + list.setIsvalid("0");
  634 + list.setIsfull(isfull);
  635 + list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  636 + list.setBusinesstype(landBusinesstypeList.getBusinesstype());
  637 + list.setCocode(landBusinesstypeList.getCocode());
  638 + list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  639 + list.setEndport(startport);
  640 + list.setEndstation(startStation);
  641 + list.setProdectTime(new Date());
  642 + list.setMasterList(mainfistList);
  643 + list.setDriverid(landBusinesstypeList.getDriverid());
  644 + list.setDrivername(landBusinesstypeList.getDrivername());
  645 + list.setAisle(bayService.findByYardAndName(startStation, "1号卡口-出").getChannel());
  646 + list.setTurnoverflag("E");
  647 + list.setMassageId(messageId);
  648 + list.setBarcode(barCode);
  649 + landBusinesstypeListService.save(list);
  650 +
  651 + // third
  652 + LandBusinesstypeList list1 = new LandBusinesstypeList();
  653 + list1.setAgentname(landBusinesstypeList.getAgentname());
  654 + list1.setAgentno(landBusinesstypeList.getAgentno());
  655 + list1.setCocode(landBusinesstypeList.getCocode());
  656 + list1.setIsDelete("0");
  657 + list1.setIsvalid("0");
  658 + list1.setIsfull(isfull);
  659 + list1.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  660 + list1.setBusinesstype(landBusinesstypeList.getBusinesstype());
  661 + list1.setCocode(landBusinesstypeList.getCocode());
  662 + list1.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  663 + list1.setStartport(startport);
  664 + list1.setStartsatation(startStation);
  665 + list1.setEndport(endport);
  666 + list1.setEndstation(endStation);
  667 + list1.setProdectTime(new Date());
  668 + list1.setMasterList(mainfistList);
  669 + list1.setDriverid(landBusinesstypeList.getDriverid());
  670 + list1.setDrivername(landBusinesstypeList.getDrivername());
  671 + list1.setAisle(bayService.findByYardAndName(endStation, "6号卡口-进").getChannel());
  672 + list1.setTurnoverflag("I");
  673 + list1.setMassageId(messageId);
  674 + list1.setBarcode(barCode);
  675 + landBusinesstypeListService.save(list1);
  676 +
  677 + // four
  678 + LandBusinesstypeList list2 = new LandBusinesstypeList();
  679 + list2.setAgentname(landBusinesstypeList.getAgentname());
  680 + list2.setAgentno(landBusinesstypeList.getAgentno());
  681 + list2.setCocode(landBusinesstypeList.getCocode());
  682 + list2.setIsDelete("0");
  683 + list2.setIsvalid("0");
  684 + list2.setIsfull(isfull);
  685 + list2.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  686 + list2.setBusinesstype(landBusinesstypeList.getBusinesstype());
  687 + list2.setCocode(landBusinesstypeList.getCocode());
  688 + list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  689 + list2.setStartport("");
  690 + list2.setStartsatation("");
  691 + list2.setStartport(startport);
  692 + list2.setStartsatation(startStation);
  693 + list2.setEndport(endport);
  694 + list2.setEndstation(endStation);
  695 + list2.setProdectTime(new Date());
  696 + list2.setMasterList("");
  697 + list2.setDriverid(landBusinesstypeList.getDriverid());
  698 + list2.setDrivername(landBusinesstypeList.getDrivername());
  699 + list2.setAisle(bayService.findByYardAndName(endStation, "6号卡口-出").getChannel());
  700 + list2.setTurnoverflag("E");
  701 + list2.setMassageId(messageId);
  702 + list2.setBarcode(barCode);
  703 + landBusinesstypeListService.save(list2);
  704 + //five
  705 + LandBusinesstypeList list3 = new LandBusinesstypeList();
  706 + list3.setAgentname(landBusinesstypeList.getAgentname());
  707 + list3.setAgentno(landBusinesstypeList.getAgentno());
  708 + list3.setCocode(landBusinesstypeList.getCocode());
  709 + list3.setIsDelete("0");
  710 + list3.setIsvalid("0");
  711 + list3.setIsfull(isfull);
  712 + list3.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  713 + list3.setBusinesstype(landBusinesstypeList.getBusinesstype());
  714 + list3.setCocode(landBusinesstypeList.getCocode());
  715 + list3.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  716 + list3.setStartport("");
  717 + list3.setStartsatation("");
  718 + list3.setStartport(startport);
  719 + list3.setStartsatation(startStation);
  720 + list3.setEndport(endport);
  721 + list3.setEndstation("4612199001");
  722 + list3.setProdectTime(new Date());
  723 + list3.setMasterList("");
  724 + list3.setDriverid(landBusinesstypeList.getDriverid());
  725 + list3.setDrivername(landBusinesstypeList.getDrivername());
  726 + list3.setAisle("4612031001");
  727 + list3.setTurnoverflag("I");
  728 + list3.setMassageId(messageId);
  729 + list3.setBarcode(barCode);
  730 + landBusinesstypeListService.save(list3);
  731 + //six
  732 + //five
  733 + LandBusinesstypeList list4 = new LandBusinesstypeList();
  734 + list4.setAgentname(landBusinesstypeList.getAgentname());
  735 + list4.setAgentno(landBusinesstypeList.getAgentno());
  736 + list4.setCocode(landBusinesstypeList.getCocode());
  737 + list4.setIsDelete("0");
  738 + list4.setIsvalid("0");
  739 + list4.setIsfull(isfull);
  740 + list4.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  741 + list4.setBusinesstype(landBusinesstypeList.getBusinesstype());
  742 + list4.setCocode(landBusinesstypeList.getCocode());
  743 + list4.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  744 + list4.setStartport("");
  745 + list4.setStartsatation("");
  746 + list4.setStartport(startport);
  747 + list4.setStartsatation(startStation);
  748 + list4.setEndport(endport);
  749 + list4.setEndstation("4612199001");
  750 + list4.setProdectTime(new Date());
  751 + list4.setMasterList("");
  752 + list4.setDriverid(landBusinesstypeList.getDriverid());
  753 + list4.setDrivername(landBusinesstypeList.getDrivername());
  754 + //list4.setAisle(bayService.findByYardAndName(endStation, "内三卡口-出").getChannel());
  755 + list4.setAisle("4612030001");
  756 + list4.setTurnoverflag("E");
  757 + list4.setMassageId(messageId);
  758 + list4.setBarcode(barCode);
  759 + landBusinesstypeListService.save(list4);
  760 +
  761 + } catch (Exception e) {
  762 + e.printStackTrace();
  763 + }
  764 + return true;
  765 + }
463 766
464 public boolean insertType2(LandBusinesstypeList landBusinesstypeList) { 767 public boolean insertType2(LandBusinesstypeList landBusinesstypeList) {
465 768
466 try { 769 try {
467 String messageId = LandBusinesstypeListController.dateTimeFormat(); 770 String messageId = LandBusinesstypeListController.dateTimeFormat();
468 - 771 + //String barCode="abcd";
469 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId); 772 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
470 if (barCode.length() < 1 | barCode == null) { 773 if (barCode.length() < 1 | barCode == null) {
471 buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo()); 774 buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
@@ -501,7 +804,16 @@ public class LandBusinesstypeListController extends BaseController { @@ -501,7 +804,16 @@ public class LandBusinesstypeListController extends BaseController {
501 list.setMasterList(mainfistList); 804 list.setMasterList(mainfistList);
502 list.setDriverid(landBusinesstypeList.getDriverid()); 805 list.setDriverid(landBusinesstypeList.getDriverid());
503 list.setDrivername(landBusinesstypeList.getDrivername()); 806 list.setDrivername(landBusinesstypeList.getDrivername());
504 - list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel()); 807 + if("4604333311".equals(landBusinesstypeList.getAisle())){
  808 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
  809 + }else if("4604333321".equals(landBusinesstypeList.getAisle())){
  810 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "2号卡口-出").getChannel());
  811 + }else if("4604444411".equals(landBusinesstypeList.getAisle())){
  812 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
  813 + }else{
  814 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
  815 + }
  816 +
505 list.setTurnoverflag("E"); 817 list.setTurnoverflag("E");
506 list.setMassageId(messageId); 818 list.setMassageId(messageId);
507 list.setBarcode(barCode); 819 list.setBarcode(barCode);
@@ -517,7 +829,171 @@ public class LandBusinesstypeListController extends BaseController { @@ -517,7 +829,171 @@ public class LandBusinesstypeListController extends BaseController {
517 try { 829 try {
518 830
519 String messageId = LandBusinesstypeListController.dateTimeFormat(); 831 String messageId = LandBusinesstypeListController.dateTimeFormat();
  832 + //String barCode="abcd";
  833 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
  834 + if (barCode.length() < 1 | barCode == null) {
  835 + buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
  836 + return false;
  837 + }
  838 + // first entry
  839 + landBusinesstypeList.setMassageId(messageId);
  840 + String mainfistList = landBusinesstypeList.getMasterList();
  841 + String isfull = landBusinesstypeList.getIsfull();
  842 + landBusinesstypeList.setProdectTime(new Date());
  843 + landBusinesstypeList.setBarcode(barCode);
  844 + landBusinesstypeListService.save(landBusinesstypeList);
  845 + insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
  846 + // second
  847 + LandBusinesstypeList list = new LandBusinesstypeList();
  848 + list.setAgentname(landBusinesstypeList.getAgentname());
  849 + list.setAgentno(landBusinesstypeList.getAgentno());
  850 + list.setCocode(landBusinesstypeList.getCocode());
  851 + list.setIsDelete("0");
  852 + list.setIsvalid("0");
  853 + list.setIsfull(isfull);
  854 + list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  855 + list.setBusinesstype(landBusinesstypeList.getBusinesstype());
  856 + list.setCocode(landBusinesstypeList.getCocode());
  857 + list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  858 + list.setStartport(landBusinesstypeList.getStartport());
  859 + list.setStartsatation(landBusinesstypeList.getStartsatation());
  860 + list.setEndport(landBusinesstypeList.getEndport());
  861 + list.setEndstation(landBusinesstypeList.getEndstation());
  862 + list.setProdectTime(new Date());
  863 + list.setMasterList("");
  864 + list.setDriverid(landBusinesstypeList.getDriverid());
  865 + list.setDrivername(landBusinesstypeList.getDrivername());
  866 + if("4604333311".equals(landBusinesstypeList.getAisle())){
  867 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
  868 + }else if("4604333321".equals(landBusinesstypeList.getAisle())){
  869 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "2号卡口-出").getChannel());
  870 + }else if("4604444411".equals(landBusinesstypeList.getAisle())){
  871 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
  872 + }else{
  873 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
  874 + }
  875 + list.setTurnoverflag("E");
  876 + list.setMassageId(messageId);
  877 + list.setBarcode(barCode);
  878 + landBusinesstypeListService.save(list);
  879 +
  880 + } catch (Exception e) {
  881 + e.printStackTrace();
  882 + }
  883 + return true;
  884 + }
  885 + public boolean insertTypeZE(LandBusinesstypeList landBusinesstypeList) {
  886 +
  887 + try {
  888 +
  889 + String messageId = LandBusinesstypeListController.dateTimeFormat();
  890 + //String barCode="abcd";
  891 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
  892 + if (barCode.length() < 1 | barCode == null) {
  893 + buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
  894 + return false;
  895 + }
  896 + // first entry
  897 + landBusinesstypeList.setMassageId(messageId);
  898 + String mainfistList = landBusinesstypeList.getMasterList();
  899 + String isfull = landBusinesstypeList.getIsfull();
  900 + landBusinesstypeList.setProdectTime(new Date());
  901 + landBusinesstypeList.setBarcode(barCode);
  902 + landBusinesstypeListService.save(landBusinesstypeList);
  903 + insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
  904 + // second
  905 + LandBusinesstypeList list = new LandBusinesstypeList();
  906 + list.setAgentname(landBusinesstypeList.getAgentname());
  907 + list.setAgentno(landBusinesstypeList.getAgentno());
  908 + list.setCocode(landBusinesstypeList.getCocode());
  909 + list.setIsDelete("0");
  910 + list.setIsvalid("0");
  911 + list.setIsfull(isfull);
  912 + list.setIsthree("0");
  913 + list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  914 + list.setBusinesstype(landBusinesstypeList.getBusinesstype());
  915 + list.setCocode(landBusinesstypeList.getCocode());
  916 + list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  917 + list.setStartport(landBusinesstypeList.getStartport());
  918 + list.setStartsatation(landBusinesstypeList.getStartsatation());
  919 + list.setEndport(landBusinesstypeList.getEndport());
  920 + list.setEndstation(landBusinesstypeList.getEndstation());
  921 + list.setProdectTime(new Date());
  922 + list.setMasterList("");
  923 + list.setDriverid(landBusinesstypeList.getDriverid());
  924 + list.setDrivername(landBusinesstypeList.getDrivername());
  925 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "6号卡口-出").getChannel());
  926 + list.setTurnoverflag("E");
  927 + list.setMassageId(messageId);
  928 + list.setBarcode(barCode);
  929 + landBusinesstypeListService.save(list);
520 930
  931 + //five
  932 + LandBusinesstypeList list3 = new LandBusinesstypeList();
  933 + list3.setAgentname(landBusinesstypeList.getAgentname());
  934 + list3.setAgentno(landBusinesstypeList.getAgentno());
  935 + list3.setCocode(landBusinesstypeList.getCocode());
  936 + list3.setIsDelete("0");
  937 + list3.setIsvalid("0");
  938 + list3.setIsthree("0");
  939 + list3.setIsfull(isfull);
  940 + list3.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  941 + list3.setBusinesstype(landBusinesstypeList.getBusinesstype());
  942 + list3.setCocode(landBusinesstypeList.getCocode());
  943 + list3.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  944 + list3.setStartport("");
  945 + list3.setStartsatation("");
  946 + list3.setEndport("4620");
  947 + list3.setEndstation("4612199001");
  948 + list3.setProdectTime(new Date());
  949 + list3.setMasterList("");
  950 + list3.setDriverid(landBusinesstypeList.getDriverid());
  951 + list3.setDrivername(landBusinesstypeList.getDrivername());
  952 + list3.setAisle("4612031001");
  953 + list3.setTurnoverflag("I");
  954 + list3.setMassageId(messageId);
  955 + list3.setBarcode(barCode);
  956 + landBusinesstypeListService.save(list3);
  957 + //six
  958 + //five
  959 + LandBusinesstypeList list4 = new LandBusinesstypeList();
  960 + list4.setAgentname(landBusinesstypeList.getAgentname());
  961 + list4.setAgentno(landBusinesstypeList.getAgentno());
  962 + list4.setCocode(landBusinesstypeList.getCocode());
  963 + list4.setIsDelete("0");
  964 + list4.setIsvalid("0");
  965 + list4.setIsthree("0");
  966 + list4.setIsfull(isfull);
  967 + list4.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
  968 + list4.setBusinesstype(landBusinesstypeList.getBusinesstype());
  969 + list4.setCocode(landBusinesstypeList.getCocode());
  970 + list4.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  971 + list4.setStartport("");
  972 + list4.setStartsatation("");
  973 + list4.setEndport("4620");
  974 + list4.setEndstation("4612199001");
  975 + list4.setProdectTime(new Date());
  976 + list4.setMasterList("");
  977 + list4.setDriverid(landBusinesstypeList.getDriverid());
  978 + list4.setDrivername(landBusinesstypeList.getDrivername());
  979 + //list4.setAisle(bayService.findByYardAndName(endStation, "内三卡口-出").getChannel());
  980 + list4.setAisle("4612030001");
  981 + list4.setTurnoverflag("E");
  982 + list4.setMassageId(messageId);
  983 + list4.setBarcode(barCode);
  984 + landBusinesstypeListService.save(list4);
  985 +
  986 + } catch (Exception e) {
  987 + e.printStackTrace();
  988 + }
  989 + return true;
  990 + }
  991 + public boolean insertTypeZE2(LandBusinesstypeList landBusinesstypeList) {
  992 +
  993 + try {
  994 +
  995 + String messageId = LandBusinesstypeListController.dateTimeFormat();
  996 + //String barCode="abcd";
521 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId); 997 String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
522 if (barCode.length() < 1 | barCode == null) { 998 if (barCode.length() < 1 | barCode == null) {
523 buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo()); 999 buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
@@ -538,6 +1014,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -538,6 +1014,7 @@ public class LandBusinesstypeListController extends BaseController {
538 list.setCocode(landBusinesstypeList.getCocode()); 1014 list.setCocode(landBusinesstypeList.getCocode());
539 list.setIsDelete("0"); 1015 list.setIsDelete("0");
540 list.setIsvalid("0"); 1016 list.setIsvalid("0");
  1017 + list.setIsthree("1");
541 list.setIsfull(isfull); 1018 list.setIsfull(isfull);
542 list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo()); 1019 list.setTrailerLicenseNo(landBusinesstypeList.getTrailerLicenseNo());
543 list.setBusinesstype(landBusinesstypeList.getBusinesstype()); 1020 list.setBusinesstype(landBusinesstypeList.getBusinesstype());
@@ -551,7 +1028,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -551,7 +1028,7 @@ public class LandBusinesstypeListController extends BaseController {
551 list.setMasterList(""); 1028 list.setMasterList("");
552 list.setDriverid(landBusinesstypeList.getDriverid()); 1029 list.setDriverid(landBusinesstypeList.getDriverid());
553 list.setDrivername(landBusinesstypeList.getDrivername()); 1030 list.setDrivername(landBusinesstypeList.getDrivername());
554 - list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel()); 1031 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "6号卡口-出").getChannel());
555 list.setTurnoverflag("E"); 1032 list.setTurnoverflag("E");
556 list.setMassageId(messageId); 1033 list.setMassageId(messageId);
557 list.setBarcode(barCode); 1034 list.setBarcode(barCode);
@@ -563,81 +1040,6 @@ public class LandBusinesstypeListController extends BaseController { @@ -563,81 +1040,6 @@ public class LandBusinesstypeListController extends BaseController {
563 return true; 1040 return true;
564 } 1041 }
565 1042
566 - /*  
567 - * public void insertType1(LandBusinesstypeList landBusinesstypeList) { //first  
568 - * entry in String messageId = LandBusinesstypeListController.dateTimeFormat();  
569 - * String mainfistList = landBusinesstypeList.getMasterList(); String startport  
570 - * = landBusinesstypeList.getStartport(); String endport =  
571 - * landBusinesstypeList.getEndport(); String startStation =  
572 - * landBusinesstypeList.getStartsatation(); String endStation =  
573 - * landBusinesstypeList.getEndstation(); String isfull =  
574 - * landBusinesstypeList.getIsfull();  
575 - * landBusinesstypeList.setMassageId(messageId); String barCode =  
576 - * buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId  
577 - * ); landBusinesstypeList.setStartport("");  
578 - * landBusinesstypeList.setStartsatation("");  
579 - * landBusinesstypeList.setEndport(startport);  
580 - * landBusinesstypeList.setEndstation(startStation);  
581 - * landBusinesstypeList.setBarcode(barCode);  
582 - * landBusinesstypeList.setMasterList("");  
583 - * landBusinesstypeList.setProdectTime(new Date());  
584 - * landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation,  
585 - * "1号卡口-进").getChannel());  
586 - * landBusinesstypeListService.save(landBusinesstypeList);  
587 - * insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.  
588 - * getTrailerFrameNo(),mainfistList);  
589 - *  
590 - * //second out LandBusinesstypeList list = new LandBusinesstypeList();  
591 - * list.setAgentname(landBusinesstypeList.getAgentname());  
592 - * list.setAgentno(landBusinesstypeList.getAgentno()); list.setBarcode(barCode);  
593 - * list.setIsDelete("0"); list.setIsvalid("0"); list.setIsfull(isfull);  
594 - * list.setBusinesstype(landBusinesstypeList.getBusinesstype());  
595 - * list.setCocode(landBusinesstypeList.getCocode());  
596 - * list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());  
597 - * list.setEndport(startport); list.setEndstation(startStation);  
598 - * list.setProdectTime(new Date()); list.setMasterList(mainfistList);  
599 - * list.setDriverid(landBusinesstypeList.getDriverid());  
600 - * list.setDrivername(landBusinesstypeList.getDrivername());  
601 - * list.setAisle(bayService.findByYardAndName(startStation,  
602 - * "1号卡口-出").getChannel()); list.setTurnoverflag("E");  
603 - * list.setMassageId(messageId); landBusinesstypeListService.save(list);  
604 - *  
605 - * //third LandBusinesstypeList list1 = new LandBusinesstypeList();  
606 - * list1.setAgentname(landBusinesstypeList.getAgentname());  
607 - * list1.setAgentno(landBusinesstypeList.getAgentno()); list1.setIsDelete("0");  
608 - * list1.setIsvalid("0"); list1.setIsfull(isfull); list1.setBarcode(barCode);  
609 - * list1.setBusinesstype(landBusinesstypeList.getBusinesstype());  
610 - * list1.setCocode(landBusinesstypeList.getCocode());  
611 - * list1.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());  
612 - * list1.setStartport(startport); list1.setStartsatation(startStation);  
613 - * list1.setEndport(endport); list1.setEndstation(endStation);  
614 - * list1.setProdectTime(new Date()); list1.setMasterList(mainfistList);  
615 - * list1.setDriverid(landBusinesstypeList.getDriverid());  
616 - * list1.setDrivername(landBusinesstypeList.getDrivername());  
617 - * list1.setAisle(bayService.findByYardAndName(endStation,  
618 - * "1号卡口-进").getChannel()); list1.setTurnoverflag("I");  
619 - * list1.setMassageId(messageId); landBusinesstypeListService.save(list1);  
620 - *  
621 - * //four LandBusinesstypeList list2 = new LandBusinesstypeList();  
622 - * list2.setAgentname(landBusinesstypeList.getAgentname());  
623 - * list2.setAgentno(landBusinesstypeList.getAgentno());  
624 - * list2.setBarcode(barCode); list2.setIsDelete("0"); list2.setIsvalid("0");  
625 - * list2.setIsfull(isfull);  
626 - * list2.setBusinesstype(landBusinesstypeList.getBusinesstype());  
627 - * list2.setCocode(landBusinesstypeList.getCocode());  
628 - * list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());  
629 - * list2.setStartport(""); list2.setStartsatation("");  
630 - * list2.setStartport(startport); list2.setStartsatation(startStation);  
631 - * list2.setEndport(endport); list2.setEndstation(endStation);  
632 - * list2.setProdectTime(new Date()); list2.setMasterList("");  
633 - * list2.setDriverid(landBusinesstypeList.getDriverid());  
634 - * list2.setDrivername(landBusinesstypeList.getDrivername());  
635 - * list2.setAisle(bayService.findByYardAndName(endStation,  
636 - * "1号卡口-出").getChannel()); list2.setTurnoverflag("E");  
637 - * list2.setMassageId(messageId); landBusinesstypeListService.save(list2);  
638 - *  
639 - * }  
640 - */  
641 public static String dateTimeFormat() { 1043 public static String dateTimeFormat() {
642 Date dateTime = new Date(); 1044 Date dateTime = new Date();
643 SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss"); 1045 SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -11,16 +11,17 @@ @@ -11,16 +11,17 @@
11 11
12 #mysql database setting 12 #mysql database setting
13 jdbc.type=mysql 13 jdbc.type=mysql
14 -#jdbc.driver=com.mysql.cj.jdbc.Driver  
15 -#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  
16 -#jdbc.username=managent_user  
17 -#jdbc.password=1q2w3e4r%. 14 +jdbc.driver=com.mysql.cj.jdbc.Driver
  15 +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
  16 +jdbc.username=managent_user
  17 +jdbc.password=1q2w3e4r%.
  18 +
18 19
19 #jdbc.type=mysql 20 #jdbc.type=mysql
20 -jdbc.driver=com.mysql.cj.jdbc.Driver  
21 -jdbc.url=jdbc:mysql://localhost:3306/station?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true  
22 -jdbc.username=root  
23 -jdbc.password=root 21 +#jdbc.driver=com.mysql.cj.jdbc.Driver
  22 +#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
  23 +#jdbc.username=110
  24 +#jdbc.password=QAHqCJf2kFYCLirM
24 25
25 #pool settings 26 #pool settings
26 jdbc.pool.init=1 27 jdbc.pool.init=1
1 <?xml version="1.0" encoding="UTF-8" ?> 1 <?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao"> 3 <mapper namespace="com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao">
4 - 4 +
5 <sql id="landBusinesstypeListColumns"> 5 <sql id="landBusinesstypeListColumns">
6 a.id AS "id", 6 a.id AS "id",
7 a.massage_id AS "massageId", 7 a.massage_id AS "massageId",
@@ -33,14 +33,16 @@ @@ -33,14 +33,16 @@
33 a.isfull AS "isfull", 33 a.isfull AS "isfull",
34 a.remark AS "remark", 34 a.remark AS "remark",
35 a.remark1 AS "remark1", 35 a.remark1 AS "remark1",
36 - a.remark2 AS "remark2" 36 + a.remark2 AS "remark2",
  37 + a.remark3 AS "remark3",
  38 + a.isthree AS "isthree"
37 </sql> 39 </sql>
38 - 40 +
39 <sql id="landBusinesstypeListJoins"> 41 <sql id="landBusinesstypeListJoins">
40 </sql> 42 </sql>
41 - 43 +
42 <select id="get" resultType="LandBusinesstypeList"> 44 <select id="get" resultType="LandBusinesstypeList">
43 - SELECT 45 + SELECT
44 <include refid="landBusinesstypeListColumns"/> 46 <include refid="landBusinesstypeListColumns"/>
45 FROM land_businesstype_list a 47 FROM land_businesstype_list a
46 <include refid="landBusinesstypeListJoins"/> 48 <include refid="landBusinesstypeListJoins"/>
@@ -48,11 +50,11 @@ @@ -48,11 +50,11 @@
48 </select> 50 </select>
49 51
50 <select id="findByStatus" resultType="LandBusinesstypeList"> 52 <select id="findByStatus" resultType="LandBusinesstypeList">
51 - SELECT 53 + SELECT
52 <include refid="landBusinesstypeListColumns"/> 54 <include refid="landBusinesstypeListColumns"/>
53 FROM land_businesstype_list a 55 FROM land_businesstype_list a
54 <include refid="landBusinesstypeListJoins"/> 56 <include refid="landBusinesstypeListJoins"/>
55 - where a.is_delete = "0" 57 + where a.is_delete = "0"
56 <if test="trailerFrameNo !=null and trailerFrameNo !=''"> 58 <if test="trailerFrameNo !=null and trailerFrameNo !=''">
57 and trailer_frame_no = #{trailerFrameNo} 59 and trailer_frame_no = #{trailerFrameNo}
58 </if> 60 </if>
@@ -61,9 +63,9 @@ @@ -61,9 +63,9 @@
61 </if> --> 63 </if> -->
62 order by a.create_date DESC 64 order by a.create_date DESC
63 </select> 65 </select>
64 - 66 +
65 <select id="findByBarcode" resultType="LandBusinesstypeList"> 67 <select id="findByBarcode" resultType="LandBusinesstypeList">
66 - SELECT 68 + SELECT
67 <include refid="landBusinesstypeListColumns"/> 69 <include refid="landBusinesstypeListColumns"/>
68 FROM land_businesstype_list a 70 FROM land_businesstype_list a
69 <include refid="landBusinesstypeListJoins"/> 71 <include refid="landBusinesstypeListJoins"/>
@@ -74,16 +76,16 @@ @@ -74,16 +76,16 @@
74 order by a.create_date DESC 76 order by a.create_date DESC
75 </select> 77 </select>
76 <select id="findByTime" resultType="LandBusinesstypeList"> 78 <select id="findByTime" resultType="LandBusinesstypeList">
77 - select * from land_businesstype_list  
78 - WHERE PRODECT_TIME &gt;=#{time1}  
79 - AND PRODECT_TIME &lt;= #{time2}  
80 - AND ENDSTATION= "4604000000"  
81 - AND AISLE = "4604333311"  
82 - AND IS_DELETE="0" 79 + select * from land_businesstype_list
  80 + WHERE PRODECT_TIME &gt;=#{time1}
  81 + AND PRODECT_TIME &lt;= #{time2}
  82 + AND ENDSTATION= "4604000000"
  83 + AND AISLE = "4604333311"
  84 + AND IS_DELETE="0"
83 ORDER BY PRODECT_TIME; 85 ORDER BY PRODECT_TIME;
84 </select> 86 </select>
85 <select id="findByMessageId" resultType="LandBusinesstypeList"> 87 <select id="findByMessageId" resultType="LandBusinesstypeList">
86 - SELECT 88 + SELECT
87 <include refid="landBusinesstypeListColumns"/> 89 <include refid="landBusinesstypeListColumns"/>
88 FROM land_businesstype_list a 90 FROM land_businesstype_list a
89 <include refid="landBusinesstypeListJoins"/> 91 <include refid="landBusinesstypeListJoins"/>
@@ -94,7 +96,7 @@ @@ -94,7 +96,7 @@
94 order by a.create_date DESC 96 order by a.create_date DESC
95 </select> 97 </select>
96 <select id="findList" resultType="LandBusinesstypeList"> 98 <select id="findList" resultType="LandBusinesstypeList">
97 - SELECT 99 + SELECT
98 <include refid="landBusinesstypeListColumns"/> 100 <include refid="landBusinesstypeListColumns"/>
99 FROM land_businesstype_list a 101 FROM land_businesstype_list a
100 <include refid="landBusinesstypeListJoins"/> 102 <include refid="landBusinesstypeListJoins"/>
@@ -128,9 +130,9 @@ @@ -128,9 +130,9 @@
128 </otherwise> 130 </otherwise>
129 </choose> 131 </choose>
130 </select> 132 </select>
131 - 133 +
132 <select id="findByUserType" resultType="LandBusinesstypeList"> 134 <select id="findByUserType" resultType="LandBusinesstypeList">
133 - SELECT 135 + SELECT
134 <include refid="landBusinesstypeListColumns"/> 136 <include refid="landBusinesstypeListColumns"/>
135 FROM land_businesstype_list a 137 FROM land_businesstype_list a
136 <include refid="landBusinesstypeListJoins"/> 138 <include refid="landBusinesstypeListJoins"/>
@@ -161,15 +163,15 @@ @@ -161,15 +163,15 @@
161 </otherwise> 163 </otherwise>
162 </choose> 164 </choose>
163 </select> 165 </select>
164 - 166 +
165 <select id="findAllList" resultType="LandBusinesstypeList"> 167 <select id="findAllList" resultType="LandBusinesstypeList">
166 - SELECT 168 + SELECT
167 <include refid="landBusinesstypeListColumns"/> 169 <include refid="landBusinesstypeListColumns"/>
168 FROM land_businesstype_list a 170 FROM land_businesstype_list a
169 <include refid="landBusinesstypeListJoins"/> 171 <include refid="landBusinesstypeListJoins"/>
170 <where> 172 <where>
171 -  
172 - </where> 173 +
  174 + </where>
173 <choose> 175 <choose>
174 <when test="page !=null and page.orderBy != null and page.orderBy != ''"> 176 <when test="page !=null and page.orderBy != null and page.orderBy != ''">
175 ORDER BY ${page.orderBy} 177 ORDER BY ${page.orderBy}
@@ -180,7 +182,7 @@ @@ -180,7 +182,7 @@
180 </choose> 182 </choose>
181 </select> 183 </select>
182 <select id="findByIsValid" resultType="LandBusinesstypeList"> 184 <select id="findByIsValid" resultType="LandBusinesstypeList">
183 - select * from land_businesstype_list 185 + select * from land_businesstype_list
184 WHERE trailer_frame_no =#{trailerFrameNo} AND isvalid=#{isvalid} 186 WHERE trailer_frame_no =#{trailerFrameNo} AND isvalid=#{isvalid}
185 </select> 187 </select>
186 <update id="deleteByBarcode" parameterType="java.lang.String"> 188 <update id="deleteByBarcode" parameterType="java.lang.String">
@@ -191,9 +193,9 @@ @@ -191,9 +193,9 @@
191 DELETE FROM land_businesstype_list 193 DELETE FROM land_businesstype_list
192 WHERE id = #{id} 194 WHERE id = #{id}
193 </update> 195 </update>
194 - 196 +
195 <update id="deleteByMessageId" parameterType="java.lang.String"> 197 <update id="deleteByMessageId" parameterType="java.lang.String">
196 - DELETE FROM land_businesstype_list 198 + DELETE FROM land_businesstype_list
197 WHERE massage_id = #{massageId} 199 WHERE massage_id = #{massageId}
198 </update> 200 </update>
199 201
@@ -229,7 +231,9 @@ @@ -229,7 +231,9 @@
229 isfull, 231 isfull,
230 remark, 232 remark,
231 remark1, 233 remark1,
232 - remark2 234 + remark2,
  235 + remark3,
  236 + isthree
233 ) VALUES ( 237 ) VALUES (
234 #{id}, 238 #{id},
235 #{massageId}, 239 #{massageId},
@@ -261,12 +265,14 @@ @@ -261,12 +265,14 @@
261 #{isfull}, 265 #{isfull},
262 #{remark}, 266 #{remark},
263 #{remark1}, 267 #{remark1},
264 - #{remark2} 268 + #{remark2},
  269 + #{remark3},
  270 + #{isthree}
265 ) 271 )
266 </insert> 272 </insert>
267 - 273 +
268 <update id="update"> 274 <update id="update">
269 - UPDATE land_businesstype_list SET 275 + UPDATE land_businesstype_list SET
270 trailer_frame_no = #{trailerFrameNo}, 276 trailer_frame_no = #{trailerFrameNo},
271 master_list = #{masterList}, 277 master_list = #{masterList},
272 agentno = #{agentno}, 278 agentno = #{agentno},
@@ -281,11 +287,13 @@ @@ -281,11 +287,13 @@
281 barcode = #{barcode}, 287 barcode = #{barcode},
282 update_by = #{updateBy.id}, 288 update_by = #{updateBy.id},
283 update_date = #{updateDate}, 289 update_date = #{updateDate},
284 - isfull = #{isfull} 290 + isfull = #{isfull},
  291 + remark2=#{remark2},
  292 + remark3=#{remark3}
285 WHERE id = #{id} 293 WHERE id = #{id}
286 </update> 294 </update>
287 <update id="updateEntry"> 295 <update id="updateEntry">
288 - UPDATE land_businesstype_list SET 296 + UPDATE land_businesstype_list SET
289 trailer_frame_no = #{trailerFrameNo}, 297 trailer_frame_no = #{trailerFrameNo},
290 master_list = #{masterList}, 298 master_list = #{masterList},
291 agentno = #{agentno}, 299 agentno = #{agentno},
@@ -302,13 +310,14 @@ @@ -302,13 +310,14 @@
302 update_by = #{updateBy.id}, 310 update_by = #{updateBy.id},
303 update_date = #{updateDate}, 311 update_date = #{updateDate},
304 isvalid=#{isvalid}, 312 isvalid=#{isvalid},
305 - isfull = #{isfull} 313 + isfull = #{isfull},
  314 + remark2=#{remark2}
306 WHERE id = #{id} 315 WHERE id = #{id}
307 </update> 316 </update>
308 - 317 +
309 <update id="delete"> 318 <update id="delete">
310 DELETE FROM land_businesstype_list 319 DELETE FROM land_businesstype_list
311 WHERE id = #{id} 320 WHERE id = #{id}
312 </update> 321 </update>
313 -  
314 -</mapper>  
  322 +
  323 +</mapper>
@@ -72,6 +72,7 @@ th, td { @@ -72,6 +72,7 @@ th, td {
72 <span class="help-inline"><font color="red">查询单号前请先选定业务类型</font> 72 <span class="help-inline"><font color="red">查询单号前请先选定业务类型</font>
73 </div> 73 </div>
74 <br> 74 <br>
  75 +
75 <div class="controls"> 76 <div class="controls">
76 <table> 77 <table>
77 <thead> 78 <thead>
@@ -99,6 +100,12 @@ th, td { @@ -99,6 +100,12 @@ th, td {
99 <form:hidden path="id" /> 100 <form:hidden path="id" />
100 <sys:message content="${message}" /> 101 <sys:message content="${message}" />
101 <div class="control-group"> 102 <div class="control-group">
  103 + <label class="control-label">备注：</label>
  104 + <div class="controls">
  105 + <form:input path="remark3" autocomplete="off" id="remark3"/>
  106 + </div>
  107 + </div>
  108 + <div class="control-group">
102 <div class="row-fluid"> 109 <div class="row-fluid">
103 <div class="span12"> 110 <div class="span12">
104 <div class="span6"> 111 <div class="span6">
@@ -298,18 +305,48 @@ th, td { @@ -298,18 +305,48 @@ th, td {
298 </div> 305 </div>
299 </div> 306 </div>
300 <div class="control-group"> 307 <div class="control-group">
301 - <div class="row-fluid">  
302 - <div class="span12">  
303 - <div class="span6">  
304 - <label class="control-label">是否空车：</label>  
305 - <div class="controls">  
306 - <form:select path="isfull" class="input-xlarge">  
307 - <form:option value="" label="--请选择--" />  
308 - <form:option value="0" label="是" selected = "selected"/>  
309 - <form:option value="1" label="否"/>  
310 - </form:select> 308 + <div class="row-fluid">
  309 + <div class="span12">
  310 +
  311 + <div class="span6">
  312 + <label class="control-label">是否进内三：</label>
  313 + <div class="controls">
  314 + <form:select path="isthree" class="input-xlarge">
  315 + <form:option value="0" label="是" selected = "selected"/>
  316 + <form:option value="1" label="否"/>
  317 + </form:select>
  318 + <span class="help-inline"><font color="red">综保区出口送货业务必须选择，默认进内三</font></span>
  319 + </div>
  320 + </div>
  321 + <div class="span6">
  322 + <label class="control-label">是否空车：</label>
  323 + <div class="controls">
  324 + <c:choose>
  325 + <c:when test="${landBusinesstypeList.isfull!=null}">
  326 + <form:select path="isfull" class="input-xlarge" disabled="true">
  327 + <form:option value="" label="--请选择--" />
  328 + <form:option value="0" label="是" selected = "selected"/>
  329 + <form:option value="1" label="否"/>
  330 + </form:select>
  331 + </c:when>
  332 + <c:otherwise>
  333 + <form:select path="isfull" class="input-xlarge" >
  334 + <form:option value="" label="--请选择--" />
  335 + <form:option value="0" label="是" selected = "selected"/>
  336 + <form:option value="1" label="否"/>
  337 + </form:select>
  338 + </c:otherwise>
  339 + </c:choose>
  340 +
  341 + </div>
311 </div> 342 </div>
312 </div> 343 </div>
  344 + </div>
  345 + </div>
  346 + <div class="control-group">
  347 + <div class="row-fluid">
  348 + <div class="span12">
  349 +
313 <div class="span6"> 350 <div class="span6">
314 <label class="control-label">货物类型：</label> 351 <label class="control-label">货物类型：</label>
315 <div class="controls"> 352 <div class="controls">
@@ -487,7 +524,7 @@ th, td { @@ -487,7 +524,7 @@ th, td {
487 if(data[i].receiptinformation!=undefined){ 524 if(data[i].receiptinformation!=undefined){
488 if(data[i].receiptinformation.indexOf("41301")!=-1 || data[i].receiptinformation.indexOf("41106")!=-1 || 525 if(data[i].receiptinformation.indexOf("41301")!=-1 || data[i].receiptinformation.indexOf("41106")!=-1 ||
489 data[i].receiptinformation.indexOf("31301")!=-1 || data[i].receiptinformation.indexOf("31106")!=-1 || 526 data[i].receiptinformation.indexOf("31301")!=-1 || data[i].receiptinformation.indexOf("31106")!=-1 ||
490 - data[i].receiptinformation.indexOf("提运单放行")!=-1 ){ 527 + data[i].receiptinformation.indexOf("提运单放行")!=-1 ||data[i].receiptinformation.indexOf("90001")!=-1 ){
491 if(ieType=="I"){ 528 if(ieType=="I"){
492 flightNo = data[i].flightno; 529 flightNo = data[i].flightno;
493 flightDate = timeFormat(data[i].flightDate).substring(0,10); 530 flightDate = timeFormat(data[i].flightDate).substring(0,10);
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <meta name="decorator" content="default"/> 6 <meta name="decorator" content="default"/>
7 <script type="text/javascript"> 7 <script type="text/javascript">
8 $(document).ready(function() { 8 $(document).ready(function() {
9 - 9 +
10 }); 10 });
11 function page(n,s){ 11 function page(n,s){
12 $("#pageNo").val(n); 12 $("#pageNo").val(n);
@@ -52,28 +52,28 @@ @@ -52,28 +52,28 @@
52 <li> 52 <li>
53 <label>车牌号：</label> 53 <label>车牌号：</label>
54 <form:input path="trailerFrameNo" htmlEscape="false" maxlength="10" class="input-small"/> 54 <form:input path="trailerFrameNo" htmlEscape="false" maxlength="10" class="input-small"/>
55 - 55 +
56 <label>挂靠名称：</label> 56 <label>挂靠名称：</label>
57 <form:input path="agentname" htmlEscape="false" maxlength="32" class="input-small"/> 57 <form:input path="agentname" htmlEscape="false" maxlength="32" class="input-small"/>
58 - 58 +
59 <label>目的场站：</label> 59 <label>目的场站：</label>
60 <form:select path="endstation" class="input" id="station" onchange="change()"> 60 <form:select path="endstation" class="input" id="station" onchange="change()">
61 <form:option value="" label="--请选择--" /> 61 <form:option value="" label="--请选择--" />
62 <form:options items="${yardList}" itemLabel="name" itemValue="stationid" htmlEscape="false" /> 62 <form:options items="${yardList}" itemLabel="name" itemValue="stationid" htmlEscape="false" />
63 </form:select> 63 </form:select>
64 - 64 +
65 <label>卡口：</label> 65 <label>卡口：</label>
66 <form:select path="aisle" class="input" id="aisle"> 66 <form:select path="aisle" class="input" id="aisle">
67 <form:option value="" label="--请选择--" /> 67 <form:option value="" label="--请选择--" />
68 </form:select> 68 </form:select>
69 - 69 +
70 <%-- <label>是否出站</label> 70 <%-- <label>是否出站</label>
71 <form:select path="contrastflag" class="input"> 71 <form:select path="contrastflag" class="input">
72 <form:option value="" label="--请选择--" /> 72 <form:option value="" label="--请选择--" />
73 <form:option value="已进站" label="已进站" /> 73 <form:option value="已进站" label="已进站" />
74 <form:option value="已出站" label="已出站" /> 74 <form:option value="已出站" label="已出站" />
75 </form:select> --%> 75 </form:select> --%>
76 - 76 +
77 </li> 77 </li>
78 <li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/></li> 78 <li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/></li>
79 <li class="clearfix"></li> 79 <li class="clearfix"></li>
@@ -122,13 +122,14 @@ @@ -122,13 +122,14 @@
122 </td> 122 </td>
123 </shiro:hasRole> 123 </shiro:hasRole>
124 <td>${landBusinesstypeList.trailerFrameNo}</td> 124 <td>${landBusinesstypeList.trailerFrameNo}</td>
125 - <td>${landBusinesstypeList.agentname}</td> 125 + <td>${landBusinesstypeList.agentname}</td>
126 <td>${landBusinesstypeList.endport}</td> 126 <td>${landBusinesstypeList.endport}</td>
127 <td> 127 <td>
128 <c:if test='${landBusinesstypeList.endstation =="4604000000"}'>西货站</c:if> 128 <c:if test='${landBusinesstypeList.endstation =="4604000000"}'>西货站</c:if>
129 <c:if test='${landBusinesstypeList.endstation =="4604499001"}'>三号货站</c:if> 129 <c:if test='${landBusinesstypeList.endstation =="4604499001"}'>三号货站</c:if>
130 <c:if test='${landBusinesstypeList.endstation =="4604511001"}'>快邮货站</c:if> 130 <c:if test='${landBusinesstypeList.endstation =="4604511001"}'>快邮货站</c:if>
131 - </td> 131 + <c:if test='${landBusinesstypeList.endstation =="4600329012"}'>综保区货站</c:if>
  132 + </td>
132 <td> 133 <td>
133 <c:if test="${landBusinesstypeList.aisle =='4604333311'}">1号卡口-进</c:if> 134 <c:if test="${landBusinesstypeList.aisle =='4604333311'}">1号卡口-进</c:if>
134 <c:if test="${landBusinesstypeList.aisle =='4604111111'}">1号卡口-进</c:if> 135 <c:if test="${landBusinesstypeList.aisle =='4604111111'}">1号卡口-进</c:if>
@@ -136,8 +137,14 @@ @@ -136,8 +137,14 @@
136 <c:if test="${landBusinesstypeList.aisle =='4604333312'}">1号卡口-出</c:if> 137 <c:if test="${landBusinesstypeList.aisle =='4604333312'}">1号卡口-出</c:if>
137 <c:if test="${landBusinesstypeList.aisle =='4604444412'}">1号卡口-出</c:if> 138 <c:if test="${landBusinesstypeList.aisle =='4604444412'}">1号卡口-出</c:if>
138 <c:if test="${landBusinesstypeList.aisle =='4604110112'}">1号卡口-出</c:if> 139 <c:if test="${landBusinesstypeList.aisle =='4604110112'}">1号卡口-出</c:if>
139 - <c:if test="${landBusinesstypeList.aisle =='4604333321'}">暂不启用</c:if>  
140 - <c:if test="${landBusinesstypeList.aisle =='4604333322'}">暂不启用</c:if> 140 + <c:if test="${landBusinesstypeList.aisle =='4612031001'}">内三卡口-进</c:if>
  141 + <c:if test="${landBusinesstypeList.aisle =='4612030001'}">内三卡口-出</c:if>
  142 + <c:if test="${landBusinesstypeList.aisle =='4600011006'}">6号卡口-进</c:if>
  143 + <c:if test="${landBusinesstypeList.aisle =='4600010006'}">6号卡口-出</c:if>
  144 + <c:if test="${landBusinesstypeList.aisle =='4600011005'}">5号卡口-进</c:if>
  145 + <c:if test="${landBusinesstypeList.aisle =='4600010005'}">5号卡口-出</c:if>
  146 + <c:if test="${landBusinesstypeList.aisle =='4604333321'}">2号卡口-进</c:if>
  147 + <c:if test="${landBusinesstypeList.aisle =='4604333322'}">2号卡口-出</c:if>
141 </td> 148 </td>
142 <td>${landBusinesstypeList.aislewt}</td> 149 <td>${landBusinesstypeList.aislewt}</td>
143 <td>${landBusinesstypeList.remark}</td> 150 <td>${landBusinesstypeList.remark}</td>
@@ -169,4 +176,4 @@ @@ -169,4 +176,4 @@
169 </table> 176 </table>
170 <div class="pagination">${page}</div> 177 <div class="pagination">${page}</div>
171 </body> 178 </body>
172 -</html>  
  179 +</html>
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 <div class="control-group"> 80 <div class="control-group">
81 <label class="control-label">挂车重量：</label> 81 <label class="control-label">挂车重量：</label>
82 <div class="controls"> 82 <div class="controls">
83 - <form:input path="trailerWt" htmlEscape="false" maxlength="10" class="input-xlarge "/> 83 + <form:input path="trailerWt" htmlEscape="false" maxlength="10" class="input-xlarge " oninput = "value=value.replace(/[^\d]/g,'')"/>
84 </div> 84 </div>
85 </div> 85 </div>
86 <div class="control-group"> 86 <div class="control-group">
@@ -137,13 +137,13 @@ input { @@ -137,13 +137,13 @@ input {
137 <label class="row-lable">自重（空车重量）：</label> 137 <label class="row-lable">自重（空车重量）：</label>
138 <span class="row-controls"> 138 <span class="row-controls">
139 <form:input path="selfWt" htmlEscape="false" maxlength="10" placeholder="单位：kg" 139 <form:input path="selfWt" htmlEscape="false" maxlength="10" placeholder="单位：kg"
140 - class="input-large required numberCheck" /> 140 + class="input-large required numberCheck" oninput = "value=value.replace(/[^\d]/g,'')"/>
141 <span class="help-inline"><font color="red">*</font></span> 141 <span class="help-inline"><font color="red">*</font></span>
142 </span> 142 </span>
143 <label class="row-lable">核定载货重量：</label> <span 143 <label class="row-lable">核定载货重量：</label> <span
144 class="row-controls"> 144 class="row-controls">
145 <form:input path="veTon" htmlEscape="false" maxlength="10" 145 <form:input path="veTon" htmlEscape="false" maxlength="10"
146 - class="input-large numberCheck" placeholder="货车核载单位为：kg" /> 146 + class="input-large numberCheck" placeholder="货车核载单位为：kg" oninput = "value=value.replace(/[^\d]/g,'')"/>
147 </span> 147 </span>
148 </div> 148 </div>
149 <%-- <div class="control-group"> 149 <%-- <div class="control-group">
@@ -77,8 +77,9 @@ @@ -77,8 +77,9 @@
77 <fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/> 77 <fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
78 </a></td> 78 </a></td>
79 <shiro:hasPermission name="land:landRoadVeRecord:edit"><td> 79 <shiro:hasPermission name="land:landRoadVeRecord:edit"><td>
80 - <a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">修改</a> 80 +
81 <shiro:hasAnyRoles name="dept,admin,leader"> 81 <shiro:hasAnyRoles name="dept,admin,leader">
  82 + <a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">修改</a>
82 <a href="${ctx}/land/landRoadVeRecord/delete?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要删除该备案吗？', this.href)">删除</a> 83 <a href="${ctx}/land/landRoadVeRecord/delete?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要删除该备案吗？', this.href)">删除</a>
83 <%--<c:if test="${landRoadVeRecord.operationTyp.veClassFlag=='1' }"></c:if>--%> 84 <%--<c:if test="${landRoadVeRecord.operationTyp.veClassFlag=='1' }"></c:if>--%>
84 <a href="${ctx}/land/landRoadVeRecord/change?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要审批吗？', this.href)">审批</a> 85 <a href="${ctx}/land/landRoadVeRecord/change?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要审批吗？', this.href)">审批</a>