出库单添加车次;
This commit is contained in:
@@ -401,5 +401,8 @@ public class StockOutOrder extends BaseVOEntity {
|
||||
private String salesmanId;
|
||||
@ApiModelProperty("业务员名称")
|
||||
private String salesmanName;
|
||||
@ApiModelProperty("车次")
|
||||
@Excel(name = "车次")
|
||||
private Integer trainNo;
|
||||
|
||||
}
|
||||
+1
@@ -229,6 +229,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
|
||||
reservationStockOutOrderDO.setRoute(deliveryHeader.getDeliveryLineNo());
|
||||
reservationStockOutOrderDO.setReservationOrderSource("数据导入");
|
||||
reservationStockOutOrderDO.setOutboundDate(deliveryHeader.getDeliveryDate());
|
||||
reservationStockOutOrderDO.setTrainNo(deliveryHeader.getTrainNumber());
|
||||
int index = 1;
|
||||
List<ReservationOutMaterialDetailDO> reservationOutMaterialDetailDOList = new ArrayList<>();
|
||||
for (ProductDetail productDetail : productDetailList) {
|
||||
|
||||
+4
@@ -482,4 +482,8 @@ public class ReservationStockOutOrder extends BaseVOEntity {
|
||||
@Excel(name = "运输业务单号")
|
||||
private String businessNumber;
|
||||
|
||||
@ApiModelProperty("车次")
|
||||
@Excel(name = "车次")
|
||||
private Integer trainNo;
|
||||
|
||||
}
|
||||
+3
@@ -499,4 +499,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty("NC客户编码")
|
||||
private String customerNcCode;
|
||||
@ApiModelProperty("车次")
|
||||
@Excel(name = "车次")
|
||||
private Integer trainNo;
|
||||
}
|
||||
+3
@@ -534,4 +534,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty("NC客户编码")
|
||||
private String customerNcCode;
|
||||
@ApiModelProperty("车次")
|
||||
@Excel(name = "车次")
|
||||
private Integer trainNo;
|
||||
}
|
||||
+3
@@ -523,4 +523,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
|
||||
|
||||
@ApiModelProperty("NC客户编码")
|
||||
private String customerNcCode;
|
||||
@ApiModelProperty("车次")
|
||||
@Excel(name = "车次")
|
||||
private Integer trainNo;
|
||||
}
|
||||
+1
-18
@@ -53,21 +53,4 @@ public class DeliveryDetailsLinkItemsDO extends BaseVOEntity {
|
||||
@ApiModelProperty("配送id")
|
||||
private Long deliveryId;
|
||||
|
||||
@ApiModelProperty("组织表ID")
|
||||
@Excel(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
@Excel(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("一级组织表ID")
|
||||
@Excel(name = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
}
|
||||
@@ -407,5 +407,7 @@ public class StockOutOrder extends BaseVOEntity {
|
||||
@ApiModelProperty("退货数量")
|
||||
@Excel(name = "退货数量")
|
||||
private BigDecimal returnQuantity;
|
||||
|
||||
@ApiModelProperty("车次")
|
||||
@Excel(name = "车次")
|
||||
private Integer trainNo;
|
||||
}
|
||||
+3
@@ -434,4 +434,7 @@ public class StockOutOrderPO extends BaseVOEntity {
|
||||
@Excel(name = "退货数量")
|
||||
private BigDecimal returnQuantity;
|
||||
private List<DeliveryDetailsLink> deliveryDetailsLinkList;
|
||||
@ApiModelProperty("车次")
|
||||
@Excel(name = "车次")
|
||||
private Integer trainNo;
|
||||
}
|
||||
+3
@@ -455,4 +455,7 @@ public class StockOutOrderDO extends BaseVOEntity {
|
||||
@ApiModelProperty("退货数量")
|
||||
@Excel(name = "退货数量")
|
||||
private BigDecimal returnQuantity;
|
||||
@ApiModelProperty("车次")
|
||||
@Excel(name = "车次")
|
||||
private Integer trainNo;
|
||||
}
|
||||
+1
-9
@@ -48,12 +48,4 @@ public class DeliveryDetailsLinkItemsDTO extends BaseVOEntity {
|
||||
@ApiModelProperty("配送id")
|
||||
private Long deliveryId;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
}
|
||||
@@ -449,4 +449,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
|
||||
*/
|
||||
@ApiModelProperty("提货单打印模版名/弹窗选项全文;后端生成 printTitle(-- 会规范为 ——)")
|
||||
private String noticePrintTemplateName;
|
||||
@ApiModelProperty("车次")
|
||||
@Excel(name = "车次")
|
||||
private Integer trainNo;
|
||||
}
|
||||
Reference in New Issue
Block a user