feat(wms):WMS出库单增加线路车次字段,App出库单详情显示线路/车次
背景:App出库单详情调wmsApi/stockOutOrderApi/getInfo,数据在WMS stock_out_order表,该表未加线路/车次字段导致不回显。 1. mhd-api StockOutOrder(OMS下发Feign DTO)加lineCode/lineName/shuttleNo, OMS执行单下发为copyProperties同名拷贝,自动透传,OMS代码零改动。 2. WMS stock_out_order表加三列(脚本追加);entity/PO加字段, Feign接收按JSON字段名对齐落库;Mapper XML resultMap与显式列清单补列, getInfo(getById自动)与列表均可返回。 3. 部署需重新打包mhd_oms与mhd_wms(OMS依赖的mhd-api jar变更)。 存量已下发WMS的老单无值,OMS/WMS跨库无法批量刷数,新下发单自动带。
This commit is contained in:
@@ -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;
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
|
||||
+10
@@ -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;
|
||||
|
||||
|
||||
@@ -109,6 +109,9 @@
|
||||
<result property="signaturePic" column="SIGNATURE_PIC" />
|
||||
<result property="evidencePics" column="EVIDENCE_PICS" />
|
||||
<result property="signatureRemark" column="SIGNATURE_REMARK" />
|
||||
<result property="lineCode" column="LINE_CODE" />
|
||||
<result property="lineName" column="LINE_NAME" />
|
||||
<result property="shuttleNo" column="SHUTTLE_NO" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -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
|
||||
</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,前端拼"编码-车次"显示)';
|
||||
|
||||
Reference in New Issue
Block a user