|
@@ -150,12 +150,10 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
|
|
Double weight=repaymentManagementList.stream().mapToDouble(RepaymentManagement::getRepaymentEdAmount).sum();
|
|
Double weight=repaymentManagementList.stream().mapToDouble(RepaymentManagement::getRepaymentEdAmount).sum();
|
|
//累计出库量
|
|
//累计出库量
|
|
Double outWeight=0d;
|
|
Double outWeight=0d;
|
|
- Wrapper<InOutWarehouseTask> inOutWarehouseTaskWrapper = new EntityWrapper<>();
|
|
|
|
- inOutWarehouseTaskWrapper.eq("comp_id",inOutWarehouseTask.getCompId())
|
|
|
|
- .eq("warehouse_name",inOutWarehouseTask.getWarehouseName());
|
|
|
|
- inOutWarehouseTaskWrapper.andNew().eq("task_status_key", "5")
|
|
|
|
- .or().eq("task_status_key","7");
|
|
|
|
- List<InOutWarehouseTask> inOutWarehouseTasks=this.selectList(inOutWarehouseTaskWrapper);
|
|
|
|
|
|
+ List<InOutWarehouseTask> inOutWarehouseTasks=this.selectList(new EntityWrapper<InOutWarehouseTask>()
|
|
|
|
+ .eq("comp_id",inOutWarehouseTask.getCompId())
|
|
|
|
+ .eq("in_out_flag","1")
|
|
|
|
+ .eq("warehouse_name",inOutWarehouseTask.getWarehouseName()));
|
|
if (CollectionUtils.isNotEmpty(inOutWarehouseTasks)){
|
|
if (CollectionUtils.isNotEmpty(inOutWarehouseTasks)){
|
|
outWeight=inOutWarehouseTasks.stream().mapToDouble(InOutWarehouseTask::getWeight).sum();
|
|
outWeight=inOutWarehouseTasks.stream().mapToDouble(InOutWarehouseTask::getWeight).sum();
|
|
}
|
|
}
|