weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

关务相关修改;omsbug修改;

Browse Source
This commit is contained in:
王奎兴
2026-05-20 16:56:40 +08:00
parent 986808af9a
commit 23e57976f3
33 changed files with 656 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/entity/PickingOrder.java
+13 -3
View File
@@ -118,9 +118,19 @@ public class PickingOrder extends BaseVOEntity {
@Excel(name = "备注")
private String remark;
@ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
@Excel(name = "推送关务状态: 1-已推送 0-未推送")
private Integer gwPushStatus;
@ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
private Integer pushStatus;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("推送时间")
private Date pushTime;
@ApiModelProperty("推送人")
private Long pushBy;
@ApiModelProperty("推送人姓名")
private String pushByName;
}
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java
+13 -3
View File
@@ -146,7 +146,17 @@ public class PickingOrderPO extends StockOutOrderBasePO {
@Excel(name = "优先级别名称")
private String priorityLevelName;
@ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
@Excel(name = "推送关务状态: 1-已推送 0-未推送")
private Integer gwPushStatus;
@ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
private Integer pushStatus;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("推送时间")
private Date pushTime;
@ApiModelProperty("推送人")
private Long pushBy;
@ApiModelProperty("推送人姓名")
private String pushByName;
}
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
+13 -3
View File
@@ -193,7 +193,17 @@ public class PickingOrderDO extends BaseVOEntity {
@Excel(name = "优先级别名称")
private String priorityLevelName;
@ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
@Excel(name = "推送关务状态: 1-已推送 0-未推送")
private Integer gwPushStatus;
@ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
private Integer pushStatus;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("推送时间")
private Date pushTime;
@ApiModelProperty("推送人")
private Long pushBy;
@ApiModelProperty("推送人姓名")
private String pushByName;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java
+13 -3
View File
@@ -101,9 +101,19 @@ public class StockShelfOrder extends BaseVOEntity {
@Excel(name = "备注")
private String remark;
@ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
@Excel(name = "推送关务状态: 1-已推送 0-未推送")
private Integer gwPushStatus;
@ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
private Integer pushStatus;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("推送时间")
private Date pushTime;
@ApiModelProperty("推送人")
private Long pushBy;
@ApiModelProperty("推送人姓名")
private String pushByName;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java
+13 -3
View File
@@ -122,8 +122,18 @@ public class StockShelfOrderPO extends StockInOrderBasePO {
@Excel(name = "总面积(SQM)")
private BigDecimal totalArea;
@ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
@Excel(name = "推送关务状态: 1-已推送 0-未推送")
private Integer gwPushStatus;
@ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
private Integer pushStatus;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("推送时间")
private Date pushTime;
@ApiModelProperty("推送人")
private Long pushBy;
@ApiModelProperty("推送人姓名")
private String pushByName;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
+13 -3
View File
@@ -135,7 +135,17 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
@ApiModelProperty(name = "创建时间查询条件结束日期")
private String createTimeEnd;
@ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
@Excel(name = "推送关务状态: 1-已推送 0-未推送")
private Integer gwPushStatus;
@ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
private Integer pushStatus;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("推送时间")
private Date pushTime;
@ApiModelProperty("推送人")
private Long pushBy;
@ApiModelProperty("推送人姓名")
private String pushByName;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java
+13 -3
View File
@@ -161,7 +161,17 @@ public class PickingOrderDTO extends BaseVOEntity {
@ApiModelProperty("拣货单id集合")
private List<Long> pickingOrderIdList;
@ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
@Excel(name = "推送关务状态: 1-已推送 0-未推送")
private Integer gwPushStatus;
@ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
private Integer pushStatus;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("推送时间")
private Date pushTime;
@ApiModelProperty("推送人")
private Long pushBy;
@ApiModelProperty("推送人姓名")
private String pushByName;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java
+13 -3
View File
@@ -124,7 +124,17 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO {
@ApiModelProperty(name = "创建时间查询条件结束日期")
private String createTimeEnd;
@ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
@Excel(name = "推送关务状态: 1-已推送 0-未推送")
private Integer gwPushStatus;
@ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
private Integer pushStatus;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("推送时间")
private Date pushTime;
@ApiModelProperty("推送人")
private Long pushBy;
@ApiModelProperty("推送人姓名")
private String pushByName;
}