diff --git a/src/main/resources/mapper/automatedWarehouse/KitTransportMapper.xml b/src/main/resources/mapper/automatedWarehouse/KitTransportMapper.xml
index 6015cdc..e8c8d36 100644
--- a/src/main/resources/mapper/automatedWarehouse/KitTransportMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/KitTransportMapper.xml
@@ -100,9 +100,10 @@
+
-
+
SELECT site, unit_id as serialNo, part_no as partNo, qty, in_stock_flag as inStockFlag,
unit_type as labelType, batch_no as batchNo, warehouse_id as warehouseId,
location_id as locationId, remark, tid, epc
- FROM handling_unit WITH (NOLOCK)
+ FROM handling_unit
WHERE site = #{site} AND unit_id = #{serialNo}
@@ -388,10 +389,10 @@
-
+
SELECT calling_flag
- FROM pallet WITH (NOLOCK)
+ FROM pallet
WHERE site = #{site} AND pallet_id = #{palletId} AND is_deleted = '0'
@@ -732,6 +733,7 @@
+
SELECT
site,
@@ -744,7 +746,7 @@
task_seq AS taskSeq,
out_wcs_flag AS outWcsFlag,
issure_flag AS issureFlag
- FROM SOIssueNotifyOrderMaterialList_detail WITH (NOLOCK)
+ FROM SOIssueNotifyOrderMaterialList_detail
WHERE site = #{site} and out_wcs_flag='N'
AND serialNo IN
diff --git a/src/main/resources/mapper/customer/ShipmentIssueMapper.xml b/src/main/resources/mapper/customer/ShipmentIssueMapper.xml
index d252ca5..c8b3e2a 100644
--- a/src/main/resources/mapper/customer/ShipmentIssueMapper.xml
+++ b/src/main/resources/mapper/customer/ShipmentIssueMapper.xml
@@ -19,8 +19,9 @@
LEFT JOIN area ar WITH (NOLOCK) ON a.production_area = ar.area_id
WHERE a.site=#{site} AND a.notify_no=#{notifyNo} AND a.order_type='shipment'
+
- SELECT ISNULL(MAX(item_no), 0) + 1 FROM SOIssueNotifyOrderList WITH (NOLOCK) WHERE site=#{site} AND notify_no=#{notifyNo} AND order_type='shipment'
+ SELECT ISNULL(MAX(item_no), 0) + 1 FROM SOIssueNotifyOrderList WHERE site=#{site} AND notify_no=#{notifyNo} AND order_type='shipment'
diff --git a/src/main/resources/mapper/notify/IssureNotifyMapper.xml b/src/main/resources/mapper/notify/IssureNotifyMapper.xml
index 924ba8e..c76eea9 100644
--- a/src/main/resources/mapper/notify/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/notify/IssureNotifyMapper.xml
@@ -131,8 +131,9 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
FROM SOIssueNotifyOrderMaterialList WITH (NOLOCK)
WHERE notify_no=#{notifyNo} AND site=#{site} AND issueType=#{issueType}
+
- SELECT ISNULL(MAX(item_no), 0) + 1 FROM SOIssueNotifyOrderList WITH (NOLOCK) WHERE site=#{site} AND notify_no=#{notifyNo}
+ SELECT ISNULL(MAX(item_no), 0) + 1 FROM SOIssueNotifyOrderList WHERE site=#{site} AND notify_no=#{notifyNo}
select top 1 area_type from sys_product_plannet where site=#{site} and planner=#{planner}
@@ -315,9 +316,10 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
group by g.component_part_no,g.qty_to_issue ,g.partDesc
+
SELECT notify_no, site, item_no, BOMItemNo, ComponentPartNo, QtyToIssue, QtyToIssue_Original
- FROM SOIssueNotifyOrderMaterialList WITH (NOLOCK)
+ FROM SOIssueNotifyOrderMaterialList
WHERE site=#{site} AND notify_no=#{notifyNo} AND ItemNo=#{itemNo,jdbcType=DOUBLE}
@@ -327,9 +329,10 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
SET status = #{status}
WHERE site = #{site} AND notify_no = #{notifyNo}
+
SELECT notify_no, site, ItemNo, BOMItemNo, ComponentPartNo, QtyToIssue, QtyToIssue_Original
- FROM SOIssueNotifyOrderMaterialList WITH (NOLOCK)
+ FROM SOIssueNotifyOrderMaterialList
WHERE site=#{site} AND notify_no=#{notifyNo} AND ItemNo=#{itemNo} AND BOMItemNo=#{bOMItemNo}
@@ -347,19 +350,21 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
and ItemNo=#{itemNo}
-->
+
SELECT notify_no, site, ItemNo, BOMItemNo, ComponentPartNo, QtyToIssue, QtyToIssue_Original
- FROM SOIssueNotifyOrderMaterialList WITH (NOLOCK)
+ FROM SOIssueNotifyOrderMaterialList
WHERE site=#{site} AND notify_no=#{notifyNo} AND ComponentPartNo=#{componentPartNo}
+
SELECT #{str}+
CONVERT(VARCHAR(50),isnull( max(CONVERT(int,SUBSTRING(BOMItemNo, LEN(#{str})+1, LEN(BOMItemNo)))+1),1))
- FROM SOIssueNotifyOrderMaterialList WITH (NOLOCK)
+ FROM SOIssueNotifyOrderMaterialList
WHERE site=#{site} AND notify_no=#{notifyNo} AND BOMItemNo LIKE #{str}+'%'
diff --git a/src/main/resources/mapper/notify/NewIssureMapper.xml b/src/main/resources/mapper/notify/NewIssureMapper.xml
index 15e7c11..61fa85a 100644
--- a/src/main/resources/mapper/notify/NewIssureMapper.xml
+++ b/src/main/resources/mapper/notify/NewIssureMapper.xml
@@ -175,10 +175,10 @@
-
+
SELECT reserve_flag
- FROM handling_unit WITH (NOLOCK)
+ FROM handling_unit
WHERE site = #{site}
AND unit_id IN
@@ -188,10 +188,10 @@
-
+
SELECT DISTINCT pd.pallet_id
- FROM pallet_detail pd WITH (NOLOCK)
+ FROM pallet_detail pd
WHERE pd.site = #{site}
AND pd.serial_no IN