到货详情添加入库状态

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -303,9 +303,9 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
                 purchaseDetailVo.setIsReject(noQualifiedCount.compareTo(BigDecimal.ZERO) > 0 ? 1 : 0);
 
                 //过滤调质检数为0的明细数据 留下有质检数的数据
-                qualityDetails = qualityDetails.stream().filter(item->{
+                qualityDetails = qualityDetails.stream().filter(item -> {
                     BigDecimal add = item.getQualifiedCount().add(item.getNoQualifiedCount());
-                    return add.compareTo(BigDecimal.ZERO)!=0;
+                    return add.compareTo(BigDecimal.ZERO) != 0;
                 }).collect(Collectors.toList());
 
                 //赋值产品质检的明细
@@ -429,7 +429,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
                 StockJournal stockJournal = stockJournalService.getById(stockJournalDetailsVo.getStockJournalId());
                 StockWaitDetails stockWaitDetails = stockWaitDetailsService.getOne(q -> q
                         .eq(StockWaitDetails::getStockWaitId, stockJournal.getBusinessId())
-                        .eq(StockWaitDetails::getProductId,stockJournalDetailsVo.getProductId())
+                        .eq(StockWaitDetails::getProductId, stockJournalDetailsVo.getProductId())
                 );
 
                 Long businessDetailsId = stockWaitDetails.getBusinessDetailsId();
@@ -454,6 +454,11 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
                         }
                     }
                 }
+                //赋值入库状态
+                stockJournalDetailsVo.setReceiptStatus(1);//部分入库
+                if (stockWaitDetails.getReceiptQuantity().compareTo(stockWaitDetails.getQuantity()) >= 0) {
+                    stockJournalDetailsVo.setReceiptStatus(2);//完全入库
+                }
             }
 
             //对数量求和

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalDetailsVo.java

@@ -90,4 +90,9 @@ public class StockJournalDetailsVo extends StockJournalDetails {
      * 是否有次品 1是 0不是
      */
     private Integer isReject;
+
+    /**
+     * 入库状态 1部分入库 2入库完成
+     */
+    private Integer receiptStatus;
 }