feat(oms/wms): 出入库明细货物种类改显物料分类名称、单据类型回显与查询条件
一、货物种类 - O/W出入库明细查询新增返回materialClassifyName(物料分类名称,多个逗号分隔) - WMS入库导出"货物种类"列、出库导出"种类"列改为物料分类名称(原为goodsType编码转文字) - OMS出入库导出新增"货物种类"列,货物类型列加字典转换不再显示0/1/2编码 二、单据类型 - O/W入库明细查询新增orderTypeCode/orderTypeName回显与查询条件(编码精确/名称模糊) - WMS入库明细导出新增"业务单据类型"列(第31列) 三、时间字段 - OMS出库明细查询返回增加completeTime完成时间 - OMS orderOutboundDate出仓日期格式恢复为yyyy-MM-dd HH:mm:ss - OMS出库时间过滤改为三级兜底:出库时间OUTBOUND_TIME→出仓日期→建档时间 四、修复 - WMS出库导出SQL修复TOTAL_PRICE列不存在(总价改用TOTAL_AMOUNT),总价值暂无来源占位空列
This commit is contained in:
+5
-2
@@ -86,8 +86,8 @@ public class InMaterialDetailExportPO {
|
||||
@Excel(name = "备注", sort = 23)
|
||||
private String remark;
|
||||
|
||||
@Excel(name = "货物种类", sort = 24, readConverterExp = "0=物料,1=半成品,2=成品")
|
||||
private Integer goodsType;
|
||||
@Excel(name = "货物种类", sort = 24)
|
||||
private String materialClassifyName;
|
||||
|
||||
@Excel(name = "总重量", sort = 25)
|
||||
private BigDecimal totalGrossWeight;
|
||||
@@ -106,4 +106,7 @@ public class InMaterialDetailExportPO {
|
||||
|
||||
@Excel(name = "单据状态", sort = 30, readConverterExp = "5=已入库")
|
||||
private Integer inOrderStatus;
|
||||
|
||||
@Excel(name = "业务单据类型", sort = 31)
|
||||
private String orderTypeName;
|
||||
}
|
||||
|
||||
+3
@@ -41,4 +41,7 @@ public class InMaterialDetailWithOrderPO extends InMaterialDetailPO {
|
||||
@ApiModelProperty("货物类型: 0-物料 1-半成品 2-成品")
|
||||
@Excel(name = "货物类型: 0-物料 1-半成品 2-成品")
|
||||
private Integer goodsType;
|
||||
|
||||
@ApiModelProperty("货物种类(物料分类名称,多个逗号分隔)")
|
||||
private String materialClassifyName;
|
||||
}
|
||||
|
||||
+2
-2
@@ -97,8 +97,8 @@ public class OutMaterialDetailExportPO {
|
||||
@Excel(name = "入库单号", sort = 27)
|
||||
private String inOrderNumber;
|
||||
|
||||
@Excel(name = "种类", sort = 28, readConverterExp = "0=物料,1=半成品,2=成品")
|
||||
private Integer goodsType;
|
||||
@Excel(name = "种类", sort = 28)
|
||||
private String materialClassifyName;
|
||||
|
||||
@Excel(name = "总价值", sort = 29)
|
||||
private BigDecimal totalAmount;
|
||||
|
||||
+8
@@ -38,6 +38,9 @@ public class OutMaterialDetailWithOrderPO extends OutMaterialDetailPO {
|
||||
@ApiModelProperty("出库单状态(与outOrderStatus同值,便于前端按status字段名绑定)")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty("货物种类(物料分类名称,多个逗号分隔)")
|
||||
private String materialClassifyName;
|
||||
|
||||
@ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
||||
@Excel(name = "出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
||||
private Integer outOrderAuditStatus;
|
||||
@@ -48,6 +51,11 @@ public class OutMaterialDetailWithOrderPO extends OutMaterialDetailPO {
|
||||
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date outboundDate;
|
||||
|
||||
@ApiModelProperty("完成时间(出库完成时间,Excel导入/录单时填写)")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date completeTime;
|
||||
|
||||
@ApiModelProperty("保额")
|
||||
@Excel(name = "保额")
|
||||
private BigDecimal insureAmount;
|
||||
|
||||
+6
@@ -78,6 +78,12 @@ public class QueryOrderOverStockDO extends BaseVOEntity {
|
||||
@Excel(name = "入库单类型编码")
|
||||
private String inOrderTypeCode;
|
||||
|
||||
@ApiModelProperty("入库单类型编码(与inOrderTypeCode同义)")
|
||||
private String orderTypeCode;
|
||||
|
||||
@ApiModelProperty("入库单类型名称")
|
||||
private String orderTypeName;
|
||||
|
||||
@ApiModelProperty("入库单类型名称")
|
||||
@Excel(name = "入库单类型名称")
|
||||
private String inOrderTypeName;
|
||||
|
||||
+6
@@ -41,6 +41,12 @@ public class InMaterialDetailQueryDTO extends BaseVOEntity {
|
||||
@ApiModelProperty("入库单类型编码(如退货入库 tui_huo_ru_ku)")
|
||||
private String inOrderTypeCode;
|
||||
|
||||
@ApiModelProperty("入库单类型编码(与inOrderTypeCode同义)")
|
||||
private String orderTypeCode;
|
||||
|
||||
@ApiModelProperty("入库单类型名称(模糊查询)")
|
||||
private String orderTypeName;
|
||||
|
||||
@ApiModelProperty("物料基础信息id")
|
||||
private Long materialBaseInfoId;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user