diff --git a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java index 6a90c93a..f85a59aa 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java +++ b/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; + /** * */ diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 7a4cf1b9..a0be3b3d 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/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); } diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index 5290e791..16dc7354 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -2,7 +2,7 @@ - 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 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 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}