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:
+1
-1
@@ -501,6 +501,6 @@ public class ExecutionInMaterialDetailPO extends ExecutionStockInOrderBasePO {
|
||||
private BigDecimal insureAmount;
|
||||
|
||||
@ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
|
||||
@Excel(name = "货物类型")
|
||||
@Excel(name = "货物类型", readConverterExp = "0=物料,1=半成品,2=成品")
|
||||
private Integer goodsType;
|
||||
}
|
||||
+4
@@ -24,6 +24,10 @@ public class ExecutionInMaterialDetailWithOrderPO extends ExecutionInMaterialDet
|
||||
@Excel(name = "单据状态", readConverterExp = "0=已创建,2=已审核,3=已驳回,4=已入库")
|
||||
private Integer issueStatus;
|
||||
|
||||
@ApiModelProperty("货物种类(物料分类名称,多个逗号分隔)")
|
||||
@Excel(name = "货物种类")
|
||||
private String materialClassifyName;
|
||||
|
||||
@ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
||||
@Excel(name = "入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
||||
private Integer inOrderAuditStatus;
|
||||
|
||||
+6
@@ -45,6 +45,12 @@ public class ExecutionInMaterialDetailQueryDTO extends BaseVOEntity {
|
||||
@ApiModelProperty("入库单类型编码")
|
||||
private String inOrderTypeCode;
|
||||
|
||||
@ApiModelProperty("入库单类型编码(与inOrderTypeCode同义)")
|
||||
private String orderTypeCode;
|
||||
|
||||
@ApiModelProperty("入库单类型名称(模糊查询)")
|
||||
private String orderTypeName;
|
||||
|
||||
@ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
|
||||
private Integer inStatus;
|
||||
|
||||
|
||||
+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
-2
@@ -44,7 +44,7 @@ public class ExecutionOutMaterialDetailWithOrderPO extends ExecutionOutMaterialD
|
||||
@ApiModelProperty("出仓日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date orderOutboundDate;
|
||||
|
||||
@ApiModelProperty("出库时间")
|
||||
@@ -58,6 +58,10 @@ public class ExecutionOutMaterialDetailWithOrderPO extends ExecutionOutMaterialD
|
||||
private BigDecimal insureAmount;
|
||||
|
||||
@ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
|
||||
@Excel(name = "货物类型: 0-物料 1-半成品 2-成品")
|
||||
@Excel(name = "货物类型", readConverterExp = "0=物料,1=半成品,2=成品")
|
||||
private Integer goodsType;
|
||||
|
||||
@ApiModelProperty("货物种类(物料分类名称,多个逗号分隔)")
|
||||
@Excel(name = "货物种类")
|
||||
private String materialClassifyName;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user