From 7a01a5c5aeeaa018169496fc275d40bd4d4f9b0c Mon Sep 17 00:00:00 2001 From: yewj Date: Sat, 31 Aug 2024 14:13:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E9=9B=B6=E6=8D=9F=E8=80=97=E5=87=BA?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoFifoDesOrderController.java | 17 ++++++++ .../collect/IoSplitDesOrderService.java | 41 +++++++++++++++++++ .../api/service/inout/IoSplitCodeService.java | 24 +++++++---- 3 files changed, 74 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java index dc3914391..9021928ce 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java @@ -132,5 +132,22 @@ public class IoFifoDesOrderController extends BaseController { return ResultVOUtils.success("损耗出库成功"); } + /** + * 拆零表损耗出库 + * + * @param addInvDesDetaiRequest + * @param bindingResult + * @return + */ + @PostMapping("/udiwms/collect/split/desOrder/destroyOut") + public BaseResponse splitDestoryOut(@RequestBody AddInvDesDetaiRequest addInvDesDetaiRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + splitDesOrderService.splitDesOrder(addInvDesDetaiRequest); + return ResultVOUtils.success("损耗出库成功"); + } + } diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java index 3515c00e6..a859fb60c 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -12,6 +12,7 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoSplitDesOrder; import com.glxp.api.entity.collect.IoSplitDesOrderCode; import com.glxp.api.entity.collect.IoSplitDesOrderDetail; +import com.glxp.api.entity.inout.IoSplitCodeEntity; import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; import com.glxp.api.entity.inout.IoSplitFifoInv; import com.glxp.api.exception.JsonException; @@ -19,11 +20,13 @@ import com.glxp.api.req.collect.AddInvDesDetaiRequest; import com.glxp.api.req.collect.IoSplitDesOrderRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.IoSplitDesOrderResponse; +import com.glxp.api.service.inout.IoSplitCodeService; import com.glxp.api.service.inout.IoSplitFifoCodeService; import com.glxp.api.service.inout.IoSplitFifoInvService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; +import okhttp3.internal.http2.ErrorCode; import org.apache.poi.ss.formula.functions.Offset; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -142,6 +145,9 @@ public class IoSplitDesOrderService extends ServiceImpl filterList(IoSplitCodeRequest splitCodeRequest) { if (splitCodeRequest == null) { @@ -55,7 +60,6 @@ public class IoSplitCodeService extends ServiceImpl findSplitCodes(Long relId, String batchNo, Long workPlaceCode) { List ioSplitCodeEntities = splitCodeMapper.selectList(new LambdaQueryWrapper() .eq(IoSplitCodeEntity::getRelId, relId) @@ -65,6 +69,16 @@ public class IoSplitCodeService extends ServiceImpl ioSplitCodeEntities = splitCodeMapper.selectList(new LambdaQueryWrapper() + .eq(IoSplitCodeEntity::getCode, code) + .eq(workPlaceCode != null, IoSplitCodeEntity::getWorkPlaceCode, workPlaceCode) + .in(IoSplitCodeEntity::getStatus, 1, 2).orderByAsc(IoSplitCodeEntity::getInBactchNo)); + if (CollUtil.isNotEmpty(ioSplitCodeEntities)) + return ioSplitCodeEntities.get(0); + return null; + } + /** * 处方自动赋码 @@ -138,12 +152,6 @@ public class IoSplitCodeService extends ServiceImpl