Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TFMOM
TF-MOM-WEB
Commits
8303e884
Commit
8303e884
authored
Oct 30, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
退库管理增加试飞退库
parent
dd13a4eb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
ERPAddInStorageBackItemDialog.vue
...rageBackItem/components/ERPAddInStorageBackItemDialog.vue
+11
-5
No files found.
applications/dee-mes/src/privateComponents/components/ERP_AddInStorageBackItem/components/ERPAddInStorageBackItemDialog.vue
View file @
8303e884
...
@@ -69,6 +69,8 @@ export default {
...
@@ -69,6 +69,8 @@ export default {
this
.
cmpOptions
=
{
typeName
:
'ErpInventory'
,
layKey
:
'InventoryBackAddItemLs'
}
this
.
cmpOptions
=
{
typeName
:
'ErpInventory'
,
layKey
:
'InventoryBackAddItemLs'
}
}
else
if
(
val
===
'MatchStockBackRequest'
||
val
===
'InternalStockBackRequest'
)
{
}
else
if
(
val
===
'MatchStockBackRequest'
||
val
===
'InternalStockBackRequest'
)
{
this
.
cmpOptions
=
{
typeName
:
'JobResponseSorting'
,
layKey
:
'add_MatchStockBackRequestItem'
}
this
.
cmpOptions
=
{
typeName
:
'JobResponseSorting'
,
layKey
:
'add_MatchStockBackRequestItem'
}
}
else
if
(
val
===
'RetirementTestFlyBack'
)
{
this
.
cmpOptions
=
{
typeName
:
'JobResponseOutStorageMatch'
,
layKey
:
'add_InStorageBackItem_testFlight'
}
}
}
}
}
}
}
...
@@ -92,7 +94,7 @@ export default {
...
@@ -92,7 +94,7 @@ export default {
let
aoNo
=
''
let
aoNo
=
''
if
(
valid
&&
this
.
selection
)
{
if
(
valid
&&
this
.
selection
)
{
let
responseName
=
''
let
responseName
=
''
if
(
this
.
hasTop
)
{
// 库内退库/配套退库
if
(
this
.
hasTop
)
{
// 库内退库
(线边库退库)
/配套退库
maxAmount
=
this
.
$utils
.
subNum
(
this
.
selection
.
outsideAmount
,
-
this
.
selection
.
backedAmount
,
-
this
.
selection
.
backAmount
,
scrapCount
)
maxAmount
=
this
.
$utils
.
subNum
(
this
.
selection
.
outsideAmount
,
-
this
.
selection
.
backedAmount
,
-
this
.
selection
.
backAmount
,
scrapCount
)
aoNo
=
(
typeof
this
.
basicData
.
extProcessPlan
===
'string'
&&
this
.
basicData
.
extProcessPlan
.
includes
(
'+'
)
?
this
.
basicData
.
extProcessPlan
.
split
(
'+'
)[
0
]
:
this
.
basicData
.
extProcessPlan
.
serialNumber
)
||
this
.
basicData
.
aoPlan
aoNo
=
(
typeof
this
.
basicData
.
extProcessPlan
===
'string'
&&
this
.
basicData
.
extProcessPlan
.
includes
(
'+'
)
?
this
.
basicData
.
extProcessPlan
.
split
(
'+'
)[
0
]
:
this
.
basicData
.
extProcessPlan
.
serialNumber
)
||
this
.
basicData
.
aoPlan
inventoryData
=
this
.
selection
.
erpInventory
inventoryData
=
this
.
selection
.
erpInventory
...
@@ -103,10 +105,14 @@ export default {
...
@@ -103,10 +105,14 @@ export default {
}
else
{
}
else
{
responseName
=
'jobResponseSorting'
responseName
=
'jobResponseSorting'
}
}
}
else
if
(
this
.
basicData
.
subTypeName
===
'InventoryStockBackRequest'
)
{
// 台账退库
}
else
if
(
this
.
basicData
.
subTypeName
===
'InventoryStockBackRequest'
)
{
// 台账退库
(ERP退库)
maxAmount
=
this
.
selection
.
usableAmount
maxAmount
=
this
.
selection
.
usableAmount
inventoryData
=
this
.
selection
inventoryData
=
this
.
selection
responseName
=
'erpInventory'
responseName
=
'erpInventory'
}
else
if
(
this
.
basicData
.
subTypeName
===
'RetirementTestFlyBack'
)
{
// 试飞退库
maxAmount
=
this
.
selection
.
outsideAmount
inventoryData
=
this
.
selection
.
inventory
responseName
=
'oldOutStorage'
}
}
if
(
this
.
applyForm
.
reqAmount
>
maxAmount
)
return
this
.
$utils
.
showMessageWarning
(
`当前选中物料的退库数量不足!`
)
if
(
this
.
applyForm
.
reqAmount
>
maxAmount
)
return
this
.
$utils
.
showMessageWarning
(
`当前选中物料的退库数量不足!`
)
const
data
=
[{
const
data
=
[{
...
@@ -114,15 +120,15 @@ export default {
...
@@ -114,15 +120,15 @@ export default {
'material'
:
inventoryData
.
extMaterial
,
'material'
:
inventoryData
.
extMaterial
,
'materialId'
:
inventoryData
.
extMaterialId
,
'materialId'
:
inventoryData
.
extMaterialId
,
'testNo'
:
inventoryData
.
testNo
,
'testNo'
:
inventoryData
.
testNo
,
'batchNo'
:
this
.
selection
.
batchNumber
,
'batchNo'
:
this
.
basicData
.
subTypeName
===
'RetirementTestFlyBack'
?
inventoryData
.
lotNo
:
this
.
selection
.
batchNumber
,
'serialNo'
:
this
.
selection
.
serialNo
,
'serialNo'
:
this
.
basicData
.
subTypeName
===
'RetirementTestFlyBack'
?
inventoryData
.
serno
:
this
.
selection
.
serialNo
,
'uniqueId'
:
this
.
selection
.
id
,
'uniqueId'
:
this
.
selection
.
id
,
'backAmount'
:
this
.
selection
.
backAmount
||
0
,
'backAmount'
:
this
.
selection
.
backAmount
||
0
,
'scrapCount'
:
this
.
selection
.
scrapCount
||
0
,
'scrapCount'
:
this
.
selection
.
scrapCount
||
0
,
'backedAmount'
:
this
.
selection
.
backedAmount
||
0
,
'backedAmount'
:
this
.
selection
.
backedAmount
||
0
,
'outsideAmount'
:
this
.
selection
.
outsideAmount
||
0
,
'outsideAmount'
:
this
.
selection
.
outsideAmount
||
0
,
'reqAmount'
:
this
.
applyForm
.
reqAmount
,
'reqAmount'
:
this
.
applyForm
.
reqAmount
,
'unit'
:
this
.
selection
.
unit
,
'unit'
:
this
.
basicData
.
subTypeName
===
'RetirementTestFlyBack'
?
inventoryData
.
extUnit
.
unitName
:
this
.
selection
.
unit
,
'reqNo'
:
this
.
selection
.
reqNo
||
''
,
'reqNo'
:
this
.
selection
.
reqNo
||
''
,
'aoPlan'
:
aoNo
,
'aoPlan'
:
aoNo
,
'mdsItemCode'
:
inventoryData
.
extMaterial
.
resCode
'mdsItemCode'
:
inventoryData
.
extMaterial
.
resCode
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment