diff --git a/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListDetail.java b/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListDetail.java index 1f5ac62..471b692 100644 --- a/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListDetail.java +++ b/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListDetail.java @@ -1,8 +1,12 @@ package com.gaotao.modules.notify.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.math.BigDecimal; +import java.util.Date; /** * @Description 申请单物料明细记录表 - 数据库表映射 - rqrq @@ -58,6 +62,14 @@ public class SOIssueNotifyOrderMaterialListDetail { */ private String outWcsFlag; + /** + * 立库取出时间 - rqrq + * out_wcs_flag更新为Y时记录的时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date outWcsTime; + /** * 发料标志(Y/N) */ diff --git a/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml b/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml index 7a1753e..f681e93 100644 --- a/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml +++ b/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml @@ -54,6 +54,7 @@ d.task_item AS taskItem, d.task_seq AS taskSeq, d.out_wcs_flag AS outWcsFlag, + d.out_wcs_time AS outWcsTime, d.issure_flag AS issureFlag, d.order_type AS orderType, m.component_part_no AS componentPartNo diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml index 67a86d0..e93440f 100644 --- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml +++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml @@ -752,7 +752,7 @@ AND serialNo = #{serialNo} ) UPDATE RankedRecords - SET out_wcs_flag = 'Y' + SET out_wcs_flag = 'Y', out_wcs_time = GETDATE() WHERE rn = 1; @@ -760,7 +760,7 @@ UPDATE SOIssueNotifyOrderMaterialList_detail - SET out_wcs_flag = 'Y' + SET out_wcs_flag = 'Y', out_wcs_time = GETDATE() WHERE site = #{site} AND serialNo = #{serialNo} AND out_wcs_flag = 'N' @@ -770,7 +770,7 @@ UPDATE SOIssueNotifyOrderMaterialList_detail - SET out_wcs_flag = 'Y' + SET out_wcs_flag = 'Y', out_wcs_time = GETDATE() WHERE site = #{site} AND out_wcs_flag = 'N' @@ -794,6 +794,7 @@ task_item AS taskItem, task_seq AS taskSeq, out_wcs_flag AS outWcsFlag, + out_wcs_time AS outWcsTime, issure_flag AS issureFlag FROM SOIssueNotifyOrderMaterialList_detail WHERE site = #{site} and out_wcs_flag='N' diff --git a/src/main/resources/mapper/notify/NewIssureMapper.xml b/src/main/resources/mapper/notify/NewIssureMapper.xml index 5949bd7..1c9e921 100644 --- a/src/main/resources/mapper/notify/NewIssureMapper.xml +++ b/src/main/resources/mapper/notify/NewIssureMapper.xml @@ -395,6 +395,7 @@ task_item AS taskItem, task_seq AS taskSeq, out_wcs_flag AS outWcsFlag, + out_wcs_time AS outWcsTime, issure_flag AS issureFlag, order_type AS orderType FROM SOIssueNotifyOrderMaterialList_detail diff --git a/src/main/resources/mapper/notify/SOIssueNotifyOrderMaterialListDetailMapper.xml b/src/main/resources/mapper/notify/SOIssueNotifyOrderMaterialListDetailMapper.xml index f55cd2a..731f628 100644 --- a/src/main/resources/mapper/notify/SOIssueNotifyOrderMaterialListDetailMapper.xml +++ b/src/main/resources/mapper/notify/SOIssueNotifyOrderMaterialListDetailMapper.xml @@ -5,8 +5,8 @@ - UPDATE SOIssueNotifyOrderMaterialList_detail WITH (ROWLOCK) - SET out_wcs_flag = 'Y' + UPDATE SOIssueNotifyOrderMaterialList_detail + SET out_wcs_flag = 'Y', out_wcs_time = GETDATE() WHERE site = #{site} AND serialNo = #{serialNo}