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

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -292,19 +292,26 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     public void add(ProductInfoDto productInfoDto) {
         // 赋值产品编号
         productInfoDto.setCode(CodeEnum.PRODUCT.getCode());
-        // 排除名称重复
-        this.nameDuplication(ProductInfo::getName, productInfoDto.getName(), "产品名称重复");
+        //检查【产品名称】和【规格型号】不能同时重复，但可以单项重复。
+        long nameAndSpecCount = this.count(q -> q
+                .eq(ProductInfo::getName, productInfoDto.getName())
+                .eq(ProductInfo::getSpec, productInfoDto.getSpec())
+        );
+        if (nameAndSpecCount != 0) {
+            throw new ServiceException("同名称同规格的产品已存在");
+        }
         // 排除不为空的自定义编码重复
-        long count = this.count(q -> q.eq(ProductInfo::getCustomCode, productInfoDto.getCustomCode()).ne(ProductInfo::getCustomCode,""));
+        long count = this.count(q -> q.eq(ProductInfo::getCustomCode, productInfoDto.getCustomCode()).ne(ProductInfo::getCustomCode, ""));
         if (count != 0) {
             throw new ServiceException("产品自定义编码重复");
         }
         // 排除不为空的条码编号重复
-        long count1 = this.count(q -> q.eq(ProductInfo::getBarCode, productInfoDto.getBarCode()).ne(ProductInfo::getBarCode,""));
+        long count1 = this.count(q -> q.eq(ProductInfo::getBarCode, productInfoDto.getBarCode()).ne(ProductInfo::getBarCode, ""));
         if (count1 != 0) {
             throw new ServiceException("产品条码编码重复");
         }
 
+
         this.save(productInfoDto);
         ObsFileUtil.saveFile(productInfoDto.getFileList(), productInfoDto.getId());
     }
@@ -457,8 +464,15 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     public void edit(ProductInfoDto productInfoDto) {
         // 禁止产品编号修改
         productInfoDto.setCode(null);
-        // 排除名称重复
-        this.nameDuplication(ProductInfo::getName, productInfoDto.getName(), productInfoDto.getId(), "产品名称重复");
+        //检查【产品名称】和【规格型号】不能同时重复，但可以单项重复。
+        long nameAndSpecCount = this.count(q -> q
+                .ne(ProductInfo::getId, productInfoDto.getId())
+                .eq(ProductInfo::getName, productInfoDto.getName())
+                .eq(ProductInfo::getSpec, productInfoDto.getSpec())
+        );
+        if (nameAndSpecCount != 0) {
+            throw new ServiceException("同名称同规格的产品已存在");
+        }
         // 排除不为空的自定义编码重复
         long count = this.count(q -> q
                 .ne(ProductInfo::getId, productInfoDto.getId())

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -209,8 +209,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
                     throw new ServiceException("该合同产品不存在,请检查");
                 }
                 BigDecimal expendQuantity = contractProduct.getExpendQuantity().subtract(w.getQuantity());
-                if (expendQuantity.compareTo(BigDecimal.ZERO) < 1) {//小于0不让继续执行
-                    throw new ServiceException("生产数量不得大于销售合同数量");
+                if (expendQuantity.compareTo(BigDecimal.ZERO) < 0) {
+                    //外销合同-交接单转生产 如果转生产数量大于大于合同数量 将待处理数量改为0
+                    expendQuantity = BigDecimal.ZERO;
                 }
                 contractProduct.setExpendQuantity(expendQuantity);
                 upContractProduct.add(contractProduct);

hx-purchase/src/main/java/com/fjhx/purchase/controller/sales/SalesReturnController.java

@@ -1,16 +1,16 @@
 package com.fjhx.purchase.controller.sales;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
 import com.fjhx.purchase.entity.sales.po.SalesReturn;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.purchase.service.sales.SalesReturnService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -75,7 +75,7 @@ public class SalesReturnController {
      * 根据供应商查询退货列表
      */
     @GetMapping("/getBySupplyId")
-    public List<SalesReturn> getBySupplyId(@RequestParam("supplyId") String supplyId) {
+    public List<SalesReturn> getBySupplyId(@RequestParam("supplyId") Long supplyId) {
         return salesReturnService.getListBySupplyId(supplyId);
     }
 

hx-purchase/src/main/java/com/fjhx/purchase/mapper/purchase/PurchaseDetailMapper.java

@@ -1,8 +1,8 @@
 package com.fjhx.purchase.mapper.purchase;
 
-import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -30,14 +30,20 @@ public interface PurchaseDetailMapper extends BaseMapper<PurchaseDetail> {
      * @param dataResourceIds
      * @return
      */
-    List<PurchaseDetailVo> getSumCountInDataResourceId(@Param("dataResourceIds")List<Long> dataResourceIds);
+    List<PurchaseDetailVo> getSumCountInDataResourceId(@Param("dataResourceIds") List<Long> dataResourceIds);
 
 
     /**
      * 获取外销合同总采购量审批通过的
+     *
      * @param dataResourceIds
      * @return
      */
-    List<PurchaseDetailVo> getSumCountInDataResourceIds(@Param("dataResourceIds")List<Long> dataResourceIds);
+    List<PurchaseDetailVo> getSumCountInDataResourceIds(@Param("dataResourceIds") List<Long> dataResourceIds);
+
+    /**
+     * 获取明细列表
+     */
+    List<PurchaseDetailVo> getPurchaseDetailList(@Param("ew") IWrapper<PurchaseDetail> wrapper);
 
 }

hx-purchase/src/main/java/com/fjhx/purchase/mapper/sales/SalesReturnMapper.java

@@ -1,19 +1,21 @@
 package com.fjhx.purchase.mapper.sales;
 
-import com.fjhx.purchase.entity.sales.po.SalesReturn;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.purchase.entity.sales.po.SalesReturn;
 import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
  * 退货 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-11
  */
 public interface SalesReturnMapper extends BaseMapper<SalesReturn> {
@@ -23,4 +25,6 @@ public interface SalesReturnMapper extends BaseMapper<SalesReturn> {
      */
     Page<SalesReturnVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<SalesReturn> wrapper);
 
+    List<SalesReturn> getListBySupplyId(@Param("supply_id") Long supply_id);
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/PurchaseDetailService.java

@@ -1,11 +1,11 @@
 package com.fjhx.purchase.service.purchase;
 
-import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseDetailSelectDto;
 import com.fjhx.purchase.entity.purchase.dto.PurchaseDetailDto;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseDetailSelectDto;
+import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
+import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
+import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
 
@@ -57,5 +57,5 @@ public interface PurchaseDetailService extends BaseService<PurchaseDetail> {
      */
     List<PurchaseDetailVo> getSumCountInDataResourceIds(List<Long> dataResourceIds);
 
-
+    List<PurchaseDetailVo> getPurchaseCountListBySubscribeDetailIds(List<Long> PurchaseDetailIds);
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseDetailServiceImpl.java

@@ -75,6 +75,7 @@ public class PurchaseDetailServiceImpl extends ServiceImpl<PurchaseDetailMapper,
 
     /**
      * 获取外销合同总采购量审批通过的
+     *
      * @param dataResourceIds
      * @return
      */
@@ -83,4 +84,12 @@ public class PurchaseDetailServiceImpl extends ServiceImpl<PurchaseDetailMapper,
         return baseMapper.getSumCountInDataResourceIds(dataResourceIds);
     }
 
+    @Override
+    public List<PurchaseDetailVo> getPurchaseCountListBySubscribeDetailIds(List<Long> subscribeDetailIds) {
+        IWrapper<PurchaseDetail> wrapper = getWrapper();
+        wrapper.ne("p.purchase_status", "20");//过滤掉驳回数据
+        wrapper.in(PurchaseDetail::getSubscribeDetailId, subscribeDetailIds);
+        return baseMapper.getPurchaseDetailList(wrapper);
+    }
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/sales/SalesReturnService.java

@@ -1,11 +1,11 @@
 package com.fjhx.purchase.service.sales;
 
-import com.fjhx.purchase.entity.sales.po.SalesReturn;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
 import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
+import com.fjhx.purchase.entity.sales.po.SalesReturn;
+import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
+import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
 
@@ -48,8 +48,9 @@ public interface SalesReturnService extends BaseService<SalesReturn> {
 
     /**
      * 根据供应商查询退货列表
+     *
      * @param supplyId
      * @return
      */
-    List<SalesReturn> getListBySupplyId(String supplyId);
+    List<SalesReturn> getListBySupplyId(Long supplyId);
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/sales/impl/SalesReturnServiceImpl.java

@@ -1,19 +1,18 @@
 package com.fjhx.purchase.service.sales.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
-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.constant.SourceConstant;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
 import com.fjhx.purchase.entity.sales.po.SalesReturn;
+import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
 import com.fjhx.purchase.mapper.sales.SalesReturnMapper;
 import com.fjhx.purchase.service.sales.SalesReturnService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -62,12 +61,14 @@ public class SalesReturnServiceImpl extends ServiceImpl<SalesReturnMapper, Sales
 
     /**
      * 根据供应商查询退货列表
+     *
      * @param supplyId
      * @return
      */
     @Override
-    public List<SalesReturn> getListBySupplyId(String supplyId) {
-        return this.list(Wrappers.<SalesReturn>query().lambda().eq(SalesReturn::getSupplyId,supplyId));
+    public List<SalesReturn> getListBySupplyId(Long supplyId) {
+//        return this.list(Wrappers.<SalesReturn>query().lambda().eq(SalesReturn::getSupplyId,supplyId));
+        return baseMapper.getListBySupplyId(supplyId);
     }
 
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -16,6 +16,7 @@ import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
+import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
 import com.fjhx.purchase.entity.subscribe.dto.SubscribeDetailDto;
 import com.fjhx.purchase.entity.subscribe.dto.SubscribeDetailSelectDto;
 import com.fjhx.purchase.entity.subscribe.po.Subscribe;
@@ -137,7 +138,8 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 
         // 赋值采购数量
         List<Long> subscribeDetailIds = list.stream().map(SubscribeDetail::getId).collect(Collectors.toList());
-        List<PurchaseDetail> purchaseDetailsList = purchaseDetailService.list(q -> q.in(PurchaseDetail::getSubscribeDetailId, subscribeDetailIds));
+        List<PurchaseDetailVo> purchaseDetailsList = purchaseDetailService.getPurchaseCountListBySubscribeDetailIds(subscribeDetailIds);
+//        List<PurchaseDetail> purchaseDetailsList = purchaseDetailService.list(q -> q.in(PurchaseDetail::getSubscribeDetailId, subscribeDetailIds));
         Map<Long, List<PurchaseDetail>> purchaseDetailsMap = purchaseDetailsList.stream().collect(Collectors.groupingBy(PurchaseDetail::getSubscribeDetailId));
         for (SubscribeDetailVo subscribeDetailVo : list) {
             List<PurchaseDetail> purchaseDetails = purchaseDetailsMap.get(subscribeDetailVo.getId());

hx-purchase/src/main/resources/mapper/purchase/PurchaseDetailMapper.xml

@@ -50,12 +50,19 @@
             AND t2.`purchase_status` >= 30
             AND t2.purchase_status < 88
             <if test="dataResourceIds neq null and dataResourceIds.size() > 0">
-                <foreach collection="dataResourceIds" item="dataResourceId" open="AND t1.data_resource_id IN (" separator="," close=")">
+                <foreach collection="dataResourceIds" item="dataResourceId" open="AND t1.data_resource_id IN ("
+                         separator="," close=")">
                     #{dataResourceId}
                 </foreach>
             </if>
         </where>
         GROUP BY
-            data_resource_id
+        data_resource_id
+    </select>
+    <select id="getPurchaseDetailList" resultType="com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo">
+        SELECT pd.*
+        FROM purchase_detail pd
+                 LEFT JOIN purchase p on pd.purchase_id = p.id
+            ${ew.customSqlSegment}
     </select>
 </mapper>

hx-purchase/src/main/resources/mapper/sales/SalesReturnMapper.xml

@@ -14,5 +14,18 @@
         from sales_return sr
             ${ew.customSqlSegment}
     </select>
+    <select id="getListBySupplyId" resultType="com.fjhx.purchase.entity.sales.po.SalesReturn">
+        SELECT sr.id,
+               sr.CODE,
+               sr.supply_id,
+               srd.STATUS,
+               sr.create_user,
+               sr.create_time,
+               sr.update_user,
+               sr.update_time
+        FROM sales_return sr
+                 JOIN sales_return_detail srd ON srd.sales_return_id = sr.id
+        where sr.supply_id = #{supply_id}
+    </select>
 
 </mapper>

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 外销合同表列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-17
  */
 @Getter
@@ -44,4 +44,9 @@ public class ContractSelectDto extends BaseSelectDto {
      */
     private String refundStatusNew;
 
+    /**
+     * 合同类型
+     */
+    private String contractType;
+
 }

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlow.java

@@ -10,6 +10,8 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.flow.core.FlowThreadLocalUtil;
+import com.fjhx.flow.enums.HandleTypeEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
@@ -24,7 +26,9 @@ import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.sample.po.SampleProduct;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.sample.SampleProductService;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -122,8 +126,9 @@ public class PurchaseFlow extends FlowDelegate {
                     p.getDataResource() == PurchaseDataResourceEnum.DATA_RESOURCE_1.getKey()) {//如果采购的是外销合同
                 ContractProduct contractProduct = contractProductService.getById(p.getDataResourceId());
                 BigDecimal expendQuantity = contractProduct.getExpendQuantity().subtract(p.getCount());
-                if (expendQuantity.compareTo(BigDecimal.ZERO) < 1) {//小于0不让继续执行
-                    throw new ServiceException("采购数量不得大于合同剩余采购数量");
+                if (expendQuantity.compareTo(BigDecimal.ZERO) < 0) {
+                    //外销合同-交接单采购 如果采购数量大于大于合同数量 将待处理数量改为0
+                    expendQuantity = BigDecimal.ZERO;
                 }
                 contractProduct.setExpendQuantity(expendQuantity);
                 upContractProduct.add(contractProduct);
@@ -156,4 +161,18 @@ public class PurchaseFlow extends FlowDelegate {
                 .lambda().eq(PurchaseDetail::getPurchaseId, purchase.getId()));
     }
 
+    /**
+     * 驳回方法
+     */
+    public void reject() {
+        if (HandleTypeEnum.REJECT.equals(FlowThreadLocalUtil.getHandleTypeEnum())) {
+            purchaseService.update(q -> q
+                    .eq(Purchase::getId, FlowThreadLocalUtil.getBusinessId())
+                    .set(Purchase::getPurchaseStatus, 20)
+                    .set(Purchase::getUpdateTime, new Date())
+                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+            );
+        }
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -79,7 +79,7 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
         IWrapper<ContractProduct> wrapper = getWrapper();
         wrapper.orderByDesc("t1", ContractProduct::getCreateTime);
         wrapper.between("t2", Contract::getStatus, FlowStatusEnum.PASS.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
-        wrapper.gt("t1", ContractProduct::getExpendQuantity, BigDecimal.ZERO);
+        wrapper.ne("t1", ContractProduct::getExpendQuantity, BigDecimal.ZERO);
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t2.`code`"), new SqlField("t2.`user_name`"));
         }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -182,6 +182,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             wrapper.keyword(dto.getKeyword(), new SqlField("t1", Contract::getCode));
         }
 
+        //过滤合同类型
+        wrapper.eq("t1.contract_type", dto.getContractType());
+
         wrapper.in("t1", Contract::getBuyCorporationId, authIdList);
 
         Page<ContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -139,17 +139,16 @@
     </select>
 
     <select id="getListByIds" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
-        SELECT
-            t1.id,
-            t1.contract_id,
-            t1.product_id,
-            t2.`code` AS contractCode,
-            t2.user_name AS userName,
-            t2.version AS contractVersion,
-            t1.expend_quantity expendQuantity
-        FROM
-            contract_product t1
-        LEFT JOIN contract t2 ON t1.contract_id = t2.id
+        SELECT t1.id,
+               t1.contract_id,
+               t1.product_id,
+               t2.`code`    AS    contractCode,
+               t2.user_name AS    userName,
+               t2.version   AS    contractVersion,
+               t1.expend_quantity expendQuantity,
+               t1.quantity
+        FROM contract_product t1
+                 LEFT JOIN contract t2 ON t1.contract_id = t2.id
             ${ew.customSqlSegment}
     </select>
 

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

@@ -14,7 +14,8 @@
                t1.box_high,
                sum(t1.bom_volume)                                    bomVolume,
                t1.shipment_status,
-               t1.shipment_time
+               t1.shipment_time,
+               t1.contract_ids
         FROM pack_detail t1
         GROUP BY t1.pack_id
         ORDER BY t1.create_time DESC