From 27b1a4e5ee1331780604c5e4a4bcebffeb69385d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sat, 31 Aug 2024 16:43:51 +0800 Subject: [PATCH] =?UTF-8?q?8/31=20=E6=8D=9F=E8=80=97=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=98=AF=E5=90=A6=E7=8B=AC=E5=8D=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SysWorkplaceDocumentController.java | 1 - .../basic/SysWorkplaceDocumentEntity.java | 6 +++++ .../basic/SysWorkplaceDocumentResponse.java | 7 ++++++ .../IoSplitDesOrderDetailResponse.java | 2 +- .../api/res/inout/IoSplitInvResponse.java | 1 + .../collect/IoSplitDesOrderService.java | 25 ++++++++++++++++--- .../mapper/inout/IoSplitFifoInvMapper.xml | 3 ++- 7 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java index e1216c41a..44e70f308 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java @@ -77,7 +77,6 @@ public class SysWorkplaceDocumentController extends BaseController { @PostMapping("/udiwms/sysWorkplace/updateType") public BaseResponse updateType(@RequestBody SysWorkplaceDocumentEntity entity) { - boolean save = sysWorkplaceDocumentService.updateById(entity); if (!save) { return ResultVOUtils.error("更新失败"); diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java index 33c6e478e..184cb3d58 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java @@ -141,6 +141,12 @@ public class SysWorkplaceDocumentEntity { @TableField(value = "autoTag") private Integer autoTag; + /** + * 是否独占库存 0:否 1:是 + */ + @TableField(value = "monopoly") + private Integer monopoly; + } diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java index b63f0667f..1e9a6e2cd 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java @@ -129,6 +129,13 @@ public class SysWorkplaceDocumentResponse { private String thrBusName; private Integer autoTag; + /** + * 是否独占库存 0:否 1:是 + */ + @TableField(value = "monopoly") + private Integer monopoly; + + public String getThrBusName() { if (StrUtil.isNotEmpty(innerBusName)) return innerBusName; diff --git a/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java index 61438ce94..9ff9d5280 100644 --- a/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java @@ -14,7 +14,7 @@ public class IoSplitDesOrderDetailResponse { private String orderIdFk; - private Integer invId; + private Long invId; private Long relId; diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java index 2ad379596..0852c076f 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java @@ -131,6 +131,7 @@ public class IoSplitInvResponse { private Integer remindState; private String busName; private Integer availableCount; + private Integer monopoly; } 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 d936a1b54..6bb0f7585 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -173,10 +173,19 @@ public class IoSplitDesOrderService extends ServiceImpl() .eq(IoSplitFifoInv::getId,splitFifoCodeEntity.getInvIdFk())); if (splitFifoInv == null){ - throw new JsonException(5000,"未找到该产品！"); + throw new JsonException(500,"未找到该产品！"); } - //修改产品 库存 入库数量 + int count = splitFifoInv.getReCount() - addInvDesDetaiRequest.getOutCount(); + if (count < 0){ + throw new JsonException(500,"库存不足"); + } + //修改产品 库存 入库数 splitFifoInv.setInCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount()); splitFifoInv.setOutCount(splitFifoInv.getOutCount() + addInvDesDetaiRequest.getOutCount());//出库数量 splitFifoInv.setReCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount());//剩余数量 - splitFifoInv.setAvailableCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount()-splitFifoInv.getLockCount());//实用数量 + int availableCount = splitFifoInv.getInCount() - splitFifoInv.getOutCount() - splitFifoInv.getLockCount(); + if (availableCount < 0){ + throw new JsonException(500,"可用数量库存不足"); + } + splitFifoInv.setAvailableCount(availableCount);//可用数量 splitFifoInv.setUpdateTime(new Date()); //更改 库存 boolean update = ioSplitFifoInvService.updateById(splitFifoInv); diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml index c8a4b22eb..169a5a7cb 100644 --- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml @@ -42,7 +42,8 @@ bp.zxxsdycpbs, bc.name supName, sw.workPlaceName, - swd.busName + swd.busName, + swd.monopoly from io_split_fifo_inv isfi LEFT JOIN basic_udirel bu ON bu.id = isfi.relId LEFT JOIN basic_products bp ON bu.uuid = bp.uuid