1

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
      */

src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gaotao.modules.automatedWarehouse.mapper.NotifyDetailQueryMapper">
 
-    <!-- rqrq - 查询申请单订单列表（分页） -->
+    <!-- rqrq - 查询申请单订单列表（分页），添加push_wcs_time字段 -->
     <select id="searchNotifyOrderList" resultType="SOIssueNotifyOrderListData">
         SELECT
             a.site,
@@ -13,6 +13,7 @@
             a.release_no AS releaseNo,
             a.sequence_no AS sequenceNo,
             a.need_date AS needDate,
+            a.push_wcs_time AS pushWcsTime,
             a.location_no AS locationNo,
             a.production_area AS productionArea,
             a.push_wms_flag AS pushWmsFlag,

src/main/resources/mapper/customer/ShipmentIssueMapper.xml

@@ -11,10 +11,10 @@
         WHERE a.site=#{site} AND a.username=#{username} AND a.status='UNISSUE' AND a.order_type='shipment'
         ORDER BY a.entered_date DESC
     </select>
-    <!-- rqrq - 查询发货申请单订单明细（包含运输标志和配送区域） -->
+    <!-- rqrq - 查询发货申请单订单明细（包含运输标志、配送区域和推送WCS时间） -->
     <select id="getNotifyNoDetail" resultType="com.gaotao.modules.notify.entity.SOIssueNotifyOrderList">
         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.push_wms_flag, a.transport_flag, a.production_area, ar.area_desc AS areaDesc
+               a.release_no, a.sequence_no, 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} AND a.order_type='shipment'

src/main/resources/mapper/notify/IssureNotifyMapper.xml

@@ -29,10 +29,10 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
         WHERE site = #{site} AND notify_no = #{notifyNo}
     </update>
 
-    <!-- rqrq - 根据申请单号查询订单明细（包含运输标志和配送区域） -->
+    <!-- rqrq - 根据申请单号查询订单明细（包含运输标志、配送区域和推送WCS时间） -->
     <select id="getNotifyNoDetail" resultType="SOIssueNotifyOrderListData">
         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>
 
     <!-- rqrq - 查询申请单订单列表 -->
+    <!-- rqrq - 查询申请单明细，添加push_wcs_time字段 -->
     <select id="searchNotifyOrderList" resultType="SOIssueNotifyOrderListData">
         select a.notify_no,a.site,a.ItemNo,a.FGPartNo,a.SOOrderNo,a.OpsItemNo,a.SeqNo,
         a.IssureQty, a.out_work_order_flag, b.operation_desc itemDesc, a.locationNo, a.needDate,
-        dbo.Get_PartDesc(a.site, a.FGPartNo) partDesc, a.order_type
+        dbo.Get_PartDesc(a.site, a.FGPartNo) partDesc, a.order_type, a.push_wcs_time as pushWcsTime
         FROM SOIssueNotifyOrderList a WITH (NOLOCK)
         LEFT JOIN so_routing b WITH (NOLOCK) ON a.site=b.site AND a.SOOrderNo=b.order_no AND a.OpsItemNo=b.item_no
         WHERE a.notify_no=#{notifyNo} AND a.site=#{site}
@@ -440,10 +441,10 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
               ,#{needDate},#{releaseNo},#{sequenceNo},#{pushWmsFlag},#{productionArea},#{transportFlag},#{orderType})
     </insert>
 
-    <!-- rqrq - 查询无订单申请单订单明细（包含运输标志和配送区域） -->
+    <!-- rqrq - 查询无订单申请单订单明细（包含运输标志、配送区域和推送WCS时间） -->
     <select id="getNotifyNoOrderDetail" resultType="SOIssueNotifyOrderListData">
         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)
         </where>
         order by a.notify_no desc
     </select>
-    <!-- rqrq - 查询无订单申请单订单明细（包含运输标志和配送区域） -->
+    <!-- rqrq - 查询无订单申请单订单明细（包含运输标志、配送区域和推送WCS时间） -->
     <select id="getNotifyNoOrderDetailByType" resultType="com.gaotao.modules.notify.entity.SOIssueNotifyOrderList">
         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.push_wms_flag, a.transport_flag, a.production_area, ar.area_desc AS areaDesc
+               a.release_no, a.sequence_no, 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 SOIssueNotifyHeader b WITH (NOLOCK) ON a.site = b.site AND a.notify_no = b.notify_no
         LEFT JOIN area ar WITH (NOLOCK) ON a.production_area = ar.area_id

src/main/resources/mapper/notify/NewIssureMapper.xml

@@ -78,10 +78,12 @@
     </select>
 
     <!-- rqrq - 查询申请单明细，关联area表获取配送区域描述 -->
+    <!-- rqrq - 查询申请单明细，添加push_wcs_time字段 -->
     <select id="searchNotifyOrderListNew" resultType="SOIssueNotifyOrderListData">
         select a.notify_no as notifyNo,a.site,a.item_no as itemNo,a.fgpart_no as fgPartNo,a.soorder_no as soorderNo,a.ops_item_no as opsItemNo,a.seq_no as seqNo,
                a.issure_qty as issureQty,a.location_no as locationNo,a.need_date as needDate,a.out_work_order_flag as outWorkOrderFlag,a.release_no as releaseNo,a.sequence_no as sequenceNo,
                a.push_wms_flag as pushWmsFlag, a.transport_flag as transportFlag, a.production_area as productionArea,
+               a.push_wcs_time as pushWcsTime,
                b.area_desc as areaDesc
         FROM SOIssueNotifyOrderList a WITH (NOLOCK)
         LEFT JOIN area b WITH (NOLOCK) ON a.production_area = b.area_id
@@ -338,11 +340,12 @@
         </foreach>
     </insert>
     
-    <!-- rqrq - 更新SOIssueNotifyOrderList的push_wms_flag -->
+    <!-- rqrq - 更新SOIssueNotifyOrderList的push_wms_flag和push_wcs_time -->
     <!-- rqrq - 移除ROWLOCK，由数据库自动管理锁粒度 -->
     <update id="updateOrderListPushWmsFlag">
         UPDATE SOIssueNotifyOrderList
-        SET push_wms_flag = 'Y'
+        SET push_wms_flag = 'Y',
+            push_wcs_time = GETDATE()
         WHERE site = #{site}
           AND notify_no = #{notifyNo}
           AND item_no = #{itemNo}