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

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/vo/ArrivalDetailVo.java

@@ -95,5 +95,4 @@ public class ArrivalDetailVo extends ArrivalDetail {
      * 定义 1产品 2物料
      */
     private Integer productDefinition;
-
 }

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

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  * 到货明细单 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-07
  */
 @DS(SourceConstant.PURCHASE)
@@ -66,15 +66,17 @@ public class ArrivalDetailServiceImpl extends ServiceImpl<ArrivalDetailMapper, A
     @Override
     public Page<ArrivalDetailVo> getPage(ArrivalDetailSelectDto dto) {
         IWrapper<ArrivalDetail> wrapper = getWrapper();
-        if(StringUtils.isNotEmpty(dto.getStatus())){
-            wrapper.eq("t1", PurchaseDetail::getStatus,dto.getStatus());
+        if (StringUtils.isNotEmpty(dto.getStatus())) {
+            wrapper.eq("t1", PurchaseDetail::getStatus, dto.getStatus());
         }
-        if(StringUtils.isNotEmpty(dto.getKeyword())){
-            wrapper.keyword(dto.getKeyword(),new SqlField("t2.code"));
+        if (StringUtils.isNotEmpty(dto.getKeyword())) {
+            wrapper.keyword(dto.getKeyword(), new SqlField("t2.code"));
         }
         wrapper.eq("t1", PurchaseDetail::getStatus, dto.getStatus());
         wrapper.orderByDesc("t1", ArrivalDetail::getCreateTime);
         wrapper.groupBy("t1.id");
+        //过滤掉采购单作废的记录
+        wrapper.ne("p.purchase_status", 88);
         Page<ArrivalDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ArrivalDetailVo> list = page.getRecords();
         if (CollectionUtils.isNotEmpty(list)) {
@@ -106,19 +108,20 @@ public class ArrivalDetailServiceImpl extends ServiceImpl<ArrivalDetailMapper, A
 
     /**
      * 详情--
+     *
      * @param ids
      * @return
      */
     @Override
-    public List<ArrivalDetailVo> detail(List<Long>  ids) {
-        List<ArrivalDetail> arrivalDetailList = this.list(Wrappers.<ArrivalDetail>query().lambda().in(ArrivalDetail::getId,ids));
+    public List<ArrivalDetailVo> detail(List<Long> ids) {
+        List<ArrivalDetail> arrivalDetailList = this.list(Wrappers.<ArrivalDetail>query().lambda().in(ArrivalDetail::getId, ids));
         List<ArrivalDetailVo> results = new ArrayList<>();
         //查询产品
         List<Long> productIds = arrivalDetailList.stream().map(ArrivalDetail::getBussinessId).collect(Collectors.toList());
         List<ProductInfoVo> productInfoVos = productInfoService.getListByProductIds(productIds);
         Map<Long, List<ProductInfoVo>> productMap = productInfoVos.stream().collect(Collectors.groupingBy(ProductInfoVo::getId));
-        if(MapUtils.isNotEmpty(productMap)) {
-            for(ArrivalDetail s:arrivalDetailList){
+        if (MapUtils.isNotEmpty(productMap)) {
+            for (ArrivalDetail s : arrivalDetailList) {
                 //查询出当前这款到货明细的质检总数
                 ArrivalDetailVo result = BeanUtil.toBean(s, ArrivalDetailVo.class);
                 ProductInfoVo p = productMap.get(s.getBussinessId()).get(0);
@@ -152,13 +155,14 @@ public class ArrivalDetailServiceImpl extends ServiceImpl<ArrivalDetailMapper, A
 
     /**
      * 统计到货明细总数
+     *
      * @param purchaseDetailId
      * @param businessId
      * @return
      */
     @Override
     public BigDecimal getSumCount(Long purchaseDetailId, Long businessId) {
-        return baseMapper.getSumCount(purchaseDetailId,businessId);
+        return baseMapper.getSumCount(purchaseDetailId, businessId);
     }
 
     @Override

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

@@ -145,6 +145,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
             stockWaitService.save(stockWait);
             List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
             for (ArrivalDetail d : arrivalDetailList) {
+                Assert.notEmpty(d.getBussinessId(), "产品id不能为空");
                 //todo 这一块是做了采购到货状态修改。前端已经完成
                 //查询采购明细
 //                PurchaseDetail purchaseDetail = purchaseDetailService.getById(d.getPurchaseDetailId());
@@ -250,7 +251,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
 
         json.put("arrivalId", arrival.getId());
         json.put("arrivalCode", arrival.getCode());
-        stockWait.setVictoriatouristJson(JSONObject.toJSONString(json,JSONWriter.Feature.WriteLongAsString));
+        stockWait.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
         stockWaitService.save(stockWait);
 
         //取出到货明细
@@ -351,7 +352,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
      */
     @Override
     public ArrivalVo arrivalInfo(Long deliverGoodsId) {
-        Assert.notEmpty(deliverGoodsId,"发货id不能为空");
+        Assert.notEmpty(deliverGoodsId, "发货id不能为空");
         ArrivalVo arrival = baseMapper.arrivalInfo(deliverGoodsId);
         Assert.notEmpty(arrival, "查询不到到货信息");
         List<ArrivalDetail> arrivalDetailList = arrivalDetailService.list(q -> q.eq(ArrivalDetail::getArrivalId, arrival.getId()));

hx-purchase/src/main/resources/mapper/arrival/ArrivalDetailMapper.xml

@@ -2,16 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.purchase.mapper.arrival.ArrivalDetailMapper">
     <select id="getPage" resultType="com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo">
-        SELECT
-            t1.*,
-            t2.`code`,
-            t2.supply_id,
-            IFNULL( SUM( t3.qualified_count ), 0 ) AS qualifiedCount,
-            IFNULL( SUM( t3.no_qualified_count ), 0 ) AS noQualifiedCount
-        FROM
-            arrival_detail t1
-        LEFT JOIN arrival t2 ON t1.arrival_id = t2.id
-        LEFT JOIN quality_detail t3 ON t1.id = t3.arrival_detail_id
+        SELECT t1.*,
+               t2.`code`,
+               t2.supply_id,
+               IFNULL(SUM(t3.qualified_count), 0)    AS qualifiedCount,
+               IFNULL(SUM(t3.no_qualified_count), 0) AS noQualifiedCount
+        FROM arrival_detail t1
+                 LEFT JOIN arrival t2 ON t1.arrival_id = t2.id
+                 LEFT JOIN quality_detail t3 ON t1.id = t3.arrival_detail_id
+                 LEFT JOIN purchase_detail pd ON t1.purchase_detail_id = pd.id
+                 LEFT JOIN purchase p ON pd.purchase_id = p.id
             ${ew.customSqlSegment}
     </select>