From 6b5ca4447cffadf3d46d972331fad4190d74a796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Wed, 28 Jan 2026 15:22:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(notify):=20=E6=B7=BB=E5=8A=A0=E7=AB=8B?= =?UTF-8?q?=E5=BA=93=E5=8F=96=E5=87=BA=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在SOIssueNotifyOrderMaterialListDetail实体类中新增outWcsTime字段 - 为outWcsTime字段添加日期时间格式化注解支持 - 更新NewIssureMapper.xml中的字段映射配置 - 更新NotifyDetailQueryMapper.xml中的字段映射配置 - 修改WcsIntegrationMapper.xml中的更新操作，同时设置outWcsFlag和outWcsTime - 移除部分更新操作中的ROWLOCK提示，改由数据库自动管理锁粒度 --- .../entity/SOIssueNotifyOrderMaterialListDetail.java | 12 ++++++++++++ .../automatedWarehouse/NotifyDetailQueryMapper.xml | 1 + .../automatedWarehouse/WcsIntegrationMapper.xml | 7 ++++--- src/main/resources/mapper/notify/NewIssureMapper.xml | 1 + .../SOIssueNotifyOrderMaterialListDetailMapper.xml | 4 ++-- 5 files changed, 20 insertions(+), 5 deletions(-) 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}