添加了报价单的数据

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

@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 装箱出货明细表	 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @RestController
@@ -73,4 +73,6 @@ public class PackDetailController {
         packDetailService.shipment(dto.getIds(),dto.getContractId());
     }
 
+
+
 }

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

@@ -9,13 +9,16 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.sale.service.pack.PackShipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * <p>
  * 出货绑定主合同表 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 @RestController
@@ -34,6 +37,26 @@ public class PackShipmentController {
     }
 
     /**
+     * 查询出货绑定主合同列表详情
+     * @param dto
+     * @return
+     */
+    @PostMapping("/list")
+    public List<PackShipmentVo> list(@RequestBody PackShipmentSelectDto dto) {
+        return packShipmentService.getList(dto);
+    }
+
+    /**
+     * 查询出货-主合同表的产品信息详情列表
+     * @param dto
+     * @return
+     */
+    @PostMapping("/productDetailList")
+    public List<Map<String,Object>> productDetailList(@RequestBody PackShipmentSelectDto dto) {
+        return packShipmentService.productDetailList(dto);
+    }
+
+    /**
      * 出货绑定主合同表明细
      */
     @PostMapping("/detail")

hx-sale/src/main/java/com/fjhx/sale/entity/documents/po/DocumentsProduct.java

@@ -21,9 +21,9 @@ import lombok.Setter;
 public class DocumentsProduct extends BasePo {
 
     /**
-     * 产品ID
+     * 装箱明细产品id或者自定义装箱货物id
      */
-    private Long productId;
+    private Long businessId;
 
     /**
      * 单证表ID
@@ -46,6 +46,16 @@ public class DocumentsProduct extends BasePo {
     private String customsCode;
 
     /**
+     * 合同编码
+     */
+    private String contractCode;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
      * 单价
      */
     private BigDecimal price;

hx-sale/src/main/java/com/fjhx/sale/entity/pack/dto/PackShipmentSelectDto.java

@@ -7,11 +7,14 @@ import lombok.Setter;
 /**
  * 出货绑定主合同表列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 @Getter
 @Setter
 public class PackShipmentSelectDto extends BaseSelectDto {
-
+    /**
+     * 包装明细单ID  多个逗号隔开
+     */
+    private String packDetailIds;
 }

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

@@ -1,5 +1,6 @@
 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.util.Date;
@@ -11,7 +12,7 @@ import lombok.Setter;
  * 出货绑定主合同表
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 @Getter
@@ -34,4 +35,6 @@ public class PackShipment extends BasePo {
      */
     private String remark;
 
+
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackShipmentVo.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.pack.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import lombok.Getter;
 import lombok.Setter;
@@ -7,11 +8,15 @@ import lombok.Setter;
 /**
  * 出货绑定主合同表列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 @Getter
 @Setter
 public class PackShipmentVo extends PackShipment {
 
+    /**
+     * 合同编码
+     */
+    private String contractCode;
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/pack/PackShipmentMapper.java

@@ -1,5 +1,7 @@
 package com.fjhx.sale.mapper.pack;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fjhx.sale.entity.pack.dto.PackShipmentSelectDto;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,13 +9,16 @@ import com.fjhx.sale.entity.pack.vo.PackShipmentVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * <p>
  * 出货绑定主合同表 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 public interface PackShipmentMapper extends BaseMapper<PackShipment> {
@@ -23,4 +28,16 @@ public interface PackShipmentMapper extends BaseMapper<PackShipment> {
      */
     Page<PackShipmentVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PackShipment> wrapper);
 
+    /**
+     * 查询出货绑定主合同列表详情
+     * @param query
+     */
+    List<PackShipmentVo> getList(@Param("ew") QueryWrapper<Object> query);
+
+    /**
+     * 查询出货-主合同表的产品信息详情列表
+     * @param ids（包装明细单ID列表）
+     * @return
+     */
+    List<Map<String, Object>> productDetailList(List<String> ids);
 }

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

@@ -7,13 +7,16 @@ import com.fjhx.sale.entity.pack.vo.PackShipmentVo;
 import com.fjhx.sale.entity.pack.dto.PackShipmentSelectDto;
 import com.fjhx.sale.entity.pack.dto.PackShipmentDto;
 
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * <p>
  * 出货绑定主合同表 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 public interface PackShipmentService extends BaseService<PackShipment> {
@@ -43,4 +46,17 @@ public interface PackShipmentService extends BaseService<PackShipment> {
      */
     void delete(Long id);
 
+    /**
+     * 查询出货绑定主合同列表详情
+     * @param dto
+     * @return
+     */
+    List<PackShipmentVo> getList(PackShipmentSelectDto dto);
+
+    /**
+     * 查询出货-主合同表的产品信息详情列表
+     * @param dto
+     * @return
+     */
+    List<Map<String, Object>> productDetailList(PackShipmentSelectDto dto);
 }

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

@@ -1,9 +1,16 @@
 package com.fjhx.sale.service.pack.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.fjhx.sale.mapper.pack.PackShipmentMapper;
+import com.fjhx.sale.service.pack.PackDetailGoodsService;
+import com.fjhx.sale.service.pack.PackDetailProductService;
 import com.fjhx.sale.service.pack.PackShipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.pack.vo.PackShipmentVo;
@@ -12,17 +19,26 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.pack.dto.PackShipmentDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * <p>
  * 出货绑定主合同表 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 @Service
 public class PackShipmentServiceImpl extends ServiceImpl<PackShipmentMapper, PackShipment> implements PackShipmentService {
+    @Autowired
+    private PackDetailGoodsService packDetailGoodsService;
+
+    @Autowired
+    private PackDetailProductService packDetailProductService;
 
     @Override
     public Page<PackShipmentVo> getPage(PackShipmentSelectDto dto) {
@@ -54,4 +70,34 @@ public class PackShipmentServiceImpl extends ServiceImpl<PackShipmentMapper, Pac
         this.removeById(id);
     }
 
+
+    /**
+     * 查询出货绑定主合同列表详情
+     * @param dto
+     * @return
+     */
+    @Override
+    public List<PackShipmentVo> getList(PackShipmentSelectDto dto) {
+        //查询出货绑定主合同列表详情
+        List<PackShipmentVo> packShipments = baseMapper.getList(Wrappers.query()
+                .like(ObjectUtil.isNotEmpty(dto.getKeyword())," c.code",dto.getKeyword()));
+        return packShipments;
+    }
+
+    /**
+     * 查询出货-主合同表的产品信息详情列表
+     * @param dto
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> productDetailList(PackShipmentSelectDto dto) {
+        if (ObjectUtil.isEmpty(dto.getPackDetailIds())){
+            throw  new ServiceException("参数缺失：包装明细单ID不能为null");
+        }
+        String packDetailIds = dto.getPackDetailIds();
+        //获取到包装明细单ID列表
+        List<String> ids = Arrays.asList(packDetailIds.split(","));
+        return baseMapper.productDetailList(ids);
+    }
+
 }

hx-sale/src/main/resources/mapper/documents/DocumentsProductMapper.xml

@@ -4,13 +4,15 @@
     <select id="getPage" resultType="com.fjhx.sale.entity.documents.vo.DocumentsProductVo">
         select
             dp.id,
-            dp.product_id,
+            dp.business_id,
             dp.documents_id,
             dp.describe,
             dp.sub_describe,
             dp.customs_code,
             dp.price,
             dp.quantity,
+            dp.contract_code,
+            dp.product_name,
             dp.update_time,
             dp.update_user,
             dp.create_user,

hx-sale/src/main/resources/mapper/pack/PackShipmentMapper.xml

@@ -14,5 +14,45 @@
         from pack_shipment ps
             ${ew.customSqlSegment}
     </select>
+    <select id="getList" resultType="com.fjhx.sale.entity.pack.vo.PackShipmentVo">
+        select
+           ps.*,
+           c.code contractCode
+        from pack_shipment ps
+        left join contract c on ps.contract_id = c.id
+            ${ew.customSqlSegment}
+    </select>
+    <select id="productDetailList" resultType="java.util.Map">
+        SELECT
+            remark,
+            null as subDescription,
+            null as customsCode,
+            quantity,
+            null as price,
+            10 as type
+        FROM
+            pack_detail_goods dg
+        <where>
+            <include refid="productDetail"/>
+        </where>
+        UNION
+        SELECT
+            product_name remark,
+            null as subDescription,
+            null as customsCode,
+            quantity,
+            null as price,
+            20 as type
+        FROM
+            pack_detail_product dg
+        <where>
+            <include refid="productDetail"/>
+        </where>
+    </select>
 
+    <sql id="productDetail">
+        <foreach collection="ids" item="id" open="pack_detail_id in(" separator="," close=")">
+            #{id}
+        </foreach>
+    </sql>
 </mapper>