Merge branch 'test' into dev

# Conflicts:
#	hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractProductSelectDto.java
#	hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

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

@@ -42,12 +42,12 @@ public class ContractProductSelectDto extends BaseSelectDto {
     private Integer isReceived;
 
     /**
-     * 采购状态 0:未采购  1:部分采购  2：已采购
+     * 数据类型
      */
-    private Integer purchaseStatus;
+    private Integer dataType;
 
     /**
-     * 采购状态 0:合同交接单  1采购交接单
+     * 采购状态
      */
-    private Integer dataType;
+    private Integer purchaseStatus;
 }

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

@@ -119,7 +119,7 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
         wrapper.groupBy("t1.id");
         Page<ContractProductVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ContractProductVo> list = page.getRecords();
-        List<Long> idList = list.stream().map(ContractProductVo::getId).collect(Collectors.toList());
+
         if (list.size() == 0) {
             return page;
         }
@@ -133,10 +133,7 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
             item.setProductSpec(product.getSpec());
             item.setProductCategoryId(product.getProductClassifyId());
         });
-        //赋值已发起采购数量
-        List<PurchaseDetailVo> purchaseDetailVoList = purchaseDetailService.getSumCountByDataResourceId(idList);
-        Map<Long,BigDecimal> pMap = purchaseDetailVoList.stream().collect(Collectors.toMap(PurchaseDetailVo::getDataResourceId,PurchaseDetailVo::getSumCount));
-        list.forEach(i -> i.setStartPurchaseCount(MapUtils.isNotEmpty(pMap)?BigDecimal.ZERO:pMap.getOrDefault(i.getId(),BigDecimal.ZERO)));
+
         // 赋值产品分类名称
         productClassifyService.attributeAssign(list, ContractProductVo::getProductCategoryId, (item, productClassify) -> {
             item.setProductCategory(productClassify.getName());

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -335,8 +335,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
 
         }
 
-
-        stockService.ModifyInventory(3, stockList, stockWaitDto.getWarehouseId());
+        //操作库存根据待出入库类型来1入库2出库
+        stockService.ModifyInventory(stockWait.getType(), stockList, stockWaitDto.getWarehouseId());
         //保存出入库明细
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);