From f03fd0f1e16c44ebf82a579b3f43f93bce00c288 Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 29 Aug 2024 13:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=9F=E8=80=97=E5=87=BA=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/Constant.java | 2 ++ .../collect/IoFifoDesOrderController.java | 29 ++++++++++++++++-- .../api/entity/collect/IoSplitDesOrder.java | 4 +-- .../req/collect/AddInvDesDetaiRequest.java | 12 ++++++++ .../req/collect/IoSplitDesOrderRequest.java | 7 +++-- .../collect/IoCollectOrderCodeManService.java | 2 +- .../collect/IoSplitDesOrderService.java | 30 +++++++++++++++++++ 7 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index fb71b1e0a..f077d8c3b 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -44,6 +44,8 @@ public class Constant { public static final String SPLIT_ORDER = "WD"; //工位作业扫码生成出入库单 + public static final String SPLIT_DES_ORDER = "DES"; //工位作业扫码生成出入库单 + /** * 盘点单据前缀 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 cf3c749a6..98872d782 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java @@ -2,21 +2,29 @@ package com.glxp.api.controller.collect; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoSplitDesOrder; +import com.glxp.api.req.collect.AddInvDesDetaiRequest; import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest; import com.glxp.api.req.collect.IoSplitDesOrderRequest; +import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse; import com.glxp.api.res.collect.IoSplitDesOrderResponse; import com.glxp.api.service.collect.IoSplitDesOrderDetailService; import com.glxp.api.service.collect.IoSplitDesOrderService; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; @RestController @@ -27,7 +35,7 @@ public class IoFifoDesOrderController extends BaseController { @Resource IoSplitDesOrderDetailService splitDesOrderDetailService; - @GetMapping("/udiwms/basic/collect/desOrder/filter") + @GetMapping("/udiwms/collect/fifo/desOrder/filter") public BaseResponse filterOrder(IoSplitDesOrderRequest splitDesOrderRequest) { List orderResponses = splitDesOrderService.filterList(splitDesOrderRequest); PageInfo pageInfo = new PageInfo<>(orderResponses); @@ -38,7 +46,7 @@ public class IoFifoDesOrderController extends BaseController { } - @GetMapping("/udiwms/basic/collect/desOrder/detail") + @GetMapping("/udiwms/collect/fifo/desOrder/detail") public BaseResponse detail(IoSplitDesOrderDetailRequest splitDesOrderDetailRequest) { if (StrUtil.isBlank(splitDesOrderDetailRequest.getOrderIdFk())) { return ResultVOUtils.error(500, "单据号不能为空"); @@ -54,4 +62,21 @@ public class IoFifoDesOrderController extends BaseController { pageSimpleResponse.setList(list); return ResultVOUtils.success(pageSimpleResponse); } + + /** + * 选入工位库存 + * + * @return + */ + @PostMapping("/udiwms/collect/fifo/desOrder/addInv") + public BaseResponse addInv(@RequestBody AddInvDesDetaiRequest addInvDesDetaiRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + IoSplitDesOrder splitDesOrder = splitDesOrderService.addInv(addInvDesDetaiRequest); + return ResultVOUtils.success(splitDesOrder); + } + + } 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 c73db6438..d41032c19 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java @@ -25,7 +25,7 @@ public class IoSplitDesOrder implements Serializable { @TableField(value = "billNo") @ApiModelProperty(value = "") - private Integer billNo; + private String billNo; @TableField(value = "busType") @ApiModelProperty(value = "") @@ -33,7 +33,7 @@ public class IoSplitDesOrder implements Serializable { @TableField(value = "workPlaceCode") @ApiModelProperty(value = "") - private String workPlaceCode; + private Long workPlaceCode; @TableField(value = "createTime") @ApiModelProperty(value = "") diff --git a/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java b/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java new file mode 100644 index 000000000..1b3fcb99e --- /dev/null +++ b/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.req.collect; + +import com.glxp.api.entity.inout.IoSplitFifoInv; +import lombok.Data; + +@Data +public class AddInvDesDetaiRequest { + + private String billNo; + private IoSplitFifoInv splitFifoInv; + +} diff --git a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java index 7d71d6332..14bc75f06 100644 --- a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java @@ -10,11 +10,11 @@ public class IoSplitDesOrderRequest extends ListPageRequest { private Integer id; - private Integer billNo; + private String billNo; private String busType; - private String workPlaceCode; + private Long workPlaceCode; private Date createTime; @@ -30,4 +30,7 @@ public class IoSplitDesOrderRequest extends ListPageRequest { private String updateUser; + + + } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index cb82feee7..a6744dadd 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -134,7 +134,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl filterList(IoSplitDesOrderRequest splitDesOrderRequest) { if (splitDesOrderRequest == null) { @@ -39,4 +49,24 @@ public class IoSplitDesOrderService extends ServiceImpl().eq(IoSplitDesOrder::getBillNo, billNo).last("limit 1")); } + + + public IoSplitDesOrder addInv(AddInvDesDetaiRequest addInvDesDetaiRequest) { + + IoSplitDesOrder collectOrder; + if (StrUtil.isNotEmpty(addInvDesDetaiRequest.getBillNo())) { + collectOrder = getByBillNo(addInvDesDetaiRequest.getBillNo()); + } else { + collectOrder = new IoSplitDesOrder(); + String orderNo = gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_DES_ORDER, "yyyyMMdd")); + collectOrder.setBillNo(orderNo); + + + + } + + // TODO 添加到单据详情 + + return collectOrder; + } }