添加出库单位
This commit is contained in:
@@ -87,5 +87,8 @@ public class SysOaWarehouseMasterVo {
|
|||||||
* 日志操作次数
|
* 日志操作次数
|
||||||
*/
|
*/
|
||||||
private Integer logCount;
|
private Integer logCount;
|
||||||
|
//单位
|
||||||
|
@ExcelProperty(value = "单位")
|
||||||
|
private String unit;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -102,6 +102,7 @@
|
|||||||
sowd.remark,
|
sowd.remark,
|
||||||
sow.brand,
|
sow.brand,
|
||||||
sow.name AS warehouseName,
|
sow.name AS warehouseName,
|
||||||
|
sow.unit,
|
||||||
COALESCE(sow.model, sowt.model) AS model,
|
COALESCE(sow.model, sowt.model) AS model,
|
||||||
COALESCE(sow.brand, sowt.brand) AS brand,
|
COALESCE(sow.brand, sowt.brand) AS brand,
|
||||||
COALESCE(sow.specifications, sowt.specifications) AS specifications,
|
COALESCE(sow.specifications, sowt.specifications) AS specifications,
|
||||||
|
|||||||
Reference in New Issue
Block a user