From 983741a6ff97f800abf137437700a6d357abe96d Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 29 Aug 2024 15:26:24 +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=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/collect/IoSplitDesOrderDetail.java |  7 ++++
 .../collect/IoSplitDesOrderService.java       | 38 +++++++++++--------
 2 files changed, 30 insertions(+), 15 deletions(-)

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 979881951..dea20e81f 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java
@@ -8,13 +8,20 @@ import io.swagger.annotations.ApiModel;
 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="销毁出库详情")
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName(value = "io_split_des_order_detail")
 public class IoSplitDesOrderDetail implements Serializable {
     @TableId(value = "id", type = IdType.INPUT)
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 81f4d22ba..f333ac6ea 100644
--- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
@@ -1,19 +1,19 @@
 package com.glxp.api.service.collect;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.Constant;
-import com.glxp.api.entity.collect.IoCollectOrder;
+import com.glxp.api.dao.collect.IoSplitDesOrderMapper;
+import com.glxp.api.entity.collect.IoSplitDesOrder;
+import com.glxp.api.entity.collect.IoSplitDesOrderDetail;
+import com.glxp.api.entity.inout.IoSplitFifoInv;
 import com.glxp.api.req.collect.AddInvDesDetaiRequest;
-import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.req.collect.IoSplitDesOrderRequest;
-import com.glxp.api.res.collect.IoCollectOrderResponse;
 import com.glxp.api.res.collect.IoSplitDesOrderResponse;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
-import org.apache.groovy.util.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -21,16 +21,14 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.glxp.api.entity.collect.IoSplitDesOrder;
-import com.glxp.api.dao.collect.IoSplitDesOrderMapper;
-
 @Service
 public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, IoSplitDesOrder> {
 
     @Resource
     IoSplitDesOrderMapper splitDesOrderMapper;
     @Resource
+    IoSplitDesOrderDetailService splitDesOrderDetailService;
+    @Resource
     GennerOrderUtils gennerOrderUtils;
 
     public List<IoSplitDesOrderResponse> filterList(IoSplitDesOrderRequest splitDesOrderRequest) {
@@ -60,13 +58,23 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
             collectOrder = new IoSplitDesOrder();
             String orderNo = gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_DES_ORDER, "yyyyMMdd"));
             collectOrder.setBillNo(orderNo);
-
-
-
         }
-
-        // TODO 添加到单据详情
-
+        IoSplitFifoInv splitFifoInv = addInvDesDetaiRequest.getSplitFifoInv();
+        IoSplitDesOrderDetail splitDesOrderDetail = IoSplitDesOrderDetail.builder()
+                .workPlaceCode(collectOrder.getWorkPlaceCode())
+                .orderIdFk(collectOrder.getBillNo())
+                .invId(splitFifoInv.getId())
+                .relId(splitFifoInv.getRelId())
+                .batchNo(splitFifoInv.getBatchNo())
+                .produceDate(splitFifoInv.getProduceDate())
+                .expireDate(splitFifoInv.getExpireDate())
+                .supId(splitFifoInv.getSupId())
+                .count(splitFifoInv.getReCount())
+                .reCount(splitFifoInv.getReCount())
+                .createTime(new Date())
+                .updateTime(new Date())
+                .remark("").build();
+        splitDesOrderDetailService.save(splitDesOrderDetail);
         return collectOrder;
     }
 }