|
@@ -225,7 +225,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
|
|
for(InOutWarehouseTask inoutwarehouse :inOutWarehouseTaskList){
|
|
for(InOutWarehouseTask inoutwarehouse :inOutWarehouseTaskList){
|
|
stockReturn = stockReturn + inoutwarehouse.getStockReturn();
|
|
stockReturn = stockReturn + inoutwarehouse.getStockReturn();
|
|
}
|
|
}
|
|
- inOutWarehouseTask.setReceiveWarehouse(inOutWarehouseTaskList.get(0).getReceiveWarehouse());
|
|
|
|
|
|
+ inOutWarehouseTask.setSendWarehouse(inOutWarehouseTaskList.get(0).getSendWarehouse());
|
|
inOutWarehouseTask.setStockReturnCount(String.valueOf(stockReturn));
|
|
inOutWarehouseTask.setStockReturnCount(String.valueOf(stockReturn));
|
|
if(StringUtils.isEmpty(stockReturnCount)){
|
|
if(StringUtils.isEmpty(stockReturnCount)){
|
|
stockReturnCount = "0";
|
|
stockReturnCount = "0";
|
|
@@ -234,7 +234,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
|
|
}
|
|
}
|
|
|
|
|
|
for (InOutWarehouseTask inOutWarehouseTask1 : inOutWarehouseTaskAllList) {
|
|
for (InOutWarehouseTask inOutWarehouseTask1 : inOutWarehouseTaskAllList) {
|
|
- if (inOutWarehouseTask1.getReceiveWarehouse().equals(inOutWarehouseTask.getReceiveWarehouse())) {
|
|
|
|
|
|
+ if (inOutWarehouseTask1.getSendWarehouse().equals(inOutWarehouseTask.getSendWarehouse())) {
|
|
inOutWarehouseTask1.setStockReturnCount(stockReturnCount);
|
|
inOutWarehouseTask1.setStockReturnCount(stockReturnCount);
|
|
}
|
|
}
|
|
|
|
|