Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1,12 +1,12 @@
 package com.fjhx.sale.entity.pack.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 装箱出货产品明细表
@@ -33,7 +33,7 @@ public class PackDetailProduct extends BasePo {
     /**
      * 合同产品ID
      */
-    private String contractProductId;
+    private Long contractProductId;
 
     /**
      * 装箱数量

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.sale.entity.pack.dto.PackDetailDto;
 import com.fjhx.sale.entity.pack.dto.PackDetailSelectDto;
 import com.fjhx.sale.entity.pack.enums.PackShipmentStatusEnum;
@@ -25,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -32,7 +34,7 @@ import java.util.List;
  * 装箱出货明细表	 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @Service
@@ -40,8 +42,10 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
 
     @Autowired
     private PackShipmentService packShipmentService;
+
     /**
      * 分页
+     *
      * @param dto
      * @return
      */
@@ -50,11 +54,11 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
         IWrapper<PackDetail> wrapper = getWrapper();
         wrapper.groupBy("t1.pack_id");
         wrapper.orderByDesc("t1.create_time");
-        if(ObjectUtil.isNotEmpty(dto.getShipmentStatus())){
-            wrapper.eq("t1",PackDetailVo::getShipmentStatus,dto.getShipmentStatus());
+        if (ObjectUtil.isNotEmpty(dto.getShipmentStatus())) {
+            wrapper.eq("t1", PackDetailVo::getShipmentStatus, dto.getShipmentStatus());
         }
-        if(StringUtils.isNotEmpty(dto.getKeyword())){
-            wrapper.keyword(dto.getKeyword(),new SqlField("t3.`code`"),new SqlField("t2.`product_name`"));
+        if (StringUtils.isNotEmpty(dto.getKeyword())) {
+            wrapper.keyword(dto.getKeyword(), new SqlField("t3.`code`"), new SqlField("t2.`product_name`"));
         }
         Page<PackDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
@@ -84,24 +88,32 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
 
     /**
      * 出货
+     *
      * @param ids
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void shipment(List<Long> ids,Long contractId) {
-        if(CollectionUtils.isEmpty(ids)){
+    public void shipment(List<Long> ids, Long contractId) {
+        if (CollectionUtils.isEmpty(ids)) {
             throw new ServiceException("最少选中一条记录");
         }
-        if(ObjectUtil.isEmpty(contractId)){
+        if (ObjectUtil.isEmpty(contractId)) {
             throw new ServiceException("必须选择一条主合同");
         }
+        //查询id对应的装箱id 把装箱id下的记录都出货
+        List<PackDetail> packDetails = this.listByIds(ids);
+        Assert.notEmpty(packDetails, "查询不到装箱明细信息");
+        if (packDetails.size() != ids.size()) {
+            throw new ServiceException("存在未知装箱明细");
+        }
+        List<Long> packIds = packDetails.stream().map(PackDetail::getPackId).collect(Collectors.toList());
         this.update(Wrappers.<PackDetail>update().lambda()
-                .set(PackDetail::getShipmentStatus,PackShipmentStatusEnum.STATUS_1.getKey())
-                .set(PackDetail::getShipmentTime,new Date())
-                .in(PackDetail::getId,ids));
+                .set(PackDetail::getShipmentStatus, PackShipmentStatusEnum.STATUS_1.getKey())
+                .set(PackDetail::getShipmentTime, new Date())
+                .in(PackDetail::getPackId, packIds));
         //添加一条绑定主合同记录
         PackShipment packShipment = new PackShipment();
-        packShipment.setPackDetailIds(StringUtils.join(ids,","));
+        packShipment.setPackDetailIds(StringUtils.join(ids, ","));
         packShipment.setContractId(contractId);
         packShipmentService.save(packShipment);
     }

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

@@ -2,13 +2,19 @@
 <!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.PackDetailMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.pack.vo.PackDetailVo">
-        SELECT
-            t1.*,
-            GROUP_CONCAT(CONCAT(t3.`code`,"_",t2.product_name )) AS codeAPName
-        FROM
-            pack_detail t1
-                LEFT JOIN pack_detail_product t2 ON t1.id = t2.pack_detail_id
-                LEFT JOIN contract t3 ON t2.contract_id = t3.id
+        SELECT GROUP_CONCAT(CONCAT(t3.`code`, "_", t2.product_name)) AS codeAPName,
+               sum(t1.pack_quantity)                                    packQuantity,
+               sum(t1.net_weight)                                       netWeight,
+               sum(t1.rough_weight)                                     roughWeight,
+               t1.box_long,
+               t1.box_wide,
+               t1.box_high,
+               sum(t1.bom_volume)                                       bomVolume,
+               t1.shipment_status,
+               t1.shipment_time
+        FROM pack_detail t1
+                 LEFT JOIN pack_detail_product t2 ON t1.id = t2.pack_detail_id
+                 LEFT JOIN contract t3 ON t2.contract_id = t3.id
             ${ew.customSqlSegment}
     </select>