xins
/
HwMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.6.5

Browse Source 
时间显示精确到时分秒
master
xs 1 month ago
parent 0a8fade792
commit ba106f1116
7 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File

8
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheck.java
Unescape Escape View File

@ -37,12 +37,12 @@ public class WmsInventoryCheck extends BaseEntity
private String checkType;
/** 盘点开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "盘点开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginTime;
/** 盘点结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "盘点结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
@ -59,12 +59,12 @@ public class WmsInventoryCheck extends BaseEntity
private Long inventoriedAmount;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDate;
/** 最后更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updateDate;

4
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheckDetail.java
Unescape Escape View File

@ -72,12 +72,12 @@ public class WmsInventoryCheckDetail extends BaseEntity
private BigDecimal erpAmount;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDate;
/** 最后更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updateDate;

2
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsMoveDetail.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class WmsMoveDetail extends BaseEntity
private String executePerson;
/** 执行时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "执行时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date executeTime;

2
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java
Unescape Escape View File

@ -126,7 +126,7 @@ public class WmsProductInstock extends BaseEntity {
/**
* 申请时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date applyDate;

12
hw-ui/src/views/wms/info/inventoryCheck/index.vue
Unescape Escape View File

@ -85,29 +85,17 @@
</template>
</el-table-column>
<el-table-column label="盘点开始时间" align="center" prop="beginTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="盘点结束时间" align="center" prop="endTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="库位总数量" align="center" prop="locationAmount"/>
<el-table-column label="正在盘点库位数量" align="center" prop="inventoryingAmount"/>
<el-table-column label="已盘点库位数量" align="center" prop="inventoriedAmount"/>
<el-table-column label="创建人" align="center" prop="createBy"/>
<el-table-column label="创建时间" align="center" prop="createDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy"/>
<el-table-column label="更新时间" align="center" prop="updateDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>

3
hw-ui/src/views/wms/info/productInstock/index.vue
Unescape Escape View File

@ -146,9 +146,6 @@
</el-table-column>
<el-table-column label="入库人" align="center" prop="applyBy" />
<el-table-column label="入库时间" align="center" prop="applyDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="同步ERP状态" align="center" prop="erpStatus" >

3
hw-ui/src/views/wms/info/rawreturn/index.vue
Unescape Escape View File

@ -90,9 +90,6 @@
</el-table-column>
<el-table-column label="申请人" align="center" prop="applyBy"/>
<el-table-column label="申请时间" align="center" prop="applyDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="申请原因" align="center" prop="applyReason"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">

Write Preview
Loading…
Cancel
Save