From a9c306c0a70f58033b8ff125b18717206427f330 Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 30 Aug 2024 21:06:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=98=8E=E7=BB=86ID=E5=A4=96?= =?UTF-8?q?=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderController.java | 14 ++++++++++++-- .../api/entity/collect/IoSplitDesOrderDetail.java | 2 +- .../api/entity/inout/IoSplitFifoCodeEntity.java | 5 +++++ .../com/glxp/api/entity/inout/IoSplitFifoInv.java | 2 +- .../api/req/collect/CollectOrderBizRequest.java | 1 + .../api/service/inout/IoSplitFifoInvService.java | 11 +++++++---- 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 4e4a3cd8f..c9aa2bad8 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -12,6 +12,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; import com.glxp.api.entity.collect.IoCollectOrderCodeMan; import com.glxp.api.req.basic.PrescribeBindWorkRequest; @@ -47,8 +48,6 @@ public class IoCollectOrderController extends BaseController { @Resource IoCollectOrderBizService collectOrderBizService; - @Resource - IoCollectCodeService collectCodeService; @GetMapping("/udiwms/basic/collect/order/filter") public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) { @@ -201,6 +200,17 @@ public class IoCollectOrderController extends BaseController { return ResultVOUtils.success(); } + /** + * 更新biz信息 + * + * @return + */ + @GetMapping("/udiwms/basic/collect/order/biz/save") + public BaseResponse saveOrderBiz(@RequestBody IoCollectOrderBiz collectOrderBiz) { + collectOrderBizService.updateById(collectOrderBiz); + return ResultVOUtils.success("更新成功"); + } + /** * 单据挂起 diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java index 2331f0c6b..dbb56c1f0 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java @@ -39,7 +39,7 @@ public class IoSplitDesOrderDetail implements Serializable { @TableField(value = "invId") @ApiModelProperty(value = "") - private Integer invId; + private Long invId; @TableField(value = "relId") @ApiModelProperty(value = "") diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java index 1e0fda7aa..6c22c81e3 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java @@ -211,5 +211,10 @@ public class IoSplitFifoCodeEntity implements Serializable { @ApiModelProperty(value = "业务类型") private String busType; + @TableField(value = "invIdFk") + @ApiModelProperty(value = "库存ID外键") + private Long invIdFk; + + 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 485fe40c8..d686652bf 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java @@ -24,7 +24,7 @@ import lombok.NoArgsConstructor; public class IoSplitFifoInv implements Serializable { @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "") - private Integer id; + private Long id; /** * 工位编码 diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java index 451fd416a..84c369057 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java @@ -116,4 +116,5 @@ public class CollectOrderBizRequest extends ListPageRequest { private Long relId; private Integer fifoSplit; + private String replaceCode; } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java index 9747e9fc6..740be9c71 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.inout; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; @@ -62,7 +63,7 @@ public class IoSplitFifoInvService extends ServiceImpl { // splitFifoCodeService.preAllotInv(orderEntity.getWorkPlaceCode());