Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
maintain_service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
刘帅
maintain_service
Commits
e72e5471
Commit
e72e5471
authored
Dec 09, 2025
by
刘帅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 关于报修单点击作废出现错误情况
2. 报修单中材料列表金额与报修单汇总金额不一致问题 3. 报修单物料出库,最小出库数量强制为0.01时可能出现的BUG 修复
parent
16e7e2ad
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
9 deletions
+42
-9
ErpRepairFormServiceImpl.java
...ntain/business/service/impl/ErpRepairFormServiceImpl.java
+5
-3
ErpRepairFormMapper.xml
...usiness/src/main/resources/mapper/ErpRepairFormMapper.xml
+1
-0
add.vue
maintain-ui/src/views/business/materialPicking/add.vue
+15
-5
index.vue
maintain-ui/src/views/business/materialPicking/index.vue
+21
-1
No files found.
maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormServiceImpl.java
View file @
e72e5471
...
...
@@ -311,10 +311,12 @@ public class ErpRepairFormServiceImpl implements IErpRepairFormService {
.
eq
(
ErpMaterialPickingInfo:
:
getRepairFormId
,
repairForm
.
getId
())
);
// 删除库存记录表数据
if
(!
pickingInfoIds
.
isEmpty
())
{
LambdaUpdateWrapper
<
ErpMaterialInventoryRecord
>
lambdaUpdateWrapper
=
Wrappers
.
lambdaUpdate
();
lambdaUpdateWrapper
.
in
(
ErpMaterialInventoryRecord:
:
getInfoId
,
pickingInfoIds
);
materialInventoryRecordMapper
.
delete
(
lambdaUpdateWrapper
);
}
}
return
flag
;
}
...
...
maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml
View file @
e72e5471
...
...
@@ -172,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN (
SELECT repair_form_id, SUM(money) AS totalMaterialMoney
FROM erp_material_picking_info
WHERE state != 3
GROUP BY repair_form_id
) empi ON erf.id = empi.repair_form_id
</sql>
...
...
maintain-ui/src/views/business/materialPicking/add.vue
View file @
e72e5471
...
...
@@ -86,7 +86,7 @@
<el-table-column
label=
"库存"
align=
"center"
prop=
"inventory"
/>
<el-table-column
label=
"领料数量"
align=
"center"
prop=
"collectNumber"
width=
"120px"
>
<
template
slot-scope=
"scope"
>
<el-input-number
v-model=
"scope.row.collectNumber"
@
change=
"collectNumberChange"
controls-position=
"right"
size=
"mini"
:min=
"0.0
1
"
:precision=
"2"
:max=
"parseFloat(scope.row.inventory)"
style=
"width: 100%"
placeholder=
"数量"
/>
<el-input-number
v-model=
"scope.row.collectNumber"
@
change=
"collectNumberChange"
controls-position=
"right"
size=
"mini"
:min=
"0.0
0
"
:precision=
"2"
:max=
"parseFloat(scope.row.inventory)"
style=
"width: 100%"
placeholder=
"数量"
/>
</
template
>
</el-table-column>
<!-- <el-table-column label="销售单价" align="center" prop="price" width="120px">-->
...
...
@@ -380,16 +380,26 @@ export default {
this
.
$modal
.
msgError
(
'
出库明细列表不能为空
'
)
return
}
let
is
True
=
false
let
is
Undefined
=
false
this
.
form
.
pickingInfoList
.
forEach
(
item
=>
{
if
(
!
item
.
collectNumber
)
{
is
True
=
true
if
(
item
.
collectNumber
===
undefined
)
{
is
Undefined
=
true
}
})
if
(
is
True
)
{
if
(
is
Undefined
)
{
this
.
$modal
.
msgError
(
'
领料数量不能为空
'
)
return
}
let
isValidNumber
=
false
this
.
form
.
pickingInfoList
.
forEach
(
item
=>
{
if
(
item
.
collectNumber
<
0.01
)
{
isValidNumber
=
true
}
})
if
(
isValidNumber
)
{
this
.
$modal
.
msgError
(
'
出库物料数量不能为[0.00]
'
)
return
}
this
.
form
.
materialList
=
this
.
form
.
pickingInfoList
.
map
(
item
=>
{
return
{
recordId
:
item
.
recordId
,
...
...
maintain-ui/src/views/business/materialPicking/index.vue
View file @
e72e5471
...
...
@@ -274,7 +274,7 @@
<
el
-
table
-
column
label
=
"
库存
"
align
=
"
center
"
prop
=
"
inventory
"
/>
<
el
-
table
-
column
label
=
"
领料数量
"
align
=
"
center
"
prop
=
"
collectNumber
"
width
=
"
120px
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
el
-
input
-
number
v
-
model
=
"
scope.row.collectNumber
"
@
change
=
"
collectNumberChange
"
controls
-
position
=
"
right
"
size
=
"
mini
"
:
min
=
"
0.0
1
"
:
precision
=
"
2
"
:
max
=
"
parseFloat(scope.row.inventory)
"
style
=
"
width: 100%
"
placeholder
=
"
数量
"
/>
<
el
-
input
-
number
v
-
model
=
"
scope.row.collectNumber
"
@
change
=
"
collectNumberChange
"
controls
-
position
=
"
right
"
size
=
"
mini
"
:
min
=
"
0.0
0
"
:
precision
=
"
2
"
:
max
=
"
parseFloat(scope.row.inventory)
"
style
=
"
width: 100%
"
placeholder
=
"
数量
"
/>
<
/template
>
<
/el-table-column
>
<!--
<
el
-
table
-
column
label
=
"
销售单价
"
align
=
"
center
"
prop
=
"
price
"
width
=
"
120px
"
>-->
...
...
@@ -759,6 +759,26 @@ export default {
this
.
$modal
.
msgError
(
'
出库物料列表不能为空
'
)
return
}
let
isUndefined
=
false
this
.
form
.
pickingInfoList
.
forEach
(
item
=>
{
if
(
item
.
collectNumber
===
undefined
)
{
isUndefined
=
true
}
}
)
if
(
isUndefined
)
{
this
.
$modal
.
msgError
(
'
领料数量不能为空
'
)
return
}
let
isValidNumber
=
false
this
.
form
.
pickingInfoList
.
forEach
(
item
=>
{
if
(
item
.
collectNumber
<
0.01
)
{
isValidNumber
=
true
}
}
)
if
(
isValidNumber
)
{
this
.
$modal
.
msgError
(
'
出库物料数量不能为[0.00]
'
)
return
}
this
.
form
.
materialList
=
this
.
form
.
pickingInfoList
.
map
(
item
=>
{
return
{
recordId
:
item
.
recordId
,
...
...
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