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 { @Resource IoSplitDesOrderMapper splitDesOrderMapper; @Resource + IoSplitDesOrderDetailService splitDesOrderDetailService; + @Resource GennerOrderUtils gennerOrderUtils; public List filterList(IoSplitDesOrderRequest splitDesOrderRequest) { @@ -60,13 +58,23 @@ public class IoSplitDesOrderService extends ServiceImpl