From 03b2635b900011f0962be6d8c9671722a1275f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Sat, 17 Jun 2023 10:43:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/WmItemRecptMobController.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java index 827e1f4..cc31aa5 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java @@ -1,15 +1,13 @@ package com.ktg.mes.wm.controller.mobile; +import cn.hutool.core.collection.CollectionUtil; import com.ktg.common.annotation.Log; import com.ktg.common.constant.UserConstants; import com.ktg.common.core.controller.BaseController; import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.enums.BusinessType; import com.ktg.common.utils.StringUtils; -import com.ktg.mes.wm.domain.WmItemRecpt; -import com.ktg.mes.wm.domain.WmStorageArea; -import com.ktg.mes.wm.domain.WmStorageLocation; -import com.ktg.mes.wm.domain.WmWarehouse; +import com.ktg.mes.wm.domain.*; import com.ktg.mes.wm.domain.tx.ItemRecptTxBean; import com.ktg.mes.wm.service.*; import com.ktg.system.strategy.AutoCodeUtil; @@ -162,6 +160,24 @@ public class WmItemRecptMobController extends BaseController { WmItemRecpt recpt = wmItemRecptService.selectWmItemRecptByRecptId(recptId); + //单据有效性 + if(!StringUtils.isNotNull(recpt)){ + return AjaxResult.error("无效单据"); + } + + //先检查单据状态 + if(UserConstants.ORDER_STATUS_FINISHED.equals(recpt.getStatus())){ + return AjaxResult.error("当前单据已提交!"); + } + + //检查行数量 + WmItemRecptLine param = new WmItemRecptLine(); + param.setRecptId(recptId); + List lines = wmItemRecptLineService.selectWmItemRecptLineList(param); + if(CollectionUtil.isEmpty(lines)){ + return AjaxResult.error("请添加明细信息!"); + } + //构造Transaction事务,并执行库存更新逻辑 List beans = wmItemRecptService.getTxBeans(recptId);