From 2e2ac0116e3529535a2c80813f6827f78c42e1d7 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 27 Aug 2024 14:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=BA=93=E5=AD=98=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/entity/inout/IoSplitFifoInv.java |  8 +++++-
 .../service/inout/IoSplitFifoInvService.java  | 28 ++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

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 66d190dcc..0e1a1ec7a 100644
--- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java
@@ -10,13 +10,19 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @ApiModel(value = "io_split_fifo_inv")
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName(value = "io_split_fifo_inv")
 public class IoSplitFifoInv implements Serializable {
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value = "")
     private Integer id;
 
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 c4de8f2a5..00c371d6a 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -56,9 +56,6 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
             }
         }
         splitFifoCodeService.saveBatch(splitCodeEntities);
-
-        //todo  根据工位，产品ID，批次号，供应商  进行库存表新增或插入
-
         for (IoSplitFifoCodeEntity ioSplitFifoCodeEntity : splitCodeEntities) {
             IoSplitFifoInv splitFifoInv = getOne(new LambdaQueryWrapper<IoSplitFifoInv>()
                     .eq(IoSplitFifoInv::getRelId, ioSplitFifoCodeEntity.getRelId())
@@ -66,7 +63,30 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                     .eq(StrUtil.isNotEmpty(ioSplitFifoCodeEntity.getBatchNo()), IoSplitFifoInv::getBatchNo, ioSplitFifoCodeEntity.getBatchNo())
                     .eq(ioSplitFifoCodeEntity.getSupId() != null, IoSplitFifoInv::getSupId, ioSplitFifoCodeEntity.getSupId()).last("limit 1"));
             if (splitFifoInv != null) {
-//                splitFifoInv.setInCount();
+                splitFifoInv.setInCount(IntUtil.value(splitFifoInv.getInCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
+                splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
+            } else {
+                IoSplitFifoInv ioSplitFifoInv = IoSplitFifoInv.builder()
+                        .workPlaceCode(ioSplitFifoCodeEntity.getWorkPlaceCode())
+                        .deptCode(ioSplitFifoCodeEntity.getDeptCode())
+                        .invCode(ioSplitFifoCodeEntity.getInvCode())
+                        .productType(ioSplitFifoCodeEntity.getProductType())
+                        .fifoSplit(ioSplitFifoCodeEntity.getFifoSplit())
+                        .relId(ioSplitFifoCodeEntity.getRelId())
+                        .batchNo(ioSplitFifoCodeEntity.getBatchNo())
+                        .produceDate(ioSplitFifoCodeEntity.getProduceDate())
+                        .expireDate(ioSplitFifoCodeEntity.getExpireDate())
+                        .supId(ioSplitFifoCodeEntity.getSupId())
+                        .inCount(ioSplitFifoCodeEntity.getTotalCount())
+                        .outCount(0)
+                        .reCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()))
+                        .lockCount(0)
+                        .createTime(new Date())
+                        .updateTime(new Date())
+                        .remark(null)
+                        .enableRemind(false)
+                        .invRemindCount(0).build();
+                save(ioSplitFifoInv);
             }
 
         }