From e72e54716f28f7489b8289db5f50f464b185bbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Tue, 9 Dec 2025 17:44:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=85=B3=E4=BA=8E=E6=8A=A5=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E7=82=B9=E5=87=BB=E4=BD=9C=E5=BA=9F=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=83=85=E5=86=B5=202.=20=E6=8A=A5=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E6=9D=90=E6=96=99=E5=88=97=E8=A1=A8=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E4=B8=8E=E6=8A=A5=E4=BF=AE=E5=8D=95=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=203.=20=E6=8A=A5=E4=BF=AE=E5=8D=95=E7=89=A9=E6=96=99=E5=87=BA?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=9C=80=E5=B0=8F=E5=87=BA=E5=BA=93=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=BC=BA=E5=88=B6=E4=B8=BA0.01=E6=97=B6=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=87=BA=E7=8E=B0=E7=9A=84BUG=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ErpRepairFormServiceImpl.java | 8 ++++--- .../resources/mapper/ErpRepairFormMapper.xml | 1 + .../views/business/materialPicking/add.vue | 20 ++++++++++++----- .../views/business/materialPicking/index.vue | 22 ++++++++++++++++++- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormServiceImpl.java index 442d232..2ce6187 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormServiceImpl.java @@ -311,9 +311,11 @@ public class ErpRepairFormServiceImpl implements IErpRepairFormService { .eq(ErpMaterialPickingInfo::getRepairFormId, repairForm.getId()) ); // 删除库存记录表数据 - LambdaUpdateWrapper lambdaUpdateWrapper = Wrappers.lambdaUpdate(); - lambdaUpdateWrapper.in(ErpMaterialInventoryRecord::getInfoId, pickingInfoIds); - materialInventoryRecordMapper.delete(lambdaUpdateWrapper); + if (!pickingInfoIds.isEmpty()) { + LambdaUpdateWrapper lambdaUpdateWrapper = Wrappers.lambdaUpdate(); + lambdaUpdateWrapper.in(ErpMaterialInventoryRecord::getInfoId, pickingInfoIds); + materialInventoryRecordMapper.delete(lambdaUpdateWrapper); + } } return flag; } diff --git a/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml b/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml index 574f832..5ae045b 100644 --- a/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml +++ b/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml @@ -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 diff --git a/maintain-ui/src/views/business/materialPicking/add.vue b/maintain-ui/src/views/business/materialPicking/add.vue index 4268661..395b9a7 100644 --- a/maintain-ui/src/views/business/materialPicking/add.vue +++ b/maintain-ui/src/views/business/materialPicking/add.vue @@ -86,7 +86,7 @@ @@ -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, diff --git a/maintain-ui/src/views/business/materialPicking/index.vue b/maintain-ui/src/views/business/materialPicking/index.vue index 34df710..72713d4 100644 --- a/maintain-ui/src/views/business/materialPicking/index.vue +++ b/maintain-ui/src/views/business/materialPicking/index.vue @@ -274,7 +274,7 @@ @@ -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, -- 2.22.0