多货登记

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/excess/ExcessGoodsDetailsController.java

@@ -0,0 +1,80 @@
+package com.fjhx.victoriatourist.controller.excess;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsDetailsDto;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsDetailsVo;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsDetailsService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记明细 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@RestController
+@RequestMapping("/excessGoodsDetails")
+public class ExcessGoodsDetailsController {
+
+    @Autowired
+    private ExcessGoodsDetailsService excessGoodsDetailsService;
+
+    /**
+     * 多货登记明细列表
+     */
+    @PostMapping("/list")
+    public List<ExcessGoodsDetailsVo> list(@RequestBody ExcessGoodsDetailsSelectDto dto) {
+        return excessGoodsDetailsService.getList(dto);
+    }
+
+    /**
+     * 多货登记明细分页
+     */
+    @PostMapping("/page")
+    public Page<ExcessGoodsDetailsVo> page(@RequestBody ExcessGoodsDetailsSelectDto dto) {
+        return excessGoodsDetailsService.getPage(dto);
+    }
+
+    /**
+     * 多货登记明细明细
+     */
+    @PostMapping("/detail")
+    public ExcessGoodsDetailsVo detail(@RequestBody BaseSelectDto dto) {
+        return excessGoodsDetailsService.detail(dto.getId());
+    }
+
+    /**
+     * 多货登记明细新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ExcessGoodsDetailsDto excessGoodsDetailsDto) {
+        excessGoodsDetailsService.add(excessGoodsDetailsDto);
+    }
+
+    /**
+     * 多货登记明细编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ExcessGoodsDetailsDto excessGoodsDetailsDto) {
+        excessGoodsDetailsService.edit(excessGoodsDetailsDto);
+    }
+
+    /**
+     * 多货登记明细删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        excessGoodsDetailsService.delete(dto.getId());
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/excess/ExcessGoodsInfoController.java

@@ -0,0 +1,80 @@
+package com.fjhx.victoriatourist.controller.excess;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsInfoDto;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsInfoSelectDto;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsInfoVo;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsInfoService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-27
+ */
+@RestController
+@RequestMapping("/excessGoodsInfo")
+public class ExcessGoodsInfoController {
+
+    @Autowired
+    private ExcessGoodsInfoService excessGoodsInfoService;
+
+    /**
+     * 多货登记列表
+     */
+    @PostMapping("/list")
+    public List<ExcessGoodsInfoVo> list(@RequestBody ExcessGoodsInfoSelectDto dto) {
+        return excessGoodsInfoService.getList(dto);
+    }
+
+    /**
+     * 多货登记分页
+     */
+    @PostMapping("/page")
+    public Page<ExcessGoodsInfoVo> page(@RequestBody ExcessGoodsInfoSelectDto dto) {
+        return excessGoodsInfoService.getPage(dto);
+    }
+
+    /**
+     * 多货登记明细
+     */
+    @PostMapping("/detail")
+    public ExcessGoodsInfoVo detail(@RequestBody BaseSelectDto dto) {
+        return excessGoodsInfoService.detail(dto.getId());
+    }
+
+    /**
+     * 多货登记新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ExcessGoodsInfoDto excessGoodsInfoDto) {
+        excessGoodsInfoService.add(excessGoodsInfoDto);
+    }
+
+    /**
+     * 多货登记编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ExcessGoodsInfoDto excessGoodsInfoDto) {
+        excessGoodsInfoService.edit(excessGoodsInfoDto);
+    }
+
+    /**
+     * 多货登记删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        excessGoodsInfoService.delete(dto.getId());
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/excess/ExcessGoodsRegisterController.java

@@ -0,0 +1,80 @@
+package com.fjhx.victoriatourist.controller.excess;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsRegisterDto;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsRegisterSelectDto;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsRegisterVo;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsRegisterService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记临时表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@RestController
+@RequestMapping("/excessGoodsRegister")
+public class ExcessGoodsRegisterController {
+
+    @Autowired
+    private ExcessGoodsRegisterService excessGoodsRegisterService;
+
+    /**
+     * 多货登记临时表列表
+     */
+    @PostMapping("/list")
+    public List<ExcessGoodsRegisterVo> list(@RequestBody ExcessGoodsRegisterSelectDto dto) {
+        return excessGoodsRegisterService.getList(dto);
+    }
+
+    /**
+     * 多货登记临时表分页
+     */
+    @PostMapping("/page")
+    public Page<ExcessGoodsRegisterVo> page(@RequestBody ExcessGoodsRegisterSelectDto dto) {
+        return excessGoodsRegisterService.getPage(dto);
+    }
+
+    /**
+     * 多货登记临时表明细
+     */
+    @PostMapping("/detail")
+    public ExcessGoodsRegisterVo detail(@RequestBody BaseSelectDto dto) {
+        return excessGoodsRegisterService.detail(dto.getId());
+    }
+
+    /**
+     * 多货登记临时表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ExcessGoodsRegisterDto excessGoodsRegisterDto) {
+        excessGoodsRegisterService.add(excessGoodsRegisterDto);
+    }
+
+    /**
+     * 多货登记临时表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ExcessGoodsRegisterDto excessGoodsRegisterDto) {
+        excessGoodsRegisterService.edit(excessGoodsRegisterDto);
+    }
+
+    /**
+     * 多货登记临时表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        excessGoodsRegisterService.delete(dto.getId());
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/dto/ExcessGoodsDetailsDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.excess.dto;
+
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多货登记明细新增编辑入参实体
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+public class ExcessGoodsDetailsDto extends ExcessGoodsDetails {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/dto/ExcessGoodsDetailsSelectDto.java

@@ -0,0 +1,20 @@
+package com.fjhx.victoriatourist.entity.excess.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多货登记明细列表查询入参实体
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+public class ExcessGoodsDetailsSelectDto extends BaseSelectDto {
+    /**
+     * 待入库id
+     */
+    private Long stockWaitId;
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/dto/ExcessGoodsInfoDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.excess.dto;
+
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多货登记新增编辑入参实体
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+public class ExcessGoodsInfoDto extends ExcessGoodsInfo {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/dto/ExcessGoodsInfoSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.excess.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多货登记列表查询入参实体
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+public class ExcessGoodsInfoSelectDto extends BaseSelectDto {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/dto/ExcessGoodsRegisterDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.excess.dto;
+
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsRegister;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多货登记临时表新增编辑入参实体
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+public class ExcessGoodsRegisterDto extends ExcessGoodsRegister {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/dto/ExcessGoodsRegisterSelectDto.java

@@ -0,0 +1,16 @@
+package com.fjhx.victoriatourist.entity.excess.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多货登记临时表列表查询入参实体
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+public class ExcessGoodsRegisterSelectDto extends BaseSelectDto {
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/po/ExcessGoodsDetails.java

@@ -0,0 +1,48 @@
+package com.fjhx.victoriatourist.entity.excess.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 多货登记明细
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+@TableName("excess_goods_details")
+public class ExcessGoodsDetails extends BasePo {
+
+    /**
+     * 多货登记id
+     */
+    private Long excessGoodsInfoId;
+
+    /**
+     * 待入库id
+     */
+    private Long stockWaitId;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 处理方式
+     */
+    private String processingMethod;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/po/ExcessGoodsInfo.java

@@ -0,0 +1,41 @@
+package com.fjhx.victoriatourist.entity.excess.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 多货登记
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+@TableName("excess_goods_info")
+public class ExcessGoodsInfo extends BasePo {
+
+    /**
+     * 入库单id
+     */
+    private Long stockWaitId;
+
+    /**
+     * 物流信息id
+     */
+    private Long logisticsInfosId;
+
+    /**
+     * 处理方式
+     */
+    private String processingMethod;
+
+    /**
+     * 退货物流信息id
+     */
+    private Long backLogisticsInfosId;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/po/ExcessGoodsRegister.java

@@ -0,0 +1,38 @@
+package com.fjhx.victoriatourist.entity.excess.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 多货登记临时表
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+@TableName("excess_goods_register")
+public class ExcessGoodsRegister extends BasePo {
+
+    /**
+     * 待入库id
+     */
+    private Long stockWaitId;
+
+    @NotNull(message = "多货登记产品id为空")
+    private Long excessGoodsDetailsId;
+
+    /**
+     * 数量
+     */
+    @NotNull(message = "数量不能为空")
+    private BigDecimal quantity;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/vo/ExcessGoodsDetailsVo.java

@@ -0,0 +1,28 @@
+package com.fjhx.victoriatourist.entity.excess.vo;
+
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsDetails;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsRegister;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 多货登记明细列表查询返回值实体
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+public class ExcessGoodsDetailsVo extends ExcessGoodsDetails {
+
+    List<ExcessGoodsRegister> excessGoodsRegisterList;
+
+    private String productCode;
+    private String productCustomCode;
+    private String productName;
+    private String productSpec;
+    private String productUnit;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/vo/ExcessGoodsInfoVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.excess.vo;
+
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多货登记列表查询返回值实体
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+public class ExcessGoodsInfoVo extends ExcessGoodsInfo {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/vo/ExcessGoodsRegisterVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.excess.vo;
+
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsRegister;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多货登记临时表列表查询返回值实体
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+public class ExcessGoodsRegisterVo extends ExcessGoodsRegister {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/excess/ExcessGoodsDetailsMapper.java

@@ -0,0 +1,32 @@
+package com.fjhx.victoriatourist.mapper.excess;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsDetails;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsDetailsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记明细 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+public interface ExcessGoodsDetailsMapper extends BaseMapper<ExcessGoodsDetails> {
+
+    /**
+     * 多货登记明细列表
+     */
+    List<ExcessGoodsDetailsVo> getList(@Param("ew") IWrapper<ExcessGoodsDetails> wrapper);
+
+    /**
+     * 多货登记明细分页
+     */
+    Page<ExcessGoodsDetailsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ExcessGoodsDetails> wrapper);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/excess/ExcessGoodsInfoMapper.java

@@ -0,0 +1,32 @@
+package com.fjhx.victoriatourist.mapper.excess;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsInfo;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsInfoVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+public interface ExcessGoodsInfoMapper extends BaseMapper<ExcessGoodsInfo> {
+
+    /**
+     * 多货登记列表
+     */
+    List<ExcessGoodsInfoVo> getList(@Param("ew") IWrapper<ExcessGoodsInfo> wrapper);
+
+    /**
+     * 多货登记分页
+     */
+    Page<ExcessGoodsInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ExcessGoodsInfo> wrapper);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/excess/ExcessGoodsRegisterMapper.java

@@ -0,0 +1,32 @@
+package com.fjhx.victoriatourist.mapper.excess;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsRegister;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsRegisterVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记临时表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+public interface ExcessGoodsRegisterMapper extends BaseMapper<ExcessGoodsRegister> {
+
+    /**
+     * 多货登记临时表列表
+     */
+    List<ExcessGoodsRegisterVo> getList(@Param("ew") IWrapper<ExcessGoodsRegister> wrapper);
+
+    /**
+     * 多货登记临时表分页
+     */
+    Page<ExcessGoodsRegisterVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ExcessGoodsRegister> wrapper);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/excess/ExcessGoodsDetailsService.java

@@ -0,0 +1,52 @@
+package com.fjhx.victoriatourist.service.excess;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsDetailsDto;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsDetails;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsDetailsVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记明细 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+public interface ExcessGoodsDetailsService extends BaseService<ExcessGoodsDetails> {
+
+    /**
+     * 多货登记明细列表
+     */
+    List<ExcessGoodsDetailsVo> getList(ExcessGoodsDetailsSelectDto dto);
+
+    /**
+     * 多货登记明细分页
+     */
+    Page<ExcessGoodsDetailsVo> getPage(ExcessGoodsDetailsSelectDto dto);
+
+    /**
+     * 多货登记明细明细
+     */
+    ExcessGoodsDetailsVo detail(Long id);
+
+    /**
+     * 多货登记明细新增
+     */
+    void add(ExcessGoodsDetailsDto excessGoodsDetailsDto);
+
+    /**
+     * 多货登记明细编辑
+     */
+    void edit(ExcessGoodsDetailsDto excessGoodsDetailsDto);
+
+    /**
+     * 多货登记明细删除
+     */
+    void delete(Long id);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/excess/ExcessGoodsInfoService.java

@@ -0,0 +1,52 @@
+package com.fjhx.victoriatourist.service.excess;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsInfoDto;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsInfoSelectDto;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsInfo;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsInfoVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+public interface ExcessGoodsInfoService extends BaseService<ExcessGoodsInfo> {
+
+    /**
+     * 多货登记列表
+     */
+    List<ExcessGoodsInfoVo> getList(ExcessGoodsInfoSelectDto dto);
+
+    /**
+     * 多货登记分页
+     */
+    Page<ExcessGoodsInfoVo> getPage(ExcessGoodsInfoSelectDto dto);
+
+    /**
+     * 多货登记明细
+     */
+    ExcessGoodsInfoVo detail(Long id);
+
+    /**
+     * 多货登记新增
+     */
+    void add(ExcessGoodsInfoDto excessGoodsInfoDto);
+
+    /**
+     * 多货登记编辑
+     */
+    void edit(ExcessGoodsInfoDto excessGoodsInfoDto);
+
+    /**
+     * 多货登记删除
+     */
+    void delete(Long id);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/excess/ExcessGoodsRegisterService.java

@@ -0,0 +1,52 @@
+package com.fjhx.victoriatourist.service.excess;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsRegisterDto;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsRegisterSelectDto;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsRegister;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsRegisterVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记临时表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+public interface ExcessGoodsRegisterService extends BaseService<ExcessGoodsRegister> {
+
+    /**
+     * 多货登记临时表列表
+     */
+    List<ExcessGoodsRegisterVo> getList(ExcessGoodsRegisterSelectDto dto);
+
+    /**
+     * 多货登记临时表分页
+     */
+    Page<ExcessGoodsRegisterVo> getPage(ExcessGoodsRegisterSelectDto dto);
+
+    /**
+     * 多货登记临时表明细
+     */
+    ExcessGoodsRegisterVo detail(Long id);
+
+    /**
+     * 多货登记临时表新增
+     */
+    void add(ExcessGoodsRegisterDto excessGoodsRegisterDto);
+
+    /**
+     * 多货登记临时表编辑
+     */
+    void edit(ExcessGoodsRegisterDto excessGoodsRegisterDto);
+
+    /**
+     * 多货登记临时表删除
+     */
+    void delete(Long id);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/excess/impl/ExcessGoodsDetailsServiceImpl.java

@@ -0,0 +1,114 @@
+package com.fjhx.victoriatourist.service.excess.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsDetailsDto;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsDetails;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsRegister;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsDetailsVo;
+import com.fjhx.victoriatourist.mapper.excess.ExcessGoodsDetailsMapper;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsDetailsService;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsRegisterService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 多货登记明细 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-27
+ */
+@Service
+public class ExcessGoodsDetailsServiceImpl extends ServiceImpl<ExcessGoodsDetailsMapper, ExcessGoodsDetails> implements ExcessGoodsDetailsService {
+
+    @Autowired
+    private ExcessGoodsRegisterService excessGoodsRegisterService;
+
+    @Autowired
+    private ProductInfoService productInfoService;
+
+    private IWrapper<ExcessGoodsDetails> getWrapper(ExcessGoodsDetailsSelectDto dto) {
+        IWrapper<ExcessGoodsDetails> wrapper = getWrapper();
+        wrapper.eq("egd", ExcessGoodsDetails::getStockWaitId, dto.getStockWaitId());
+        wrapper.orderByDesc("egd", ExcessGoodsDetails::getId);
+        return wrapper;
+    }
+
+    @Override
+    public List<ExcessGoodsDetailsVo> getList(ExcessGoodsDetailsSelectDto dto) {
+        IWrapper<ExcessGoodsDetails> wrapper = getWrapper(dto);
+        List<ExcessGoodsDetailsVo> list = this.baseMapper.getList(wrapper);
+        setInfo(list);
+        return list;
+    }
+
+    @Override
+    public Page<ExcessGoodsDetailsVo> getPage(ExcessGoodsDetailsSelectDto dto) {
+        IWrapper<ExcessGoodsDetails> wrapper = getWrapper(dto);
+        Page<ExcessGoodsDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<ExcessGoodsDetailsVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return page;
+        }
+        return page;
+    }
+
+    void setInfo(List<ExcessGoodsDetailsVo> list) {
+        List<Long> ids = list.stream().map(ExcessGoodsDetails::getId).collect(Collectors.toList());
+        if (ObjectUtil.isEmpty(ids)) {
+            return;
+        }
+        //赋值清点列表
+        Map<Long, List<ExcessGoodsRegister>> longListMap = excessGoodsRegisterService.mapKGroup(ExcessGoodsRegister::getExcessGoodsDetailsId, q -> q
+                .in(ExcessGoodsRegister::getExcessGoodsDetailsId, ids)
+        );
+
+        for (ExcessGoodsDetailsVo excessGoodsDetailsVo : list) {
+            excessGoodsDetailsVo.setExcessGoodsRegisterList(longListMap.getOrDefault(excessGoodsDetailsVo.getId(), new ArrayList<>()));
+        }
+
+        //赋值产品信息
+        productInfoService.attributeAssign(list, ExcessGoodsDetails::getProductId, (item, productinfo) -> {
+            item.setProductCode(productinfo.getCode());
+            item.setProductCustomCode(productinfo.getCustomCode());
+            item.setProductName(productinfo.getName());
+            item.setProductSpec(productinfo.getSpec());
+            item.setProductUnit(productinfo.getUnit());
+        });
+    }
+
+    @Override
+    public ExcessGoodsDetailsVo detail(Long id) {
+        ExcessGoodsDetails ExcessGoodsDetails = this.getById(id);
+        ExcessGoodsDetailsVo result = BeanUtil.toBean(ExcessGoodsDetails, ExcessGoodsDetailsVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(ExcessGoodsDetailsDto excessGoodsDetailsDto) {
+        this.save(excessGoodsDetailsDto);
+    }
+
+    @Override
+    public void edit(ExcessGoodsDetailsDto excessGoodsDetailsDto) {
+        this.updateById(excessGoodsDetailsDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/excess/impl/ExcessGoodsInfoServiceImpl.java

@@ -0,0 +1,112 @@
+package com.fjhx.victoriatourist.service.excess.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.utils.Assert;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsInfoDto;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsInfoSelectDto;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsDetails;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsInfo;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsRegister;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsInfoVo;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
+import com.fjhx.victoriatourist.mapper.excess.ExcessGoodsInfoMapper;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsDetailsService;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsInfoService;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsRegisterService;
+import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
+import com.fjhx.wms.entity.stock.po.StockWait;
+import com.fjhx.wms.service.stock.StockWaitService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-27
+ */
+@Service
+public class ExcessGoodsInfoServiceImpl extends ServiceImpl<ExcessGoodsInfoMapper, ExcessGoodsInfo> implements ExcessGoodsInfoService {
+
+    @Autowired
+    private StockWaitService stockWaitService;
+    @Autowired
+    private LogisticsInfosService logisticsInfosService;
+    @Autowired
+    private ExcessGoodsDetailsService excessGoodsDetailsService;
+    @Autowired
+    private ExcessGoodsRegisterService excessGoodsRegisterService;
+
+    @Override
+    public List<ExcessGoodsInfoVo> getList(ExcessGoodsInfoSelectDto dto) {
+        IWrapper<ExcessGoodsInfo> wrapper = getWrapper();
+        wrapper.orderByDesc("egi", ExcessGoodsInfo::getId);
+        List<ExcessGoodsInfoVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public Page<ExcessGoodsInfoVo> getPage(ExcessGoodsInfoSelectDto dto) {
+        IWrapper<ExcessGoodsInfo> wrapper = getWrapper();
+        wrapper.orderByDesc("egi", ExcessGoodsInfo::getId);
+        Page<ExcessGoodsInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public ExcessGoodsInfoVo detail(Long id) {
+        ExcessGoodsInfo ExcessGoodsInfo = this.getById(id);
+        ExcessGoodsInfoVo result = BeanUtil.toBean(ExcessGoodsInfo, ExcessGoodsInfoVo.class);
+        return result;
+    }
+
+    @Override
+    @DSTransactional
+    public synchronized void add(ExcessGoodsInfoDto dto) {
+        Long stockWaitId = dto.getStockWaitId();
+        Assert.notEmpty(stockWaitId, "待入库id不能为空");
+        StockWait stockWait = stockWaitService.getById(stockWaitId);
+        Assert.notEmpty(stockWait, "查询不到待入库信息");
+        LogisticsInfos one = logisticsInfosService.getOne(q -> q.eq(LogisticsInfos::getBusinessId, stockWait.getDeliverGoodsId()));
+        if (ObjectUtil.isNotEmpty(one)) {
+            dto.setLogisticsInfosId(one.getId());
+        }
+        this.save(dto);
+
+        //保存详情信息
+        List<ExcessGoodsDetails> list = excessGoodsDetailsService.list(q -> q.eq(ExcessGoodsDetails::getStockWaitId, stockWaitId));
+        for (ExcessGoodsDetails excessGoodsDetails : list) {
+            List<ExcessGoodsRegister> list1 = excessGoodsRegisterService.list(q -> q.eq(ExcessGoodsRegister::getExcessGoodsDetailsId, excessGoodsDetails.getId()));
+            BigDecimal sumQuantity = list1.stream()
+                    .map(ExcessGoodsRegister::getQuantity)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            excessGoodsDetails.setQuantity(sumQuantity);
+            excessGoodsDetails.setExcessGoodsInfoId(dto.getId());
+        }
+        excessGoodsDetailsService.saveOrUpdateBatch(list);
+
+        //删除登记数据
+        excessGoodsRegisterService.remove(q -> q.in(ExcessGoodsRegister::getStockWaitId, stockWaitId));
+    }
+
+    @Override
+    public void edit(ExcessGoodsInfoDto excessGoodsInfoDto) {
+        this.updateById(excessGoodsInfoDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/excess/impl/ExcessGoodsRegisterServiceImpl.java

@@ -0,0 +1,88 @@
+package com.fjhx.victoriatourist.service.excess.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.utils.Assert;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsRegisterDto;
+import com.fjhx.victoriatourist.entity.excess.dto.ExcessGoodsRegisterSelectDto;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsDetails;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsRegister;
+import com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsRegisterVo;
+import com.fjhx.victoriatourist.mapper.excess.ExcessGoodsRegisterMapper;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsDetailsService;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsRegisterService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 多货登记临时表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-27
+ */
+@Service
+public class ExcessGoodsRegisterServiceImpl extends ServiceImpl<ExcessGoodsRegisterMapper, ExcessGoodsRegister> implements ExcessGoodsRegisterService {
+
+    @Autowired
+    private ExcessGoodsDetailsService excessGoodsDetailsService;
+
+
+
+    private IWrapper<ExcessGoodsRegister> getWrapper(ExcessGoodsRegisterSelectDto dto) {
+        IWrapper<ExcessGoodsRegister> wrapper = getWrapper();
+
+        wrapper.orderByDesc("egr", ExcessGoodsRegister::getId);
+        return wrapper;
+    }
+
+    @Override
+    public List<ExcessGoodsRegisterVo> getList(ExcessGoodsRegisterSelectDto dto) {
+        IWrapper<ExcessGoodsRegister> wrapper = getWrapper(dto);
+        List<ExcessGoodsRegisterVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public Page<ExcessGoodsRegisterVo> getPage(ExcessGoodsRegisterSelectDto dto) {
+        IWrapper<ExcessGoodsRegister> wrapper = getWrapper(dto);
+        Page<ExcessGoodsRegisterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<ExcessGoodsRegisterVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return page;
+        }
+        return page;
+    }
+
+    @Override
+    public ExcessGoodsRegisterVo detail(Long id) {
+        ExcessGoodsRegister ExcessGoodsRegister = this.getById(id);
+        ExcessGoodsRegisterVo result = BeanUtil.toBean(ExcessGoodsRegister, ExcessGoodsRegisterVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(ExcessGoodsRegisterDto excessGoodsRegisterDto) {
+        ExcessGoodsDetails excessGoodsDetails = excessGoodsDetailsService.getById(excessGoodsRegisterDto.getExcessGoodsDetailsId());
+        Assert.notEmpty(excessGoodsDetails,"查询不到多货产品id");
+        excessGoodsRegisterDto.setStockWaitId(excessGoodsDetails.getStockWaitId());
+        this.save(excessGoodsRegisterDto);
+    }
+
+    @Override
+    public void edit(ExcessGoodsRegisterDto excessGoodsRegisterDto) {
+        this.updateById(excessGoodsRegisterDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-victoriatourist/src/main/resources/mapper/excess/ExcessGoodsDetailsMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.victoriatourist.mapper.excess.ExcessGoodsDetailsMapper">
+    <select id="getList" resultType="com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsDetailsVo">
+        select
+            egd.id,
+            egd.excess_goods_register_id,
+            egd.stock_wait_id,
+            egd.product_id,
+            egd.quantity,
+            egd.processing_method,
+            egd.create_user,
+            egd.create_time,
+            egd.update_user,
+            egd.update_time
+        from excess_goods_details egd
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsDetailsVo">
+        select
+            egd.id,
+            egd.excess_goods_register_id,
+            egd.stock_wait_id,
+            egd.product_id,
+            egd.quantity,
+            egd.processing_method,
+            egd.create_user,
+            egd.create_time,
+            egd.update_user,
+            egd.update_time
+        from excess_goods_details egd
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-victoriatourist/src/main/resources/mapper/excess/ExcessGoodsInfoMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.victoriatourist.mapper.excess.ExcessGoodsInfoMapper">
+    <select id="getList" resultType="com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsInfoVo">
+        select
+            egi.id,
+            egi.stock_wait_id,
+            egi.logistics_infos_id,
+            egi.processing_method,
+            egi.back_logistics_infos_id,
+            egi.create_user,
+            egi.create_time,
+            egi.update_user,
+            egi.update_time
+        from excess_goods_info egi
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsInfoVo">
+        select
+            egi.id,
+            egi.stock_wait_id,
+            egi.logistics_infos_id,
+            egi.processing_method,
+            egi.back_logistics_infos_id,
+            egi.create_user,
+            egi.create_time,
+            egi.update_user,
+            egi.update_time
+        from excess_goods_info egi
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-victoriatourist/src/main/resources/mapper/excess/ExcessGoodsRegisterMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.victoriatourist.mapper.excess.ExcessGoodsRegisterMapper">
+
+    <sql id="list">
+        select
+            egr.*
+        from excess_goods_register egr
+    </sql>
+
+    <select id="getList" resultType="com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsRegisterVo">
+        <include refid="list"/>
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.excess.vo.ExcessGoodsRegisterVo">
+        <include refid="list"/>
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>