From 241f7901fc8b04be7bab67cf60e4350ea7742fe7 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 30 Aug 2024 17:25:27 +0800 Subject: [PATCH] =?UTF-8?q?8/30=20=E6=8D=9F=E8=80=97=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoFifoDesOrderController.java | 14 +++++ .../api/entity/collect/IoSplitDesOrder.java | 2 +- .../api/entity/inout/IoSplitCodeEntity.java | 6 ++ .../glxp/api/entity/inout/IoSplitFifoInv.java | 3 +- .../req/collect/AddInvDesDetaiRequest.java | 3 + .../collect/IoSplitDesOrderDetailRequest.java | 2 +- .../IoSplitDesOrderDetailResponse.java | 2 +- .../collect/IoSplitDesOrderService.java | 63 +++++++++++++++++++ .../mapper/inout/IoSplitCodeMapper.xml | 7 ++- 9 files changed, 96 insertions(+), 6 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 0828b50f6..fe0b85d6c 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java @@ -120,4 +120,18 @@ public class IoFifoDesOrderController extends BaseController { } + @PostMapping("/udiwms/collect/fifo/desOrder/destroyOut") + public BaseResponse destroyOut(@RequestBody AddInvDesDetaiRequest addInvDesDetaiRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + Boolean save = splitDesOrderService.destroyOut(addInvDesDetaiRequest); + if (!save){ + return ResultVOUtils.error("错误"); + } + return ResultVOUtils.success("损耗出库成功"); + } + + } diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java index 59269751d..b23395c00 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java @@ -27,7 +27,7 @@ import lombok.NoArgsConstructor; public class IoSplitDesOrder implements Serializable { @TableId(value = "id", type = IdType.INPUT) @ApiModelProperty(value = "") - private Integer id; + private Long id; @TableField(value = "billNo") @ApiModelProperty(value = "") diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java index 44de44811..ed9bddd98 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java @@ -214,5 +214,11 @@ public class IoSplitCodeEntity implements Serializable { private Integer fifoSplit; + @TableField(exist = false) + private String productName; + @TableField(exist = false) + private String workplaceName; + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java index 3624cc1fc..485fe40c8 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java @@ -127,11 +127,12 @@ public class IoSplitFifoInv implements Serializable { /** * 可用数量 */ - @TableField(value = "reCount") + @TableField(value = "availableCount") @ApiModelProperty(value = "可用数量") private Integer availableCount; + /** * 锁定数量 */ diff --git a/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java b/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java index 099fe4ea3..03d618c3a 100644 --- a/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java +++ b/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java @@ -14,4 +14,7 @@ public class AddInvDesDetaiRequest { private String updateUser; private String createUser; + //损耗出库数量 + private Integer outCount; + } diff --git a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java index fab3f153b..91e3a5cbd 100644 --- a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java @@ -13,7 +13,7 @@ import java.util.Date; public class IoSplitDesOrderDetailRequest extends ListPageRequest { - private Integer id; + private Long id; private Long workPlaceCode; 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 29fa88f5d..61438ce94 100644 --- a/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java @@ -8,7 +8,7 @@ import java.util.Date; public class IoSplitDesOrderDetailResponse { - private Integer id; + private Long id; private Long workPlaceCode; 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 ce0c3c64b..86bab7ca7 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -20,10 +20,13 @@ 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.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 org.apache.poi.ss.formula.functions.Offset; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -135,4 +138,64 @@ public class IoSplitDesOrderService extends ServiceImpl