wms / wms_xiaogangabu · Commits

Commit 4248ad0d78880c740121eb1d80fb8f26ba0d291f

Authored by mahuandong
1 parent 7e370aa4
develop ... master test

修改登录方法和根据登录名查找仓库，修复用户登录bug

Inline Side-by-side
Showing 5 changed files with 488 additions and 433 deletions
src/main/java/com/huaheng/framework/web/exception/DefaultExceptionHandler.java
  View file @4248ad0
... ... @@ -120,4 +120,4 @@ public class DefaultExceptionHandler
120 120 return AjaxResult.error("演示模式，不允许操作");
121 121 }
122 122  
123 123 -}
  124 +}
124 125 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java
  View file @4248ad0
1 1 package com.huaheng.pc.shipment.shipmentHeader.domain;
2 2  
3   -import com.huaheng.framework.web.domain.BaseEntity;
4   -import org.apache.commons.lang3.builder.ToStringBuilder;
5   -import org.apache.commons.lang3.builder.ToStringStyle;
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import java.io.Serializable;
6 8 import java.math.BigDecimal;
7 9 import java.util.Date;
8   -import java.util.List;
9   -
10   -
11   -/**
12   - * 出库单主表 shipment_header
13   - *
14   - * @author huaheng
15   - * @date 2018-08-19
16   - */
17   -public class ShipmentHeader extends BaseEntity
18   -{
19   - private static final long serialVersionUID = 1L;
20   -
21   - /** 出库id */
22   - private Integer id;
23   - /** 出库单号 */
24   - private String code;
25   - /** 仓库Id */
26   - private Integer warehouseId;
27   - /** 仓库编码 */
28   - private String warehouseCode;
29   - //u8仓库
30   - private String uWarehouseCode;
31   - /** 货主id */
32   - private Integer companyId;
33   - /** 货主code */
34   - private String companyCode;
35   - /** 上游系统单号 */
36   - private String sourceCode;
37   - /** 上游平台 */
38   - private String sourcePlatform;
39   - /** 出库单类型 */
40   - private String type;
41   - /** 客户编码 */
42   - private String shipTo;
43   - /** 优先级 */
44   - private Integer priority;
45   - /** 发货站台 */
46   - private String station;
47   - /** 总数量 */
48   - private BigDecimal totalQty;
49   - /** 总行数 */
50   - private Integer totalLines;
51   - /** 备注 */
52   - private String remark;
53   - /** 上传备注 */
54   - private String uploadremark;
55   - /** 上传时间 */
56   - private Date uploadTime;
57   - /** 发货预约时间 */
58   - private Date appointmentTime;
59   - /** 单据头状态 */
60   - private Integer firstStatus;
61   - /** 单据尾状态 */
62   - private Integer lastStatus;
63   - /** upload状态 */
64   - private Integer uploadStatus;
65   - /** 创建时间 */
66   - private Date created;
67   - /** 创建用户 */
68   - private String createdBy;
69   - /** 最后修改时间 */
70   - private Date lastUpdated;
71   - /** 更新用户 */
72   - private String lastUpdatedBy;
73   - /** 是否有效 */
74   - private Boolean enable;
75   - /** 删除标记 */
76   - private Boolean deleted;
77   - /** 扫描标识 */
78   - private String scanid;
79   - /** 自定义字段1 */
80   - private String userDef1;
81   - /** 自定义字段2 */
82   - private String userDef2;
83   - /** 自定义字段3 */
84   - private String userDef3;
85   - /** 货主id组 */
86   - private List<Integer> companyIdList;
87   - /** 货主编码组 */
88   - private List<String> companyCodeList;
89   -
90   - public String getuWarehouseCode() {
91   - return uWarehouseCode;
92   - }
93   -
94   - public void setuWarehouseCode(String uWarehouseCode) {
95   - this.uWarehouseCode = uWarehouseCode;
96   - }
97   -
98   - public void setId(Integer id)
99   - {
100   - this.id = id;
101   - }
102   -
103   - public Integer getId()
104   - {
105   - return id;
106   - }
107   - public void setCode(String code)
108   - {
109   - this.code = code;
110   - }
111   -
112   - public String getCode()
113   - {
114   - return code;
115   - }
116   - public void setWarehouseId(Integer warehouseId)
117   - {
118   - this.warehouseId = warehouseId;
119   - }
120   -
121   - public Integer getWarehouseId()
122   - {
123   - return warehouseId;
124   - }
125   - public void setWarehouseCode(String warehouseCode)
126   - {
127   - this.warehouseCode = warehouseCode;
128   - }
129   -
130   - public String getWarehouseCode()
131   - {
132   - return warehouseCode;
133   - }
134   - public void setCompanyId(Integer companyId)
135   - {
136   - this.companyId = companyId;
137   - }
138   -
139   - public Integer getCompanyId()
140   - {
141   - return companyId;
142   - }
143   - public void setCompanyCode(String companyCode)
144   - {
145   - this.companyCode = companyCode;
146   - }
147   -
148   - public String getCompanyCode()
149   - {
150   - return companyCode;
151   - }
152   - public void setSourceCode(String sourceCode)
153   - {
154   - this.sourceCode = sourceCode;
155   - }
156   -
157   - public String getSourceCode()
158   - {
159   - return sourceCode;
160   - }
161   - public void setSourcePlatform(String sourcePlatform)
162   - {
163   - this.sourcePlatform = sourcePlatform;
164   - }
165   -
166   - public String getSourcePlatform()
167   - {
168   - return sourcePlatform;
169   - }
170   - public void setType(String type)
171   - {
172   - this.type = type;
173   - }
174   -
175   - public String getType()
176   - {
177   - return type;
178   - }
179   - public void setShipTo(String shipTo)
180   - {
181   - this.shipTo = shipTo;
182   - }
183   -
184   - public String getShipTo()
185   - {
186   - return shipTo;
187   - }
188   - public void setPriority(Integer priority)
189   - {
190   - this.priority = priority;
191   - }
192   -
193   - public Integer getPriority()
194   - {
195   - return priority;
196   - }
197   - public void setStation(String station)
198   - {
199   - this.station = station;
200   - }
201   -
202   - public String getStation()
203   - {
204   - return station;
205   - }
206   - public void setTotalQty(BigDecimal totalQty)
207   - {
208   - this.totalQty = totalQty;
209   - }
210   -
211   - public BigDecimal getTotalQty()
212   - {
213   - return totalQty;
214   - }
215   - public void setTotalLines(Integer totalLines)
216   - {
217   - this.totalLines = totalLines;
218   - }
219   -
220   - public Integer getTotalLines()
221   - {
222   - return totalLines;
223   - }
224   - public void setRemark(String remark)
225   - {
226   - this.remark = remark;
227   - }
228   -
229   - public String getRemark()
230   - {
231   - return remark;
232   - }
233   - public void setUploadremark(String uploadremark)
234   - {
235   - this.uploadremark = uploadremark;
236   - }
237   -
238   - public String getUploadremark()
239   - {
240   - return uploadremark;
241   - }
242   - public void setUploadTime(Date uploadTime)
243   - {
244   - this.uploadTime = uploadTime;
245   - }
246   -
247   - public Date getUploadTime()
248   - {
249   - return uploadTime;
250   - }
251   - public void setAppointmentTime(Date appointmentTime)
252   - {
253   - this.appointmentTime = appointmentTime;
254   - }
255   -
256   - public Date getAppointmentTime()
257   - {
258   - return appointmentTime;
259   - }
260   - public void setFirstStatus(Integer firstStatus)
261   - {
262   - this.firstStatus = firstStatus;
263   - }
264   -
265   - public Integer getFirstStatus()
266   - {
267   - return firstStatus;
268   - }
269   - public void setLastStatus(Integer lastStatus)
270   - {
271   - this.lastStatus = lastStatus;
272   - }
273   -
274   - public Integer getLastStatus()
275   - {
276   - return lastStatus;
277   - }
278   - public void setUploadStatus(Integer uploadStatus)
279   - {
280   - this.uploadStatus = uploadStatus;
281   - }
282   -
283   - public Integer getUploadStatus()
284   - {
285   - return uploadStatus;
286   - }
287   - public void setCreated(Date created)
288   - {
289   - this.created = created;
290   - }
291   -
292   - public Date getCreated()
293   - {
294   - return created;
295   - }
296   - public void setCreatedBy(String createdBy)
297   - {
298   - this.createdBy = createdBy;
299   - }
300   -
301   - public String getCreatedBy()
302   - {
303   - return createdBy;
304   - }
305   - public void setLastUpdated(Date lastUpdated)
306   - {
307   - this.lastUpdated = lastUpdated;
308   - }
309   -
310   - public Date getLastUpdated()
311   - {
312   - return lastUpdated;
313   - }
314   - public void setLastUpdatedBy(String lastUpdatedBy)
315   - {
316   - this.lastUpdatedBy = lastUpdatedBy;
317   - }
318   -
319   - public String getLastUpdatedBy()
320   - {
321   - return lastUpdatedBy;
322   - }
323   - public void setEnable(Boolean enable)
324   - {
325   - this.enable = enable;
326   - }
327   -
328   - public Boolean getEnable()
329   - {
330   - return enable;
331   - }
332   - public void setUserDef1(String userDef1)
333   - {
334   - this.userDef1 = userDef1;
335   - }
336   -
337   - public String getUserDef1()
338   - {
339   - return userDef1;
340   - }
341   - public void setUserDef2(String userDef2)
342   - {
343   - this.userDef2 = userDef2;
344   - }
345   -
346   - public String getUserDef2()
347   - {
348   - return userDef2;
349   - }
350   - public void setUserDef3(String userDef3)
351   - {
352   - this.userDef3 = userDef3;
353   - }
354   -
355   - public String getUserDef3()
356   - {
357   - return userDef3;
358   - }
359   -
360   - public Boolean getDeleted() {
361   - return deleted;
362   - }
363   -
364   - public void setDeleted(Boolean deleted) {
365   - this.deleted = deleted;
366   - }
367   -
368   - public List<Integer> getCompanyIdList() {
369   - return companyIdList;
370   - }
371   -
372   - public void setCompanyIdList(List<Integer> companyIdList) {
373   - this.companyIdList = companyIdList;
374   - }
375   -
376   - public List<String> getCompanyCodeList() {
377   - return companyCodeList;
378   - }
379   -
380   - public void setCompanyCodeList(List<String> companyCodeList) {
381   - this.companyCodeList = companyCodeList;
382   - }
383   -
384   - public String getScanid() {
385   - return scanid;
386   - }
387   -
388   - public void setScanid(String scanid) {
389   - this.scanid = scanid;
390   - }
391   -
392   - public String toString() {
393   - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
394   - .append("id", getId())
395   - .append("code", getCode())
396   - .append("warehouseId", getWarehouseId())
397   - .append("warehouseCode", getWarehouseCode())
398   - .append("uWarehouseCode",getuWarehouseCode())
399   - .append("companyId", getCompanyId())
400   - .append("companyCode", getCompanyCode())
401   - .append("sourceCode", getSourceCode())
402   - .append("sourcePlatform", getSourcePlatform())
403   - .append("type", getType())
404   - .append("shipTo", getShipTo())
405   - .append("priority", getPriority())
406   - .append("station", getStation())
407   - .append("totalQty", getTotalQty())
408   - .append("totalLines", getTotalLines())
409   - .append("remark", getRemark())
410   - .append("uploadremark", getUploadremark())
411   - .append("uploadTime", getUploadTime())
412   - .append("appointmentTime", getAppointmentTime())
413   - .append("firstStatus", getFirstStatus())
414   - .append("lastStatus", getLastStatus())
415   - .append("uploadStatus", getUploadStatus())
416   - .append("created", getCreated())
417   - .append("createdBy", getCreatedBy())
418   - .append("lastUpdated", getLastUpdated())
419   - .append("lastUpdatedBy", getLastUpdatedBy())
420   - .append("enable", getEnable())
421   - .append("deleted", getDeleted())
422   - .append("scanid",getScanid())
423   - .append("userDef1", getUserDef1())
424   - .append("userDef2", getUserDef2())
425   - .append("userDef3", getUserDef3())
426   - .toString();
427   - }
428   -}
  10 +import lombok.Data;
  11 +
  12 +@Data
  13 +@TableName(value = "shipment_header")
  14 +public class ShipmentHeader implements Serializable {
  15 + /**
  16 + * 出库单内部号
  17 + */
  18 + @TableId(value = "id", type = IdType.AUTO)
  19 + private Integer id;
  20 +
  21 + /**
  22 + * 仓库
  23 + */
  24 + @TableField(value = "warehouseCode")
  25 + private String warehouseCode;
  26 +
  27 + /**
  28 + * 货主
  29 + */
  30 + @TableField(value = "companyCode")
  31 + private String companyCode;
  32 +
  33 + /**
  34 + * 装载号
  35 + */
  36 + @TableField(value = "loadId")
  37 + private Integer loadId;
  38 +
  39 + /**
  40 + * 出库单号
  41 + */
  42 + @TableField(value = "code")
  43 + private String code;
  44 +
  45 + /**
  46 + * erp订单号
  47 + */
  48 + @TableField(value = "referCode")
  49 + private String referCode;
  50 +
  51 + /**
  52 + * erp订单类型
  53 + */
  54 + @TableField(value = "referCodeType")
  55 + private String referCodeType;
  56 +
  57 + /**
  58 + * erp订单内部号
  59 + */
  60 + @TableField(value = "referId")
  61 + private Integer referId;
  62 +
  63 + /**
  64 + * 订单平台
  65 + */
  66 + @TableField(value = "referPlatform")
  67 + private Integer referPlatform;
  68 +
  69 + /**
  70 + * 主状态
  71 + */
  72 + @TableField(value = "firstStatus")
  73 + private Integer firstStatus;
  74 +
  75 + /**
  76 + * 拖状态
  77 + */
  78 + @TableField(value = "lastStatus")
  79 + private Integer lastStatus;
  80 +
  81 + /**
  82 + * 出库单类型
  83 + */
  84 + @TableField(value = "shipmentType")
  85 + private String shipmentType;
  86 +
  87 + /**
  88 + * 路线
  89 + */
  90 + @TableField(value = "route")
  91 + private String route;
  92 +
  93 + /**
  94 + * 客户编号
  95 + */
  96 + @TableField(value = "customerCode")
  97 + private String customerCode;
  98 +
  99 + /**
  100 + * 客户名称
  101 + */
  102 + @TableField(value = "customerName")
  103 + private String customerName;
  104 +
  105 + /**
  106 + * 优先级
  107 + */
  108 + @TableField(value = "priority")
  109 + private Integer priority;
  110 +
  111 + /**
  112 + * 要求到货时间
  113 + */
  114 + @TableField(value = "requestedDeliveryDate")
  115 + private Date requestedDeliveryDate;
  116 +
  117 + /**
  118 + * 要求到货类型
  119 + */
  120 + @TableField(value = "requestedDeliveryType")
  121 + private String requestedDeliveryType;
  122 +
  123 + /**
  124 + * 计划发车日期
  125 + */
  126 + @TableField(value = "scheduledShipDate")
  127 + private Date scheduledShipDate;
  128 +
  129 + /**
  130 + * 实际发车时间
  131 + */
  132 + @TableField(value = "actualShipDateTime")
  133 + private Date actualShipDateTime;
  134 +
  135 + /**
  136 + * 实际到货时间
  137 + */
  138 + @TableField(value = "actualDeliveryDate")
  139 + private Date actualDeliveryDate;
  140 +
  141 + /**
  142 + * 配送要求
  143 + */
  144 + @TableField(value = "deliveryNote")
  145 + private String deliveryNote;
  146 +
  147 + /**
  148 + * 失败原因
  149 + */
  150 + @TableField(value = "rejectionNote")
  151 + private String rejectionNote;
  152 +
  153 + /**
  154 + * 波次号
  155 + */
  156 + @TableField(value = "waveId")
  157 + private Integer waveId;
  158 +
  159 + /**
  160 + * 发货月台
  161 + */
  162 + @TableField(value = "shipDock")
  163 + private String shipDock;
  164 +
  165 + /**
  166 + * 分配完成
  167 + */
  168 + @TableField(value = "allocateComplete")
  169 + private Integer allocateComplete;
  170 +
  171 + /**
  172 + * 总重量
  173 + */
  174 + @TableField(value = "totalWeight")
  175 + private BigDecimal totalWeight;
  176 +
  177 + /**
  178 + * 总数量
  179 + */
  180 + @TableField(value = "totalQty")
  181 + private Integer totalQty;
  182 +
  183 + /**
  184 + * 总体积
  185 + */
  186 + @TableField(value = "totalVolume")
  187 + private BigDecimal totalVolume;
  188 +
  189 + /**
  190 + * 总行数
  191 + */
  192 + @TableField(value = "totalLines")
  193 + private Integer totalLines;
  194 +
  195 + /**
  196 + * 总拼箱数
  197 + */
  198 + @TableField(value = "totalContainers")
  199 + private Integer totalContainers;
  200 +
  201 + /**
  202 + * 总整箱数
  203 + */
  204 + @TableField(value = "totalCases")
  205 + private Integer totalCases;
  206 +
  207 + /**
  208 + * 总价值
  209 + */
  210 + @TableField(value = "totalValue")
  211 + private BigDecimal totalValue;
  212 +
  213 + /**
  214 + * 处理类型
  215 + */
  216 + @TableField(value = "processType")
  217 + private String processType;
  218 +
  219 + /**
  220 + * 上次波次号
  221 + */
  222 + @TableField(value = "lastWaveId")
  223 + private Integer lastWaveId;
  224 +
  225 + /**
  226 + * 特征值
  227 + */
  228 + @TableField(value = "signValue")
  229 + private String signValue;
  230 +
  231 + /**
  232 + * 承运人
  233 + */
  234 + @TableField(value = "carrierCode")
  235 + private String carrierCode;
  236 +
  237 + /**
  238 + * 承运人服务商
  239 + */
  240 + @TableField(value = "carrierService")
  241 + private String carrierService;
  242 +
  243 + /**
  244 + * 订单备注
  245 + */
  246 + @TableField(value = "shipmentNote")
  247 + private String shipmentNote;
  248 +
  249 + /**
  250 + * 承运商编码
  251 + */
  252 + @TableField(value = "carrierServer")
  253 + private String carrierServer;
  254 +
  255 + /**
  256 + * 承运商名称
  257 + */
  258 + @TableField(value = "carrierServerName")
  259 + private String carrierServerName;
  260 +
  261 + /**
  262 + * 车牌号
  263 + */
  264 + @TableField(value = "plateNumber")
  265 + private String plateNumber;
  266 +
  267 + /**
  268 + * 车型
  269 + */
  270 + @TableField(value = "carModel")
  271 + private String carModel;
  272 +
  273 + /**
  274 + * 司机名称
  275 + */
  276 + @TableField(value = "driverName")
  277 + private String driverName;
  278 +
  279 + /**
  280 + * 司机联系方式
  281 + */
  282 + @TableField(value = "driverTel")
  283 + private String driverTel;
  284 +
  285 + /**
  286 + * 创建时间
  287 + */
  288 + @TableField(value = "created")
  289 + private Date created;
  290 +
  291 + /**
  292 + * 创建用户
  293 + */
  294 + @TableField(value = "createdBy")
  295 + private String createdBy;
  296 +
  297 + /**
  298 + * 创建时间
  299 + */
  300 + @TableField(value = "lastUpdated")
  301 + private Date lastUpdated;
  302 +
  303 + /**
  304 + * 更新用户
  305 + */
  306 + @TableField(value = "lastUpdatedBy")
  307 + private String lastUpdatedBy;
  308 +
  309 + /**
  310 + * 数据版本
  311 + */
  312 + @TableField(value = "version")
  313 + private Integer version;
  314 +
  315 + /**
  316 + * 自定义字段1
  317 + */
  318 + @TableField(value = "userDef1")
  319 + private String userDef1;
  320 +
  321 + /**
  322 + * 自定义字段2
  323 + */
  324 + @TableField(value = "userDef2")
  325 + private String userDef2;
  326 +
  327 + /**
  328 + * 自定义字段3
  329 + */
  330 + @TableField(value = "userDef3")
  331 + private String userDef3;
  332 +
  333 + /**
  334 + * 自定义字段4
  335 + */
  336 + @TableField(value = "userDef4")
  337 + private String userDef4;
  338 +
  339 + /**
  340 + * 自定义字段5
  341 + */
  342 + @TableField(value = "userDef5")
  343 + private String userDef5;
  344 +
  345 + /**
  346 + * 自定义字段6
  347 + */
  348 + @TableField(value = "userDef6")
  349 + private String userDef6;
  350 +
  351 + /**
  352 + * 自定义字段7
  353 + */
  354 + @TableField(value = "userDef7")
  355 + private String userDef7;
  356 +
  357 + /**
  358 + * 自定义字段8
  359 + */
  360 + @TableField(value = "userDef8")
  361 + private String userDef8;
  362 +
  363 + /**
  364 + * 处理标记
  365 + */
  366 + @TableField(value = "processStamp")
  367 + private String processStamp;
  368 +
  369 + private static final long serialVersionUID = 1L;
  370 +
  371 + public static final String COL_WAREHOUSECODE = "warehouseCode";
  372 +
  373 + public static final String COL_COMPANYCODE = "companyCode";
  374 +
  375 + public static final String COL_LOADID = "loadId";
  376 +
  377 + public static final String COL_CODE = "code";
  378 +
  379 + public static final String COL_REFERCODE = "referCode";
  380 +
  381 + public static final String COL_REFERCODETYPE = "referCodeType";
  382 +
  383 + public static final String COL_REFERID = "referId";
  384 +
  385 + public static final String COL_REFERPLATFORM = "referPlatform";
  386 +
  387 + public static final String COL_FIRSTSTATUS = "firstStatus";
  388 +
  389 + public static final String COL_LASTSTATUS = "lastStatus";
  390 +
  391 + public static final String COL_SHIPMENTTYPE = "shipmentType";
  392 +
  393 + public static final String COL_ROUTE = "route";
  394 +
  395 + public static final String COL_CUSTOMERCODE = "customerCode";
  396 +
  397 + public static final String COL_CUSTOMERNAME = "customerName";
  398 +
  399 + public static final String COL_PRIORITY = "priority";
  400 +
  401 + public static final String COL_REQUESTEDDELIVERYDATE = "requestedDeliveryDate";
  402 +
  403 + public static final String COL_REQUESTEDDELIVERYTYPE = "requestedDeliveryType";
  404 +
  405 + public static final String COL_SCHEDULEDSHIPDATE = "scheduledShipDate";
  406 +
  407 + public static final String COL_ACTUALSHIPDATETIME = "actualShipDateTime";
  408 +
  409 + public static final String COL_ACTUALDELIVERYDATE = "actualDeliveryDate";
  410 +
  411 + public static final String COL_DELIVERYNOTE = "deliveryNote";
  412 +
  413 + public static final String COL_REJECTIONNOTE = "rejectionNote";
  414 +
  415 + public static final String COL_WAVEID = "waveId";
  416 +
  417 + public static final String COL_SHIPDOCK = "shipDock";
  418 +
  419 + public static final String COL_ALLOCATECOMPLETE = "allocateComplete";
  420 +
  421 + public static final String COL_TOTALWEIGHT = "totalWeight";
  422 +
  423 + public static final String COL_TOTALQTY = "totalQty";
  424 +
  425 + public static final String COL_TOTALVOLUME = "totalVolume";
  426 +
  427 + public static final String COL_TOTALLINES = "totalLines";
  428 +
  429 + public static final String COL_TOTALCONTAINERS = "totalContainers";
  430 +
  431 + public static final String COL_TOTALCASES = "totalCases";
  432 +
  433 + public static final String COL_TOTALVALUE = "totalValue";
  434 +
  435 + public static final String COL_PROCESSTYPE = "processType";
  436 +
  437 + public static final String COL_LASTWAVEID = "lastWaveId";
  438 +
  439 + public static final String COL_SIGNVALUE = "signValue";
  440 +
  441 + public static final String COL_CARRIERCODE = "carrierCode";
  442 +
  443 + public static final String COL_CARRIERSERVICE = "carrierService";
  444 +
  445 + public static final String COL_SHIPMENTNOTE = "shipmentNote";
  446 +
  447 + public static final String COL_CARRIERSERVER = "carrierServer";
  448 +
  449 + public static final String COL_CARRIERSERVERNAME = "carrierServerName";
  450 +
  451 + public static final String COL_PLATENUMBER = "plateNumber";
  452 +
  453 + public static final String COL_CARMODEL = "carModel";
  454 +
  455 + public static final String COL_DRIVERNAME = "driverName";
  456 +
  457 + public static final String COL_DRIVERTEL = "driverTel";
  458 +
  459 + public static final String COL_CREATED = "created";
  460 +
  461 + public static final String COL_CREATEDBY = "createdBy";
  462 +
  463 + public static final String COL_LASTUPDATED = "lastUpdated";
  464 +
  465 + public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
  466 +
  467 + public static final String COL_VERSION = "version";
  468 +
  469 + public static final String COL_USERDEF1 = "userDef1";
  470 +
  471 + public static final String COL_USERDEF2 = "userDef2";
  472 +
  473 + public static final String COL_USERDEF3 = "userDef3";
  474 +
  475 + public static final String COL_USERDEF4 = "userDef4";
  476 +
  477 + public static final String COL_USERDEF5 = "userDef5";
  478 +
  479 + public static final String COL_USERDEF6 = "userDef6";
  480 +
  481 + public static final String COL_USERDEF7 = "userDef7";
  482 +
  483 + public static final String COL_USERDEF8 = "userDef8";
  484 +
  485 + public static final String COL_PROCESSSTAMP = "processStamp";
  486 +}
429 487 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/system/user/controller/LoginController.java
  View file @4248ad0
... ... @@ -65,15 +65,14 @@ public class LoginController extends BaseController
65 65  
66 66 @PostMapping(value = "/login")
67 67 @ResponseBody
68   - public AjaxResult ajaxLogin(String username, String password, String warehouse, Integer warehouseId, String warehouseCode, Boolean rememberMe)
  68 + public AjaxResult ajaxLogin(String username, String password, String warehouse, String warehouseCode, Boolean rememberMe)
69 69 {
70 70 if (StringUtils.isNotEmpty(warehouse))
71 71 {
72 72 String[] warehouseArray = warehouse.split(",");
73   - warehouseId = Integer.valueOf(warehouseArray[0]);
74 73 warehouseCode = warehouseArray[1];
75 74 }
76   - AjaxResult ajaxResult = userService.login(username, password, warehouseId, warehouseCode, rememberMe);
  75 + AjaxResult ajaxResult = userService.login(username, password, warehouseCode, rememberMe);
77 76 return ajaxResult;
78 77 }
79 78  
... ...
src/main/java/com/huaheng/pc/system/user/service/IUserService.java
  View file @4248ad0
... ... @@ -20,11 +20,10 @@ public interface IUserService
20 20 * 登陆验证
21 21 * @param username 用户名
22 22 * @param password 密 码
23   - * @param warehouseId 仓库id
24 23 * @param warehouseCode 仓库编码
25 24 * @return
26 25 */
27   - AjaxResult login(String username, String password, Integer warehouseId, String warehouseCode, Boolean rememberMe);
  26 + AjaxResult login(String username, String password, String warehouseCode, Boolean rememberMe);
28 27  
29 28 /**
30 29 * 登陆验证
... ...
src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java
  View file @4248ad0
... ... @@ -77,13 +77,13 @@ public class UserServiceImpl implements IUserService
77 77 * @return
78 78 */
79 79 @Override
80   - public AjaxResult login(String username, String password, Integer warehouseId, String warehouseCode, Boolean rememberMe)
  80 + public AjaxResult login(String username, String password, String warehouseCode, Boolean rememberMe)
81 81 {
82 82 if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
83 83 {
84 84 return AjaxResult.error("用户名和密码不能为空");
85 85 }
86   - if (warehouseId == null || StringUtils.isEmpty(warehouseCode))
  86 + if (StringUtils.isEmpty(warehouseCode))
87 87 {
88 88 return AjaxResult.error("请选择仓库");
89 89 }
... ... @@ -103,7 +103,6 @@ public class UserServiceImpl implements IUserService
103 103 return AjaxResult.error(msg);
104 104 }
105 105 User user = ShiroUtils.getUser();
106   - user.setWarehouseId(warehouseId);
107 106 user.setWarehouseCode(warehouseCode);
108 107 ShiroUtils.setUser(user);
109 108 List<Company> Companys = companyService.selectCompanyByCurrentUserId();
... ...