mirror of
https://github.com/zccbbg/wms-ruoyi.git
synced 2024-09-20 19:15:54 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
2676c79828
|
@ -1,5 +1,6 @@
|
||||||
package com.ruoyi.system.domain;
|
package com.ruoyi.system.domain;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
|
@ -50,7 +51,7 @@ public class SysLogininfor extends BaseEntity
|
||||||
/** 访问时间 */
|
/** 访问时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
@Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date loginTime;
|
private LocalDateTime loginTime;
|
||||||
|
|
||||||
public Long getInfoId()
|
public Long getInfoId()
|
||||||
{
|
{
|
||||||
|
@ -122,6 +123,14 @@ public class SysLogininfor extends BaseEntity
|
||||||
this.os = os;
|
this.os = os;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LocalDateTime getLoginTime() {
|
||||||
|
return loginTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLoginTime(LocalDateTime loginTime) {
|
||||||
|
this.loginTime = loginTime;
|
||||||
|
}
|
||||||
|
|
||||||
public String getMsg()
|
public String getMsg()
|
||||||
{
|
{
|
||||||
return msg;
|
return msg;
|
||||||
|
@ -132,13 +141,5 @@ public class SysLogininfor extends BaseEntity
|
||||||
this.msg = msg;
|
this.msg = msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Date getLoginTime()
|
|
||||||
{
|
|
||||||
return loginTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLoginTime(Date loginTime)
|
|
||||||
{
|
|
||||||
this.loginTime = loginTime;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,12 +2,16 @@ package com.cyl.wms.domain;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import com.ruoyi.common.core.domain.BaseAudit;
|
import com.ruoyi.common.core.domain.BaseAudit;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物料对象 wms_item
|
* 物料对象 wms_item
|
||||||
*
|
*
|
||||||
|
@ -56,6 +60,8 @@ public class Item extends BaseAudit {
|
||||||
|
|
||||||
@ApiModelProperty("有效期")
|
@ApiModelProperty("有效期")
|
||||||
@Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
@Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime expiryDate;
|
private LocalDateTime expiryDate;
|
||||||
|
|
||||||
@ApiModelProperty("删除标识")
|
@ApiModelProperty("删除标识")
|
||||||
|
|
|
@ -89,6 +89,7 @@ public class ItemService {
|
||||||
PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
|
PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
|
||||||
}
|
}
|
||||||
QueryWrapper<Item> qw = new QueryWrapper<>();
|
QueryWrapper<Item> qw = new QueryWrapper<>();
|
||||||
|
qw.orderByDesc("id");
|
||||||
if (!StrUtil.isEmpty(query.getSearch())) {
|
if (!StrUtil.isEmpty(query.getSearch())) {
|
||||||
String search = query.getSearch();
|
String search = query.getSearch();
|
||||||
qw.eq("create_by", SecurityUtils.getUserId());
|
qw.eq("create_by", SecurityUtils.getUserId());
|
||||||
|
|
|
@ -100,6 +100,7 @@ public class ShipmentOrderService {
|
||||||
PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
|
PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
|
||||||
}
|
}
|
||||||
QueryWrapper<ShipmentOrder> qw = new QueryWrapper<>();
|
QueryWrapper<ShipmentOrder> qw = new QueryWrapper<>();
|
||||||
|
qw.orderByDesc("id");
|
||||||
qw.eq("del_flag",0);
|
qw.eq("del_flag",0);
|
||||||
String shipmentOrderNo = query.getShipmentOrderNo();
|
String shipmentOrderNo = query.getShipmentOrderNo();
|
||||||
if (!StringUtils.isEmpty(shipmentOrderNo)) {
|
if (!StringUtils.isEmpty(shipmentOrderNo)) {
|
||||||
|
|
Loading…
Reference in a new issue