diff --git a/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderList.java b/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderList.java index 8df3b81..3d6305f 100644 --- a/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderList.java +++ b/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderList.java @@ -75,6 +75,14 @@ public class SOIssueNotifyOrderList implements Serializable { */ private String orderType; + /** + * 推送WCS时间 - rqrq + * 调用WCS接口成功后记录的时间,失败或未调用则为null + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pushWcsTime; + /** * 配送区域描述(通过production_area关联area表获取的area_desc,非数据库字段)- rqrq */ diff --git a/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml b/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml index 6471952..7a1753e 100644 --- a/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml +++ b/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml @@ -2,7 +2,7 @@ - + - + SELECT a.notify_no, a.site, a.item_no, a.fgpart_no, a.soorder_no, a.ops_item_no, a.seq_no, a.issure_qty, a.out_work_order_flag, a.location_no, a.need_date, - a.release_no, a.sequence_no, a.order_type, a.push_wms_flag, a.transport_flag, a.production_area, ar.area_desc AS areaDesc + a.release_no, a.sequence_no, a.order_type, a.push_wms_flag, a.transport_flag, a.production_area, a.push_wcs_time AS pushWcsTime, ar.area_desc AS areaDesc FROM SOIssueNotifyOrderList a WITH (NOLOCK) LEFT JOIN area ar WITH (NOLOCK) ON a.production_area = ar.area_id WHERE a.site=#{site} AND a.notify_no=#{notifyNo} @@ -233,10 +233,11 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu) + SELECT a.notify_no, a.site, a.item_no, a.fgpart_no, a.soorder_no, a.ops_item_no, a.seq_no, a.issure_qty, a.out_work_order_flag, a.location_no, a.need_date, - a.release_no, a.sequence_no, a.order_type, a.push_wms_flag, a.transport_flag, a.production_area, ar.area_desc AS areaDesc + a.release_no, a.sequence_no, a.order_type, a.push_wms_flag, a.transport_flag, a.production_area, a.push_wcs_time AS pushWcsTime, ar.area_desc AS areaDesc FROM SOIssueNotifyOrderList a WITH (NOLOCK) LEFT JOIN area ar WITH (NOLOCK) ON a.production_area = ar.area_id WHERE a.site=#{site} AND a.notify_no=#{notifyNo} @@ -492,10 +493,10 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu) order by a.notify_no desc - + +