feat(oms,wms):出库/运输单据增加线路车次字段,线路管理支持车次清单维护

1. OMS四张表(business_document_order/execute_order/ reservation_stock_out_order/execution_stock_out_order)加 LINE_CODE/LINE_NAME/SHUTTLE_NO三列,entity/DO/DTO/PO同步加字段, 出库两链路Mapper XML补列与resultMap。线路编码/名称冗余存line_management的route_code/route_name (两库不互通无法join);SHUTTLE_NO为字符串(如4或31-4), 前端拼"编码-车次"显示(31-4车次);不复用route(存tms_route.id) 和train_no(入库链路占用)。下发链路(预约单->执行单,业务单->执行单)同名拷贝自动透传。 2. WMS line_management加SHUTTLE_JSON列(车次序号JSON数组), 四层加字段+XML;DTO加反序列化器兼容前端传数组, PO加序列化器返回原样输出数组。 3. LineManagementImpl.update组织/仓库名称空串兜底, 修复编辑线路后组织名称被刷成空串、列表查不到的问题。 4. 新增建表脚本sql/20260820_oms_outbound_transport_add_line_shuttle.sql(达梦语法)。
2026-08-21 15:28:50 +08:00
parent 22f2b66ffa
commit 000092952f
27 changed files with 324 additions and 2 deletions
@@ -813,4 +813,16 @@ public class BusinessDocumentOrder extends BaseVOEntity{

    @ApiModelProperty("车次")
    private Integer trainNo;
+
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    @Excel(name = "线路名称")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    @Excel(name = "车次")
+    private String shuttleNo;
 }
@@ -850,4 +850,16 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
    @ApiModelProperty("车次")
    private Integer trainNo;

+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    @Excel(name = "线路名称")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    @Excel(name = "车次")
+    private String shuttleNo;
+
 }
@@ -886,4 +886,13 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
    @ApiModelProperty("车次")
    private Integer trainNo;

+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    private String shuttleNo;
+
 }
@@ -158,4 +158,16 @@ public class ExecuteOrder extends BaseVOEntity{
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date invoiceDate;

+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    @Excel(name = "线路名称")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    @Excel(name = "车次")
+    private String shuttleNo;
+
 }
@@ -244,4 +244,16 @@ public class ExecuteOrderPO extends BaseVOEntity{
    @ApiModelProperty("车次")
    private Integer trainNo;

+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    @Excel(name = "线路名称")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    @Excel(name = "车次")
+    private String shuttleNo;
+
 }
@@ -182,4 +182,13 @@ public class ExecuteOrderDO extends BaseVOEntity{
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date documentEndTime;
+
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    private String shuttleNo;
 }
@@ -492,4 +492,16 @@ public class ExecutionStockOutOrder extends BaseVOEntity {
    @Excel(name = "车次")
    private Integer trainNo;

+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    @Excel(name = "线路名称")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    @Excel(name = "车次")
+    private String shuttleNo;
+
 }
@@ -504,4 +504,16 @@ public class ExecutionStockOutOrderPO extends BaseVOEntity {
    @Excel(name = "车次")
    private Integer trainNo;
    private String khdm;
+
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    @Excel(name = "线路名称")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    @Excel(name = "车次")
+    private String shuttleNo;
 }
@@ -567,4 +567,13 @@ public class ExecutionStockOutOrderDO extends BaseVOEntity {
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTimeTo;
    private String xfStatus;
+
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    private String shuttleNo;
 }
@@ -555,4 +555,13 @@ public class ExecutionStockOutOrderDTO extends ExecutionStockOutOrderBaseDTO {
    private String outboundDateEnd;

    private String xfStatus;
+
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    private String shuttleNo;
 }
@@ -491,5 +491,16 @@ public class ReservationStockOutOrder extends BaseVOEntity {
    @ApiModelProperty("车次")
    @Excel(name = "车次")
    private Integer trainNo;
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    @Excel(name = "线路名称")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    @Excel(name = "车次")
+    private String shuttleNo;

 }
@@ -513,4 +513,17 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
    @Excel(name = "车次")
    private Integer trainNo;
    private String khdm;
+
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    @Excel(name = "线路名称")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    @Excel(name = "车次")
+    private String shuttleNo;
+
 }
@@ -569,4 +569,14 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTimeTo;
    private String xfStatus;
+
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    private String shuttleNo;
+
 }
@@ -558,4 +558,14 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
    private String outboundDateEnd;

    private String xfStatus;
+
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    private String lineName;
+
+    @ApiModelProperty("车次")
+    private String shuttleNo;
+
 }