diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java index 2ac0c76e6..6da122274 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java @@ -405,4 +405,13 @@ public class StockOutOrder extends BaseVOEntity { @Excel(name = "车次") private Integer trainNo; + @ApiModelProperty("线路编码(取自WMS线路管理)") + private String lineCode; + + @ApiModelProperty("线路名称(冗余存储)") + private String lineName; + + @ApiModelProperty("车次序号(显示: 线路编码-车次, 如31-4)") + private String shuttleNo; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java index 3ea609c6c..acd99ede4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java @@ -411,6 +411,15 @@ public class StockOutOrder extends BaseVOEntity { @Excel(name = "车次") private Integer trainNo; + @ApiModelProperty("线路编码(取自WMS线路管理,OMS执行单下发透传)") + private String lineCode; + + @ApiModelProperty("线路名称(冗余存储,OMS执行单下发透传)") + private String lineName; + + @ApiModelProperty("车次序号(显示: 线路编码-车次, 如31-4)") + private String shuttleNo; + @ApiModelProperty("推送状态:1-未推送,2-推送中,3-推送成功,4-推送失败") private Integer pushStatus; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java index b0938dab6..f1d09b638 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java @@ -440,6 +440,16 @@ public class StockOutOrderPO extends BaseVOEntity { @ApiModelProperty("车次") @Excel(name = "车次") private Integer trainNo; + + @ApiModelProperty("线路编码(取自WMS线路管理)") + private String lineCode; + + @ApiModelProperty("线路名称(冗余存储)") + private String lineName; + + @ApiModelProperty("车次序号(显示: 线路编码-车次, 如31-4)") + private String shuttleNo; + @ApiModelProperty("推送状态:1-未推送,2-推送中,3-推送成功,4-推送失败") private Integer pushStatus; diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index ac19f2b19..f6d2c4ad6 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -109,6 +109,9 @@ + + + @@ -131,6 +134,7 @@ a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.billing_json,a.SETTLEMENT_CURRENCY, a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID,a.WORK_USER_NAME, a.SIGNATURE_STATUS, a.SIGNATURE_TIME, a.SIGNATURE_PIC, a.EVIDENCE_PICS, a.SIGNATURE_REMARK + ,a.LINE_CODE,a.LINE_NAME,a.SHUTTLE_NO diff --git a/sql/20260820_oms_outbound_transport_add_line_shuttle.sql b/sql/20260820_oms_outbound_transport_add_line_shuttle.sql index a63c3ba02..02ad91386 100644 --- a/sql/20260820_oms_outbound_transport_add_line_shuttle.sql +++ b/sql/20260820_oms_outbound_transport_add_line_shuttle.sql @@ -50,3 +50,12 @@ COMMENT ON COLUMN EXECUTE_ORDER.SHUTTLE_NO IS '车次(字符串,可 ALTER TABLE LINE_MANAGEMENT ADD (SHUTTLE_JSON VARCHAR2(1000)); COMMENT ON COLUMN LINE_MANAGEMENT.SHUTTLE_JSON IS '车次序号清单JSON数组,如[1,2,4,6],OMS单据车次下拉数据源'; + +-- ---------------- WMS出库单增加线路车次字段(App出库单详情显示) ---------------- +-- App端出库单详情调 wmsApi/stockOutOrderApi/getInfo,数据来源于WMS的stock_out_order表。 +-- OMS出库执行单下发WMS时经Feign(StockOutOrder同名JSON字段)自动透传lineCode/lineName/shuttleNo。 +ALTER TABLE STOCK_OUT_ORDER ADD (LINE_CODE VARCHAR2(50), LINE_NAME VARCHAR2(100), SHUTTLE_NO VARCHAR2(50)); + +COMMENT ON COLUMN STOCK_OUT_ORDER.LINE_CODE IS '线路编码(取自WMS线路管理line_management.route_code,OMS下发透传)'; +COMMENT ON COLUMN STOCK_OUT_ORDER.LINE_NAME IS '线路名称(冗余存储,OMS下发透传)'; +COMMENT ON COLUMN STOCK_OUT_ORDER.SHUTTLE_NO IS '车次(字符串,如4或31-4,前端拼"编码-车次"显示)';