装箱出货

hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackDetailProductController.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.controller.pack;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
+import com.fjhx.sale.entity.pack.dto.PackDetailProductSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackDetailProductDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.pack.PackDetailProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 装箱出货产品明细表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@RestController
+@RequestMapping("/packDetailProduct")
+public class PackDetailProductController {
+
+    @Autowired
+    private PackDetailProductService packDetailProductService;
+
+    /**
+     * 装箱出货产品明细表分页
+     */
+    @PostMapping("/page")
+    public Page<PackDetailProductVo> page(@RequestBody PackDetailProductSelectDto dto) {
+        return packDetailProductService.getPage(dto);
+    }
+
+    /**
+     * 装箱出货产品明细表明细
+     */
+    @PostMapping("/detail")
+    public PackDetailProductVo detail(@RequestBody BaseSelectDto dto) {
+        return packDetailProductService.detail(dto.getId());
+    }
+
+    /**
+     * 装箱出货产品明细表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PackDetailProductDto packDetailProductDto) {
+        packDetailProductService.add(packDetailProductDto);
+    }
+
+    /**
+     * 装箱出货产品明细表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PackDetailProductDto packDetailProductDto) {
+        packDetailProductService.edit(packDetailProductDto);
+    }
+
+    /**
+     * 装箱出货产品明细表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        packDetailProductService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackProductProductController.java

@@ -1,68 +0,0 @@
-package com.fjhx.sale.controller.pack;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.pack.vo.PackProductProductVo;
-import com.fjhx.sale.entity.pack.dto.PackProductProductSelectDto;
-import com.fjhx.sale.entity.pack.dto.PackProductProductDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.sale.service.pack.PackProductProductService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 装箱出货产品明细表 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-18
- */
-@RestController
-@RequestMapping("/packProductProduct")
-public class PackProductProductController {
-
-    @Autowired
-    private PackProductProductService packProductProductService;
-
-    /**
-     * 装箱出货产品明细表分页
-     */
-    @PostMapping("/page")
-    public Page<PackProductProductVo> page(@RequestBody PackProductProductSelectDto dto) {
-        return packProductProductService.getPage(dto);
-    }
-
-    /**
-     * 装箱出货产品明细表明细
-     */
-    @PostMapping("/detail")
-    public PackProductProductVo detail(@RequestBody BaseSelectDto dto) {
-        return packProductProductService.detail(dto.getId());
-    }
-
-    /**
-     * 装箱出货产品明细表新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody PackProductProductDto packProductProductDto) {
-        packProductProductService.add(packProductProductDto);
-    }
-
-    /**
-     * 装箱出货产品明细表编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody PackProductProductDto packProductProductDto) {
-        packProductProductService.edit(packProductProductDto);
-    }
-
-    /**
-     * 装箱出货产品明细表删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        packProductProductService.delete(dto.getId());
-    }
-
-}

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackProductProductDto.java → hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackDetailProductDto.java

@@ -1,6 +1,6 @@
 package com.fjhx.sale.entity.pack.dto;
 
-import com.fjhx.sale.entity.pack.po.PackProductProduct;
+import com.fjhx.sale.entity.pack.po.PackDetailProduct;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,6 +12,6 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class PackProductProductDto extends PackProductProduct {
+public class PackDetailProductDto extends PackDetailProduct {
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackProductProductSelectDto.java → hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackDetailProductSelectDto.java

@@ -12,6 +12,6 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class PackProductProductSelectDto extends BaseSelectDto {
+public class PackDetailProductSelectDto extends BaseSelectDto {
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/Pack.java

@@ -1,8 +1,11 @@
 package com.fjhx.sale.entity.pack.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
-import java.util.Date;
+
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,7 +19,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("pack")
+@TableName("mapper/pack")
 public class Pack extends BasePo {
 
     /**
@@ -32,7 +35,7 @@ public class Pack extends BasePo {
     /**
      * 合同ID
      */
-    private Long contractId;
+    private Long contractIds;
 
     /**
      * 合同编码
@@ -44,4 +47,10 @@ public class Pack extends BasePo {
      */
     private String remark;
 
+    /**
+     * 装箱明细列表
+     */
+    @TableField(exist = false)
+    private List<PackDetail> packDetailList;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackDetail.java

@@ -1,9 +1,12 @@
 package com.fjhx.sale.entity.pack.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -100,4 +103,16 @@ public class PackDetail extends BasePo {
      */
     private String remark;
 
+    /**
+     * 装箱明细自定义货物列表
+     */
+    @TableField(exist = false)
+    private List<PackDetailGoods> packDetailGoodsList;
+
+    /**
+     * 装箱明细合同产品列表
+     */
+    @TableField(exist = false)
+    private List<PackDetailProduct> packDetailProductList;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackProductProduct.java → hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackDetailProduct.java

@@ -17,8 +17,8 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("pack_product_product")
-public class PackProductProduct extends BasePo {
+@TableName("pack_detail_product")
+public class PackDetailProduct extends BasePo {
 
     /**
      * 装箱单编码

hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackProductProductVo.java → hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackDetailProductVo.java

@@ -1,6 +1,6 @@
 package com.fjhx.sale.entity.pack.vo;
 
-import com.fjhx.sale.entity.pack.po.PackProductProduct;
+import com.fjhx.sale.entity.pack.po.PackDetailProduct;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,6 +12,6 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class PackProductProductVo extends PackProductProduct {
+public class PackDetailProductVo extends PackDetailProduct {
 
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/pack/PackProductProductMapper.java → hx-sale/src/main/java/com/fjhx/sale/mapper/pack/PackDetailProductMapper.java

@@ -1,9 +1,9 @@
 package com.fjhx.sale.mapper.pack;
 
-import com.fjhx.sale.entity.pack.po.PackProductProduct;
+import com.fjhx.sale.entity.pack.po.PackDetailProduct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.pack.vo.PackProductProductVo;
+import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,11 +16,11 @@ import org.apache.ibatis.annotations.Param;
  * @author 
  * @since 2023-04-18
  */
-public interface PackProductProductMapper extends BaseMapper<PackProductProduct> {
+public interface PackDetailProductMapper extends BaseMapper<PackDetailProduct> {
 
     /**
      * 装箱出货产品明细表分页
      */
-    Page<PackProductProductVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PackProductProduct> wrapper);
+    Page<PackDetailProductVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PackDetailProduct> wrapper);
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/pack/PackProductProductService.java → hx-sale/src/main/java/com/fjhx/sale/service/pack/PackDetailProductService.java

@@ -1,11 +1,11 @@
 package com.fjhx.sale.service.pack;
 
-import com.fjhx.sale.entity.pack.po.PackProductProduct;
+import com.fjhx.sale.entity.pack.po.PackDetailProduct;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.pack.vo.PackProductProductVo;
-import com.fjhx.sale.entity.pack.dto.PackProductProductSelectDto;
-import com.fjhx.sale.entity.pack.dto.PackProductProductDto;
+import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
+import com.fjhx.sale.entity.pack.dto.PackDetailProductSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackDetailProductDto;
 
 
 /**
@@ -16,27 +16,27 @@ import com.fjhx.sale.entity.pack.dto.PackProductProductDto;
  * @author 
  * @since 2023-04-18
  */
-public interface PackProductProductService extends BaseService<PackProductProduct> {
+public interface PackDetailProductService extends BaseService<PackDetailProduct> {
 
     /**
      * 装箱出货产品明细表分页
      */
-    Page<PackProductProductVo> getPage(PackProductProductSelectDto dto);
+    Page<PackDetailProductVo> getPage(PackDetailProductSelectDto dto);
 
     /**
      * 装箱出货产品明细表明细
      */
-    PackProductProductVo detail(Long id);
+    PackDetailProductVo detail(Long id);
 
     /**
      * 装箱出货产品明细表新增
      */
-    void add(PackProductProductDto packProductProductDto);
+    void add(PackDetailProductDto packDetailProductDto);
 
     /**
      * 装箱出货产品明细表编辑
      */
-    void edit(PackProductProductDto packProductProductDto);
+    void edit(PackDetailProductDto packDetailProductDto);
 
     /**
      * 装箱出货产品明细表删除

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackDetailProductServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.pack.impl;
+
+import com.fjhx.sale.entity.pack.po.PackDetailProduct;
+import com.fjhx.sale.mapper.pack.PackDetailProductMapper;
+import com.fjhx.sale.service.pack.PackDetailProductService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
+import com.fjhx.sale.entity.pack.dto.PackDetailProductSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.pack.dto.PackDetailProductDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 装箱出货产品明细表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-18
+ */
+@Service
+public class PackDetailProductServiceImpl extends ServiceImpl<PackDetailProductMapper, PackDetailProduct> implements PackDetailProductService {
+
+    @Override
+    public Page<PackDetailProductVo> getPage(PackDetailProductSelectDto dto) {
+        IWrapper<PackDetailProduct> wrapper = getWrapper();
+        wrapper.orderByDesc("pdp", PackDetailProduct::getId);
+        Page<PackDetailProductVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public PackDetailProductVo detail(Long id) {
+        PackDetailProduct PackDetailProduct = this.getById(id);
+        PackDetailProductVo result = BeanUtil.toBean(PackDetailProduct, PackDetailProductVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(PackDetailProductDto packDetailProductDto) {
+        this.save(packDetailProductDto);
+    }
+
+    @Override
+    public void edit(PackDetailProductDto packDetailProductDto) {
+        this.updateById(packDetailProductDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackProductProductServiceImpl.java

@@ -1,57 +0,0 @@
-package com.fjhx.sale.service.pack.impl;
-
-import com.fjhx.sale.entity.pack.po.PackProductProduct;
-import com.fjhx.sale.mapper.pack.PackProductProductMapper;
-import com.fjhx.sale.service.pack.PackProductProductService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.pack.vo.PackProductProductVo;
-import com.fjhx.sale.entity.pack.dto.PackProductProductSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.sale.entity.pack.dto.PackProductProductDto;
-import cn.hutool.core.bean.BeanUtil;
-
-
-/**
- * <p>
- * 装箱出货产品明细表 服务实现类
- * </p>
- *
- * @author 
- * @since 2023-04-18
- */
-@Service
-public class PackProductProductServiceImpl extends ServiceImpl<PackProductProductMapper, PackProductProduct> implements PackProductProductService {
-
-    @Override
-    public Page<PackProductProductVo> getPage(PackProductProductSelectDto dto) {
-        IWrapper<PackProductProduct> wrapper = getWrapper();
-        wrapper.orderByDesc("ppp", PackProductProduct::getId);
-        Page<PackProductProductVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        return page;
-    }
-
-    @Override
-    public PackProductProductVo detail(Long id) {
-        PackProductProduct PackProductProduct = this.getById(id);
-        PackProductProductVo result = BeanUtil.toBean(PackProductProduct, PackProductProductVo.class);
-        return result;
-    }
-
-    @Override
-    public void add(PackProductProductDto packProductProductDto) {
-        this.save(packProductProductDto);
-    }
-
-    @Override
-    public void edit(PackProductProductDto packProductProductDto) {
-        this.updateById(packProductProductDto);
-    }
-
-    @Override
-    public void delete(Long id) {
-        this.removeById(id);
-    }
-
-}

hx-sale/src/main/resources/pack/PackProductProductMapper.xml

@@ -1,24 +0,0 @@
-<?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.sale.mapper.pack.PackProductProductMapper">
-    <select id="getPage" resultType="com.fjhx.sale.entity.pack.vo.PackProductProductVo">
-        select
-            ppp.id,
-            ppp.code,
-            ppp.pack_detail_id,
-            ppp.contract_id,
-            ppp.contract_product_id,
-            ppp.quantity,
-            ppp.product_id,
-            ppp.product_name,
-            ppp.product_model,
-            ppp.remark,
-            ppp.update_time,
-            ppp.create_user,
-            ppp.create_time,
-            ppp.update_user
-        from pack_product_product ppp
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>