调拨入库

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageServiceImpl.java

@@ -3,6 +3,7 @@ package com.sd.business.service.in.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -108,19 +109,28 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
     public void addAllot(AddAllotDto dto) {
         long allotFlag = IdWorker.getId();
 
-        InOutStorageDto inStorageDto = BeanUtil.toBean(dto, InOutStorageDto.class);
-        inStorageDto.setWarehouseId(dto.getInWarehouseId());
+        InOutStorageDto outStorageDto = new InOutStorageDto();
+        outStorageDto.setType(InOutTypeEnum.OUT.getKey());
+        outStorageDto.setDetailType(OutDetailTypeEnum.ALLOT.getKey());
+        outStorageDto.setWarehouseId(dto.getOutWarehouseId());
+        outStorageDto.setDepartmentId(dto.getDepartmentId());
+        outStorageDto.setApplicant(dto.getApplicant());
+        outStorageDto.setRemark(dto.getRemark());
+        outStorageDto.setAllotFlag(allotFlag);
+        outStorageDto.setInOutStorageBomList(JSON.parseArray(JSON.toJSONString(dto.getInOutStorageBomList()), InOutStorageBom.class));
+        add(outStorageDto);
+
+        InOutStorageDto inStorageDto = new InOutStorageDto();
         inStorageDto.setType(InOutTypeEnum.IN.getKey());
         inStorageDto.setDetailType(InDetailTypeEnum.ALLOT.getKey());
+        inStorageDto.setWarehouseId(dto.getInWarehouseId());
+        inStorageDto.setDepartmentId(dto.getDepartmentId());
+        inStorageDto.setApplicant(dto.getApplicant());
+        inStorageDto.setRemark(dto.getRemark());
         inStorageDto.setAllotFlag(allotFlag);
+        inStorageDto.setInOutStorageBomList(dto.getInOutStorageBomList());
         add(inStorageDto);
 
-        InOutStorageDto outStorageDto = BeanUtil.toBean(dto, InOutStorageDto.class);
-        outStorageDto.setWarehouseId(dto.getOutWarehouseId());
-        outStorageDto.setType(InOutTypeEnum.OUT.getKey());
-        outStorageDto.setDetailType(OutDetailTypeEnum.ALLOT.getKey());
-        outStorageDto.setAllotFlag(allotFlag);
-        add(outStorageDto);
     }
 
     @Override