|
@@ -315,6 +315,7 @@ const setBarcode = (code, type) => {
|
|
|
taskNo.value = code
|
|
taskNo.value = code
|
|
|
scanType.value = 2
|
|
scanType.value = 2
|
|
|
uniqueCodeList.value = []
|
|
uniqueCodeList.value = []
|
|
|
|
|
+ parentSerialNoMap.value = {}
|
|
|
const ownerCode = data?.customerId
|
|
const ownerCode = data?.customerId
|
|
|
if (ownerCode) {
|
|
if (ownerCode) {
|
|
|
getOwnerRule(ownerCode).then((ruleRes) => {
|
|
getOwnerRule(ownerCode).then((ruleRes) => {
|
|
@@ -347,6 +348,7 @@ const setBarcode = (code, type) => {
|
|
|
ownerPanpassEnabled.value = false
|
|
ownerPanpassEnabled.value = false
|
|
|
scanType.value = 2
|
|
scanType.value = 2
|
|
|
uniqueCodeList.value = []
|
|
uniqueCodeList.value = []
|
|
|
|
|
+ parentSerialNoMap.value = {}
|
|
|
if (type) {
|
|
if (type) {
|
|
|
switchTask()
|
|
switchTask()
|
|
|
} else {
|
|
} else {
|
|
@@ -424,6 +426,7 @@ const reset = () => {
|
|
|
searchBarcode.value = ''
|
|
searchBarcode.value = ''
|
|
|
oldSearchBarcode.value = ''
|
|
oldSearchBarcode.value = ''
|
|
|
uniqueCodeList.value = []
|
|
uniqueCodeList.value = []
|
|
|
|
|
+ parentSerialNoMap.value = {}
|
|
|
}
|
|
}
|
|
|
const onDetailActive = (item) => {
|
|
const onDetailActive = (item) => {
|
|
|
if (isCombineSelectMode.value) {
|
|
if (isCombineSelectMode.value) {
|
|
@@ -448,6 +451,8 @@ const onAsnCancel = () => {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
const uniqueCodeList = ref([])
|
|
const uniqueCodeList = ref([])
|
|
|
|
|
+/** 外箱唯一码 -> 内件唯一码 */
|
|
|
|
|
+const parentSerialNoMap = ref({})
|
|
|
/** 货主规则组合收货需扫外箱码获取内件唯一码 */
|
|
/** 货主规则组合收货需扫外箱码获取内件唯一码 */
|
|
|
const ownerPanpassEnabled = ref(false)
|
|
const ownerPanpassEnabled = ref(false)
|
|
|
|
|
|
|
@@ -542,6 +547,12 @@ async function resolvePanpassScan(code) {
|
|
|
return null
|
|
return null
|
|
|
}
|
|
}
|
|
|
uniqueCodeList.value = [...prev, ...childCodes]
|
|
uniqueCodeList.value = [...prev, ...childCodes]
|
|
|
|
|
+ const parentCode = String(code).trim()
|
|
|
|
|
+ const mergedMap = { ...parentSerialNoMap.value }
|
|
|
|
|
+ for (const cc of childCodes) {
|
|
|
|
|
+ mergedMap[String(cc)] = parentCode
|
|
|
|
|
+ }
|
|
|
|
|
+ parentSerialNoMap.value = mergedMap
|
|
|
scanSuccess()
|
|
scanSuccess()
|
|
|
return childCodes
|
|
return childCodes
|
|
|
} catch {
|
|
} catch {
|
|
@@ -613,6 +624,7 @@ const _fallbackReceiveByProductLotProbe = (code) => {
|
|
|
lotMap.value = {}
|
|
lotMap.value = {}
|
|
|
searchCount.value = ''
|
|
searchCount.value = ''
|
|
|
uniqueCodeList.value = []
|
|
uniqueCodeList.value = []
|
|
|
|
|
+ parentSerialNoMap.value = {}
|
|
|
overReceiveSheetActive.value = true
|
|
overReceiveSheetActive.value = true
|
|
|
asnDetailsTrueFalseBy.value = true
|
|
asnDetailsTrueFalseBy.value = true
|
|
|
closeLoading()
|
|
closeLoading()
|
|
@@ -714,6 +726,7 @@ const _handlerScan = (code) => {
|
|
|
: []
|
|
: []
|
|
|
asnDetailsList.value = clientMatched
|
|
asnDetailsList.value = clientMatched
|
|
|
uniqueCodeList.value=[]
|
|
uniqueCodeList.value=[]
|
|
|
|
|
+ parentSerialNoMap.value = {}
|
|
|
|
|
|
|
|
if (asnDetailsList.value.length > 0) {
|
|
if (asnDetailsList.value.length > 0) {
|
|
|
scanSuccess()
|
|
scanSuccess()
|
|
@@ -732,6 +745,7 @@ const _handlerScan = (code) => {
|
|
|
lotMap.value={}
|
|
lotMap.value={}
|
|
|
searchCount.value = ''
|
|
searchCount.value = ''
|
|
|
uniqueCodeList.value = []
|
|
uniqueCodeList.value = []
|
|
|
|
|
+ parentSerialNoMap.value = {}
|
|
|
asnDetailsTrueFalseBy.value = true
|
|
asnDetailsTrueFalseBy.value = true
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
@@ -1055,6 +1069,7 @@ const onConfirm = (confirmOverReceive=false) => {
|
|
|
const lotMap = toMap(lotData.value, 'field', 'mapping')
|
|
const lotMap = toMap(lotData.value, 'field', 'mapping')
|
|
|
const { asnLineNo, asnNo, warehouse,customerId,sku} = asnInfo.value
|
|
const { asnLineNo, asnNo, warehouse,customerId,sku} = asnInfo.value
|
|
|
const {taskNo: taskCode } = taskInfo.value
|
|
const {taskNo: taskCode } = taskInfo.value
|
|
|
|
|
+ const serialParentMap = parentSerialNoMap.value
|
|
|
const data = {
|
|
const data = {
|
|
|
asnLineNo,
|
|
asnLineNo,
|
|
|
asnNo,
|
|
asnNo,
|
|
@@ -1063,6 +1078,7 @@ const onConfirm = (confirmOverReceive=false) => {
|
|
|
warehouse,
|
|
warehouse,
|
|
|
customerId,
|
|
customerId,
|
|
|
serialNos: uniqueCodeList.value.length > 0 ? uniqueCodeList.value : undefined,
|
|
serialNos: uniqueCodeList.value.length > 0 ? uniqueCodeList.value : undefined,
|
|
|
|
|
+ ...(Object.keys(serialParentMap).length > 0 ? { parentSerialNoMap: { ...serialParentMap } } : {}),
|
|
|
...lotMap,
|
|
...lotMap,
|
|
|
taskNo:taskCode,
|
|
taskNo:taskCode,
|
|
|
sku,
|
|
sku,
|