diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
index d84da61..99029bc 100644
--- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
@@ -159,10 +159,11 @@
+
+
+
@@ -214,9 +218,10 @@
+
@@ -250,10 +255,11 @@
+
@@ -324,9 +330,10 @@
+
+
SELECT COUNT(1)
- FROM pallet_detail
+ FROM pallet_detail WITH (NOLOCK)
WHERE site = #{site} AND pallet_id = #{palletId}
@@ -523,28 +532,29 @@
+
SELECT COUNT(1)
- FROM pallet
+ FROM pallet WITH (NOLOCK)
WHERE site = #{site}
AND location_code = #{stationCode}
AND is_deleted = '0'
+
- SELECT TOP 1 pallet_id, location_code, status,pallet_family, pallet_type
- FROM pallet
+ SELECT TOP 1 pallet_id, location_code, status, pallet_family, pallet_type
+ FROM pallet WITH (NOLOCK)
WHERE site = #{site}
AND location_code = #{stationCode}
-
+
SELECT TOP 1 pallet_id
- FROM pallet
+ FROM pallet WITH (NOLOCK)
WHERE site = #{site}
AND location_code = #{stationCode}
AND is_deleted = '0'
-
@@ -655,16 +665,17 @@
AND wcs_flag = 0
+
- select a.site,a.pallet_id,a.[position],a.layer,a.serial_no,a.part_no,a.create_date,a.create_by,a.wcs_flag,
- b.part_desc,b.qty,b.batch_no,b.wdr,c.weight,b.length,b.width,c.height,c.is_robot_pick,um_id,b.height as realHeight
- ,c.is_commonly_used, CONVERT(varchar(10),isnull( isnull(b.manufacture_date,b.receive_date),getdate()), 23) manufactureDateStr
- ,b.reserve_flag
- from pallet_detail a
- left join handling_unit b on a.site=b.site and a.serial_no=b.unit_id
- left join part_attribute c on a.site=c.site and a.part_no=c.part_no
- where a.site=#{site} and a.pallet_id=#{palletId}
- and a.wcs_flag = 1
+ SELECT a.site, a.pallet_id, a.[position], a.layer, a.serial_no, a.part_no, a.create_date, a.create_by, a.wcs_flag,
+ b.part_desc, b.qty, b.batch_no, b.wdr, c.weight, b.length, b.width, c.height, c.is_robot_pick, um_id, b.height as realHeight,
+ c.is_commonly_used, CONVERT(varchar(10), ISNULL(ISNULL(b.manufacture_date, b.receive_date), GETDATE()), 23) manufactureDateStr,
+ b.reserve_flag
+ FROM pallet_detail a WITH (NOLOCK)
+ LEFT JOIN handling_unit b WITH (NOLOCK) ON a.site = b.site AND a.serial_no = b.unit_id
+ LEFT JOIN part_attribute c WITH (NOLOCK) ON a.site = c.site AND a.part_no = c.part_no
+ WHERE a.site = #{site} AND a.pallet_id = #{palletId}
+ AND a.wcs_flag = 1
WITH RankedRecords AS (
@@ -1031,9 +1042,13 @@
AND status = #{oldStatus}
+
- update pallet set wcs_location = #{location},updated_by='wms_sys',updated_time=getdate()
- where site = #{site} and pallet_id = #{palletId}
+ UPDATE pallet WITH (ROWLOCK)
+ SET wcs_location = #{location},
+ updated_by = 'wms_sys',
+ updated_time = GETDATE()
+ WHERE site = #{site} AND pallet_id = #{palletId}
@@ -1229,9 +1244,10 @@
+
SELECT DISTINCT position
- FROM pallet_detail
+ FROM pallet_detail WITH (NOLOCK)
WHERE site = #{site}
AND pallet_id = #{palletId}
AND layer = #{layer}
@@ -1267,13 +1283,14 @@
+
SELECT
p.calling_flag AS callingFlag,
s.station_id AS currentStationId,
s.station_code AS currentStationCode
- FROM pallet p
- LEFT JOIN agv_station s ON p.location_code = s.station_code
+ FROM pallet p WITH (NOLOCK)
+ LEFT JOIN agv_station s WITH (NOLOCK) ON p.location_code = s.station_code
WHERE p.site = #{site}
AND p.pallet_id = #{palletId}
AND p.is_deleted = '0'
@@ -1322,20 +1339,20 @@
+
SELECT
p.calling_flag AS callingFlag,
p.location_code AS currentStationCode,
s.station_type AS stationType,
- s.station_id as currentStationId,
- p.empty_flag as isEmpty ,
+ s.station_id AS currentStationId,
+ p.empty_flag AS isEmpty,
CASE
WHEN p.location_code IS NULL THEN 'Y'
-
ELSE 'N'
END AS canOperate
- FROM pallet p
- LEFT JOIN agv_station s ON p.location_code = s.station_code
+ FROM pallet p WITH (NOLOCK)
+ LEFT JOIN agv_station s WITH (NOLOCK) ON p.location_code = s.station_code
WHERE p.site = #{site}
AND p.pallet_id = #{palletId}
AND p.is_deleted = '0'
@@ -1384,6 +1401,7 @@
+
SELECT
p.pallet_id AS palletId,
@@ -1393,16 +1411,15 @@
s.station_id AS currentStationId,
CASE
WHEN EXISTS (
- SELECT 1 FROM pallet_detail pd
+ SELECT 1 FROM pallet_detail pd WITH (NOLOCK)
WHERE pd.site = p.site
AND pd.pallet_id = p.pallet_id
-
)
THEN 'N'
ELSE 'Y'
END AS isEmpty
- FROM pallet p
- LEFT JOIN agv_station s ON p.location_code = s.station_code
+ FROM pallet p WITH (NOLOCK)
+ LEFT JOIN agv_station s WITH (NOLOCK) ON p.location_code = s.station_code
WHERE p.site = #{site}
AND p.pallet_id = #{palletId}
AND p.is_deleted = '0'
@@ -1453,37 +1470,40 @@
+
SELECT
p.pallet_id AS palletId,
p.calling_flag AS callingFlag,
CASE
WHEN EXISTS (
- SELECT 1 FROM pallet_detail pd
+ SELECT 1 FROM pallet_detail pd WITH (NOLOCK)
WHERE pd.site = #{site} AND pd.pallet_id = #{palletId} AND pd.wcs_flag = 0
) THEN 'Y'
ELSE 'N'
END AS canOperate, -- 借用canOperate字段存储hasSentWcsTask
CASE
WHEN EXISTS (
- SELECT 1 FROM pallet_detail pd
+ SELECT 1 FROM pallet_detail pd WITH (NOLOCK)
WHERE pd.site = #{site} AND pd.pallet_id = #{palletId}
) THEN 'Y'
ELSE 'N'
END AS isEmpty -- 借用isEmpty字段存储hasDetail
- FROM pallet p
+ FROM pallet p WITH (NOLOCK)
WHERE p.site = #{site} AND p.pallet_id = #{palletId} AND p.is_deleted = '0'
+
SELECT COUNT(1)
- FROM pallet_detail
+ FROM pallet_detail WITH (NOLOCK)
WHERE site = #{site} AND pallet_id = #{palletId} AND wcs_flag = 0
+
SELECT COUNT(1)
- FROM pallet_detail
+ FROM pallet_detail WITH (NOLOCK)
WHERE site = #{site} AND pallet_id = #{palletId} AND wcs_flag = 1
@@ -1518,6 +1538,7 @@
+
SELECT TOP 1
p.id,
@@ -1540,9 +1561,9 @@
p.sore_type AS soreType,
p.auto_sort AS autoSort,
p.empty_flag AS emptyFlag
- FROM pallet p
- INNER JOIN agv_station s ON p.location_code = s.station_code
- left join pallet_detail c on p.pallet_id=c.pallet_id and p.site=c.site
+ FROM pallet p WITH (NOLOCK)
+ INNER JOIN agv_station s WITH (NOLOCK) ON p.location_code = s.station_code
+ LEFT JOIN pallet_detail c WITH (NOLOCK) ON p.pallet_id = c.pallet_id AND p.site = c.site
WHERE p.site = #{site}
AND p.pallet_type = #{palletType}
AND p.calling_flag = 'N'
@@ -1550,11 +1571,12 @@
AND s.area_type = 'Z101'
AND s.status_db = 1
AND s.active = 'Y'
- and c.id IS NULL
+ AND c.id IS NULL
ORDER BY p.created_time ASC
+
SELECT
p.id,
@@ -1577,10 +1599,10 @@
p.sore_type AS soreType,
p.auto_sort AS autoSort,
p.empty_flag AS emptyFlag,
- s.status_db as statusDb,
- s.area_type as areaId
- FROM pallet p
- INNER JOIN agv_station s ON p.location_code = s.station_code
+ s.status_db AS statusDb,
+ s.area_type AS areaId
+ FROM pallet p WITH (NOLOCK)
+ INNER JOIN agv_station s WITH (NOLOCK) ON p.location_code = s.station_code
WHERE p.site = #{site}
AND p.pallet_id = #{palletId}
AND p.calling_flag = 'N'
@@ -1718,9 +1740,10 @@
+
SELECT DISTINCT pallet_id
- FROM pallet_detail
+ FROM pallet_detail WITH (NOLOCK)
WHERE site = #{site}
AND serial_no IN
@@ -1746,30 +1769,30 @@
FROM wms_transport_task
WHERE site = #{site}
AND pallet_id = #{palletId}
- AND status != '已完成'
- AND status != '已取消'
+ AND status IN ('已创建', '已下达', '执行中', '已预约')
ORDER BY created_time DESC
+
WITH PalletInfo AS (
-- 获取栈板类型和最大层数 - rqrq
SELECT p.pallet_type, pt.max_layer
- FROM pallet p
- INNER JOIN pallet_type pt ON p.site = pt.site AND p.pallet_type = pt.pallet_type
+ FROM pallet p WITH (NOLOCK)
+ INNER JOIN pallet_type pt WITH (NOLOCK) ON p.site = pt.site AND p.pallet_type = pt.pallet_type
WHERE p.site = #{site} AND p.pallet_id = #{palletId}
),
PositionCount AS (
-- 获取该类型栈板的点位数 - rqrq
SELECT COUNT(1) AS position_count
- FROM pallet_type_area pta
+ FROM pallet_type_area pta WITH (NOLOCK)
INNER JOIN PalletInfo pi ON pta.site = #{site} AND pta.pallet_type = pi.pallet_type
),
DetailCount AS (
-- 获取栈板已使用的明细数量 - rqrq
SELECT COUNT(1) AS detail_count
- FROM pallet_detail
+ FROM pallet_detail WITH (NOLOCK)
WHERE site = #{site} AND pallet_id = #{palletId}
),
MaxCapacity AS (
diff --git a/src/main/resources/mapper/notify/NewIssureMapper.xml b/src/main/resources/mapper/notify/NewIssureMapper.xml
index 17f3b6d..b04a35b 100644
--- a/src/main/resources/mapper/notify/NewIssureMapper.xml
+++ b/src/main/resources/mapper/notify/NewIssureMapper.xml
@@ -185,9 +185,10 @@
+
SELECT DISTINCT pd.pallet_id
- FROM pallet_detail pd
+ FROM pallet_detail pd WITH (NOLOCK)
WHERE pd.site = #{site}
AND pd.serial_no IN
@@ -196,15 +197,16 @@
+
SELECT pallet_id
- FROM pallet
+ FROM pallet WITH (NOLOCK)
WHERE site = #{site}
AND pallet_id IN
#{palletId}
- AND calling_flag ='Y'
+ AND calling_flag = 'Y'
@@ -341,9 +343,10 @@
+
SELECT position, layer, serial_no as serialNo
- FROM pallet_detail
+ FROM pallet_detail WITH (NOLOCK)
WHERE site = #{site}
AND pallet_id = #{palletId}
AND serial_no IN
diff --git a/src/main/resources/mapper/warehouse/PalletMapper.xml b/src/main/resources/mapper/warehouse/PalletMapper.xml
index 45e8197..c47d9c0 100644
--- a/src/main/resources/mapper/warehouse/PalletMapper.xml
+++ b/src/main/resources/mapper/warehouse/PalletMapper.xml
@@ -4,6 +4,7 @@
+
SELECT
p.id,
@@ -34,9 +35,9 @@
pt.max_layer as maxLayer,
pt.active as active,
pf.pallet_family_desc as palletFamilyDesc
- FROM pallet p
- LEFT JOIN pallet_type pt ON p.site = pt.site AND p.pallet_type = pt.pallet_type
- LEFT JOIN pallet_family pf ON p.site = pf.site AND p.pallet_family = pf.pallet_family
+ FROM pallet p WITH (NOLOCK)
+ LEFT JOIN pallet_type pt WITH (NOLOCK) ON p.site = pt.site AND p.pallet_type = pt.pallet_type
+ LEFT JOIN pallet_family pf WITH (NOLOCK) ON p.site = pf.site AND p.pallet_family = pf.pallet_family
AND p.site = #{query.site}
@@ -67,6 +68,7 @@
+
SELECT
p.id,
@@ -97,9 +99,9 @@
pt.max_layer as maxLayer,
pt.active as active,
pf.pallet_family_desc as palletFamilyDesc
- FROM pallet p
- LEFT JOIN pallet_type pt ON p.site = pt.site AND p.pallet_type = pt.pallet_type
- LEFT JOIN pallet_family pf ON p.site = pf.site AND p.pallet_family = pf.pallet_family
+ FROM pallet p WITH (NOLOCK)
+ LEFT JOIN pallet_type pt WITH (NOLOCK) ON p.site = pt.site AND p.pallet_type = pt.pallet_type
+ LEFT JOIN pallet_family pf WITH (NOLOCK) ON p.site = pf.site AND p.pallet_family = pf.pallet_family
WHERE p.pallet_id = #{palletId}