Browse Source

feat(notify): 添加立库取出时间字段并更新相关映射配置

- 在SOIssueNotifyOrderMaterialListDetail实体类中新增outWcsTime字段
- 为outWcsTime字段添加日期时间格式化注解支持
- 更新NewIssureMapper.xml中的字段映射配置
- 更新NotifyDetailQueryMapper.xml中的字段映射配置
- 修改WcsIntegrationMapper.xml中的更新操作,同时设置outWcsFlag和outWcsTime
- 移除部分更新操作中的ROWLOCK提示,改由数据库自动管理锁粒度
master
常熟吴彦祖 1 month ago
parent
commit
6b5ca4447c
  1. 12
      src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListDetail.java
  2. 1
      src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml
  3. 7
      src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
  4. 1
      src/main/resources/mapper/notify/NewIssureMapper.xml
  5. 4
      src/main/resources/mapper/notify/SOIssueNotifyOrderMaterialListDetailMapper.xml

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

1
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

7
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;
</update>
@ -760,7 +760,7 @@
<!-- rqrq - 移除ROWLOCK,由数据库自动管理锁粒度 -->
<update id="updateSOIssueNotifyDetailOutWcsFlagBySerialNo">
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 @@
<!-- rqrq - 移除ROWLOCK,由数据库自动管理锁粒度 -->
<update id="batchUpdateSOIssueNotifyDetailOutWcsFlag">
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'
<if test="serialNos != null and serialNos.size() > 0">
@ -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'

1
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

4
src/main/resources/mapper/notify/SOIssueNotifyOrderMaterialListDetailMapper.xml

@ -5,8 +5,8 @@
<!-- rqrq - 根据site+serialNo+taskRef更新WCS推送标志 -->
<!-- 优化:添加 WITH (ROWLOCK) 避免锁升级导致死锁 - rqrq -->
<update id="updateOutWcsFlagBySiteAndSerialNoAndTaskRef">
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}
<!-- AND task_ref = #{taskRef} 立库这个数据可能不传-->

Loading…
Cancel
Save