actualNotifyDate

src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java

@@ -45,6 +45,10 @@ public class EcssCoDelNotifyHeader extends QueryPage {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date notifyDate;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date actualNotifyDate;
+
     /**
      *
      */

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@@ -393,6 +393,7 @@ public class CoDelServiceImpl implements CoDelService {
             throw new RuntimeException("发货通知单状态不为仓库已确认，请刷新页面。");
         }
         data.setNotifyDate(null);
+        data.setActualNotifyDate(null);
         data.setNotifyStatus("已下达");
         coDelMapper.confirmEcssDel(data);
     }

src/main/resources/mapper/ecss/CoDelMapper.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.xujie.sys.modules.ecss.mapper.CoDelMapper">
    <select id="searchEcssCoDelNotifyHeader"   resultType="EcssCoDelNotifyHeaderData">
-        select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
+        select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.actualNotifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
         a.notify_status,a.remark,a.createDate,a.createBy,a.cmc_invoice,a.updateDate,a.updateBy,dbo.get_bu_desc(a.site,a.bu_no) as buDesc,
         a.modifyFlag,a.modify_count as modifyCount,a.overseasShipper,a.overseasAddress,a.cnative,a.salesArea,
         a.localShipAddress,a.walMartOrderFlag,a.fscFlag,a.boxSizeFlag,a.templateNo
@@ -45,7 +45,7 @@
     </select>
 
    <select id="searchEcssCoDelNotifyHeaderForCK"   resultType="EcssCoDelNotifyHeaderData">
-        select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
+        select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.actualNotifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
         a.notify_status,a.remark,a.createDate,a.createBy,a.cmc_invoice,a.updateDate,a.updateBy,dbo.get_bu_desc(a.site,a.bu_no) as buDesc,a.walMartOrderFlag,
        a.modifyFlag,a.modify_count as modifyCount,ISNULL(a.export_flag,'N') as exportFlag,a.fscFlag,a.boxSizeFlag,a.totalVolume
        from ecss_CoDelNotifyHeader a
@@ -92,7 +92,7 @@
      order by a.createDate desc ,a.delNo desc
     </select>
     <select id="searchEcssCoDelNotifyHeaderForDanZheng"   resultType="EcssCoDelNotifyHeaderData">
-        select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
+        select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.actualNotifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
         a.notify_status,a.remark,a.createDate,a.createBy,a.cmc_invoice,a.updateDate,a.updateBy,dbo.get_bu_desc(a.site,a.bu_no) as buDesc
         from ecss_CoDelNotifyHeader a
         left join accessBu D on A.site=D.site and A.bu_no=d.bu_no and D.username=#{query.username}
@@ -129,7 +129,7 @@
         order by a.createDate desc ,a.delNo desc
     </select>
     <select id="checkEcssCoDelNotifyHeaderByDelNo" resultType="EcssCoDelNotifyHeaderData">
-         select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
+         select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.actualNotifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
         a.notify_status,a.remark,a.createDate,a.createBy,a.cmc_invoice,a.updateDate,a.updateBy,dbo.get_bu_desc(a.site,a.bu_no) as buDesc
                  ,a.overseasShipper,a.overseasAddress,a.cnative,a.localShipAddress,a.salesArea,a.walMartOrderFlag,a.fscFlag,a.boxSizeFlag,a.templateNo
        from ecss_CoDelNotifyHeader a
@@ -231,7 +231,7 @@
     </select>
 
     <update id="updateEcssDelHeader" >
-      update ecss_CoDelNotifyHeader set ready_date=#{readyDate,jdbcType=TIMESTAMP} ,customer_name=#{customerName,jdbcType=NVARCHAR},
+      update ecss_CoDelNotifyHeader set notifyDate=#{notifyDate,jdbcType=TIMESTAMP} ,ready_date=#{readyDate,jdbcType=TIMESTAMP} ,customer_name=#{customerName,jdbcType=NVARCHAR},
                 Destination=#{destination,jdbcType=NVARCHAR},shipping_mode=#{shippingMode},modifyFlag=#{modifyFlag},export_flag='N',
                 remark=#{remark,jdbcType=NVARCHAR} ,cmc_invoice=#{cmcInvoice},overseasShipper=#{overseasShipper,jdbcType=NVARCHAR} ,overseasAddress=#{overseasAddress,jdbcType=NVARCHAR}
       where site=#{site} and delNo=#{delNo}
@@ -345,11 +345,11 @@
     </update>
 
     <update id="confirmEcssDel">
-        update ecss_CoDelNotifyHeader set  notify_status=#{notifyStatus} ,notifyDate=#{notifyDate,jdbcType=TIMESTAMP} where site=#{site} and delNo=#{delNo}
+        update ecss_CoDelNotifyHeader set  notify_status=#{notifyStatus} ,actualNotifyDate=#{actualNotifyDate,jdbcType=TIMESTAMP} where site=#{site} and delNo=#{delNo}
     </update>
 
     <update id="updateEcssDel">
-        update ecss_CoDelNotifyHeader set ready_date=#{readyDate,jdbcType=TIMESTAMP},notifyDate=#{notifyDate,jdbcType=TIMESTAMP},
+        update ecss_CoDelNotifyHeader set ready_date=#{readyDate,jdbcType=TIMESTAMP},actualNotifyDate=#{actualNotifyDate,jdbcType=TIMESTAMP},
                modifyFlag=1,export_flag='N',updateBy=#{updateBy},updateDate=GetDate()
         where site=#{site} and delNo=#{delNo}
     </update>