Commit e72e5471 authored by 刘帅's avatar 刘帅

1. 关于报修单点击作废出现错误情况

2. 报修单中材料列表金额与报修单汇总金额不一致问题
3. 报修单物料出库,最小出库数量强制为0.01时可能出现的BUG 修复
parent 16e7e2ad
......@@ -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;
}
......
......@@ -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>
......
......@@ -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.01" :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.00" :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 isTrue = false
let isUndefined = false
this.form.pickingInfoList.forEach(item =>{
if (!item.collectNumber) {
isTrue = true
if (item.collectNumber === undefined) {
isUndefined = true
}
})
if (isTrue) {
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,
......
......@@ -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.01" :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.00" :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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment