|
@@ -451,9 +451,11 @@ let getList = (type = 1) => {
|
|
' from Shipping_Tracking '
|
|
' from Shipping_Tracking '
|
|
|
|
|
|
let whereSQL =
|
|
let whereSQL =
|
|
- " (Package_Type='SGL Package' and Confirm_send_to_Starshipit=true) "
|
|
|
|
|
|
+ " (Package_Type='SGL Package' and Confirm_send_to_Starshipit=true) "
|
|
if (type === 2) {
|
|
if (type === 2) {
|
|
- sql += ' where (Tracking_No is null or Courier is null) and' + whereSQL
|
|
|
|
|
|
+ sql +=
|
|
|
|
+ " where ( ((Tracking_No is null and Courier!='SGL Transportation') and Package_Status!='Delivered') or (Courier is null and Package_Status!='Delivered') ) and" +
|
|
|
|
+ whereSQL
|
|
} else if (soRef.value) {
|
|
} else if (soRef.value) {
|
|
sql = sql + ` where (SO_Reference like '%${soRef.value}%') and` + whereSQL
|
|
sql = sql + ` where (SO_Reference like '%${soRef.value}%') and` + whereSQL
|
|
} else if (containerNumber.value) {
|
|
} else if (containerNumber.value) {
|
|
@@ -672,7 +674,7 @@ const commit = () => {
|
|
'如果刚才是通过 搜索所有未处理申请 按钮 搜索的, 那么刷新数据之后刚才改动的数据 很可能 不会 刷新出来, 因为 Courier 和 Tracking No 已经有值了(刚才更新的). 如果要重查这些数据, 需要用 Container Number 或 REF 来搜索.',
|
|
'如果刚才是通过 搜索所有未处理申请 按钮 搜索的, 那么刷新数据之后刚才改动的数据 很可能 不会 刷新出来, 因为 Courier 和 Tracking No 已经有值了(刚才更新的). 如果要重查这些数据, 需要用 Container Number 或 REF 来搜索.',
|
|
duration: 0,
|
|
duration: 0,
|
|
})
|
|
})
|
|
- }, 15000)
|
|
|
|
|
|
+ }, 5500)
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
let errorList: number[] = []
|
|
let errorList: number[] = []
|